IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

style changing now works again

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-06-22 18:21:38 +02:00
parent f180707b6f
commit 186f753aec
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/controllers/dash.js
View File

@ -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);

6
src/app/controllers/dashLoader.js
View File

@ -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);
};

3
src/app/controllers/grafanaCtrl.js
View File

@ -15,6 +15,9 @@ function (angular, config, _) {
$scope.init = function() {
$scope._ = _;
$scope.dashAlerts = alertSrv;
$scope.grafana = {
style: 'dark'
};
};
$rootScope.onAppEvent = function(name, callback) {

2
src/app/partials/dasheditor.html
View File

@ -15,7 +15,7 @@
<label class="small">Title</label><input type="text" class="input-large" ng-model='dashboard.title'></input>
</div>
<div class="editor-option">
<label class="small">Style</label><select class="input-small" ng-model="dashboard.style" ng-options="f for f in ['dark','light']"></select>
<label class="small">Theme</label><select class="input-small" ng-model="dashboard.style" ng-options="f for f in ['dark','light']" ng-change="styleUpdated()"></select>
</div>
<div class="editor-option">
<label class="small">Time correction</label>

2
src/index.html
View File

@ -20,7 +20,7 @@
<body ng-cloak ng-controller="GrafanaCtrl">
<link rel="stylesheet" href="css/bootstrap.light.min.css" ng-if="dashboard.style === 'light'">
<link rel="stylesheet" href="css/bootstrap.light.min.css" ng-if="grafana.style === 'light'">
<link rel="stylesheet" href="css/bootstrap-responsive.min.css">
<link rel="stylesheet" href="css/font-awesome.min.css">