From 8a5c91021d204db7318319858427610494bbd845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 2 Feb 2015 08:34:54 +0100 Subject: [PATCH] Various css and markup fixes for changed css classes --- src/app/controllers/grafanaCtrl.js | 4 +-- src/app/features/dashboard/dashboardCtrl.js | 13 ++------ .../features/dashboard/dashboardNavCtrl.js | 4 --- .../features/dashboard/unsavedChangesSrv.js | 1 + src/app/partials/confirm_modal.html | 8 ++--- src/app/partials/help_modal.html | 15 +++++---- src/app/partials/inspector.html | 12 +++---- src/app/partials/unsaved-changes.html | 32 ++++++++++--------- src/css/less/gfbox.less | 4 +++ src/css/less/overrides.less | 5 +++ src/css/less/panel.less | 2 +- src/views/index.html | 2 +- 12 files changed, 50 insertions(+), 52 deletions(-) diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js index 33c7f028567..3922af87be8 100644 --- a/src/app/controllers/grafanaCtrl.js +++ b/src/app/controllers/grafanaCtrl.js @@ -27,7 +27,7 @@ function (angular, config, _, $, store) { utilSrv.init(); $scope.dashAlerts = alertSrv; - $scope.grafana.style = 'dark'; + $scope.grafana.lightTheme = false; $scope.grafana.user = userSrv.getSignedInUser(); $scope.grafana.sidemenu = store.getBool('grafana.sidemenu'); $scope.topnav = { title: 'Grafana' }; @@ -101,7 +101,7 @@ function (angular, config, _, $, store) { }, function() { }); - $scope.onAppEvent('setup-dashboard', function() { + $scope.onAppEvent('dashboard-loaded', function() { count = 0; setTimeout(function() { diff --git a/src/app/features/dashboard/dashboardCtrl.js b/src/app/features/dashboard/dashboardCtrl.js index d19dcd30d81..4b7a6b1d87d 100644 --- a/src/app/features/dashboard/dashboardCtrl.js +++ b/src/app/features/dashboard/dashboardCtrl.js @@ -60,18 +60,11 @@ function (angular, $, config, _) { $scope.setWindowTitleAndTheme = function() { window.document.title = config.window_title_prefix + $scope.dashboard.title; - $scope.grafana.style = $scope.dashboard.style; - $scope.topnav.title = $scope.dashboard.title; - $scope.topnav.icon = "fa fa-th-large"; - $scope.topnav.titleAction = function() { alert("hej"); }; + $scope.grafana.lightTheme = $scope.dashboard.style === 'light'; }; - $scope.isPanel = function(obj) { - if(!_.isNull(obj) && !_.isUndefined(obj) && !_.isUndefined(obj.type)) { - return true; - } else { - return false; - } + $scope.styleUpdated = function() { + $scope.grafana.lightTheme = $scope.dashboard.style === 'light'; }; $scope.add_row = function(dash, row) { diff --git a/src/app/features/dashboard/dashboardNavCtrl.js b/src/app/features/dashboard/dashboardNavCtrl.js index a9eac45e1ea..90ace81c502 100644 --- a/src/app/features/dashboard/dashboardNavCtrl.js +++ b/src/app/features/dashboard/dashboardNavCtrl.js @@ -144,10 +144,6 @@ function (angular, _, moment, config, store) { }); }; - $scope.styleUpdated = function() { - $scope.grafana.style = $scope.dashboard.style; - }; - $scope.editJson = function() { $scope.appEvent('show-json-editor', { object: $scope.dashboard }); }; diff --git a/src/app/features/dashboard/unsavedChangesSrv.js b/src/app/features/dashboard/unsavedChangesSrv.js index 9b8d2eea198..f1782a35ea3 100644 --- a/src/app/features/dashboard/unsavedChangesSrv.js +++ b/src/app/features/dashboard/unsavedChangesSrv.js @@ -60,6 +60,7 @@ function(angular, _, config) { this.open_modal = function() { var confirmModal = $modal({ template: './app/partials/unsaved-changes.html', + modalClass: 'confirm-modal', persist: true, show: false, scope: modalScope, diff --git a/src/app/partials/confirm_modal.html b/src/app/partials/confirm_modal.html index 2269b2b8c24..03398c2811e 100644 --- a/src/app/partials/confirm_modal.html +++ b/src/app/partials/confirm_modal.html @@ -1,12 +1,12 @@ -