From 186f753aec06d9b76db1ee80723d4ed819d6ece7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 22 Jun 2014 18:21:38 +0200 Subject: [PATCH] style changing now works again --- src/app/controllers/dash.js | 2 ++ src/app/controllers/dashLoader.js | 6 +++++- src/app/controllers/grafanaCtrl.js | 3 +++ src/app/partials/dasheditor.html | 2 +- src/index.html | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js index c4ab3669458..2381a73c90d 100644 --- a/src/app/controllers/dash.js +++ b/src/app/controllers/dash.js @@ -45,6 +45,8 @@ function (angular, $, config, _) { $rootScope.fullscreen = false; $scope.dashboard = dashboard.create(dashboardData); + $scope.grafana.style = $scope.dashboard.style; + $scope.filter = filterSrv; $scope.filter.init($scope.dashboard); diff --git a/src/app/controllers/dashLoader.js b/src/app/controllers/dashLoader.js index 6b28ccc55d8..303e889b2c1 100644 --- a/src/app/controllers/dashLoader.js +++ b/src/app/controllers/dashLoader.js @@ -17,7 +17,7 @@ function (angular, _, moment) { $scope.elasticsearch = $scope.elasticsearch || {}; $scope.onAppEvent('save-dashboard', function() { - $scope.elasticsearch_save('dashboard', false); + $scope.saveDashboard(); }); $scope.onAppEvent('zoom-out', function() { @@ -142,6 +142,10 @@ function (angular, _, moment) { }); }; + $scope.styleUpdated = function() { + $scope.grafana.style = $scope.dashboard.style; + }; + $scope.openSaveDropdown = function() { $scope.isFavorite = playlistSrv.isCurrentFavorite($scope.dashboard); }; diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js index fde4e2003ab..17a2beba798 100644 --- a/src/app/controllers/grafanaCtrl.js +++ b/src/app/controllers/grafanaCtrl.js @@ -15,6 +15,9 @@ function (angular, config, _) { $scope.init = function() { $scope._ = _; $scope.dashAlerts = alertSrv; + $scope.grafana = { + style: 'dark' + }; }; $rootScope.onAppEvent = function(name, callback) { diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html index 69ff346d1be..5524352cf17 100644 --- a/src/app/partials/dasheditor.html +++ b/src/app/partials/dasheditor.html @@ -15,7 +15,7 @@
- +
diff --git a/src/index.html b/src/index.html index b8fa8a07dd9..5e3bc08309e 100644 --- a/src/index.html +++ b/src/index.html @@ -20,7 +20,7 @@ - +