Skip to content

N
nexpie-grafana-theme
Commit 9ac1f6b2 by Torkel Ödegaard
Options

Merge remote-tracking branch 'origin/move_stuff' into pro

parents dac49542 5846c710
Showing with 32 additions and 33 deletions
src/app/components/kbn.js
...@@ -526,7 +526,7 @@ function($, _, moment) { ...@@ -526,7 +526,7 @@ function($, _, moment) {
}; };
default: default:
return function(val, axis) { return function(val, axis) {
return kbn.noneFormat(val, axis ? axis.tickDecimals : decimals); return kbn.noneFormat(val, axis ? axis.tickDecimals : null);
}; };
} }
}; };
......
src/app/controllers/all.js
define([ define([
'./grafanaCtrl', './grafanaCtrl',
'./dash', './dashboardCtrl',
'./dashLoader', './dashboardNavCtrl',
'./row', './row',
'./submenuCtrl', './submenuCtrl',
'./pulldown', './pulldown',
......
src/app/controllers/dash.js → src/app/controllers/dashboardCtrl.js
...@@ -10,7 +10,7 @@ function (angular, $, config, _) { ...@@ -10,7 +10,7 @@ function (angular, $, config, _) {
var module = angular.module('grafana.controllers'); var module = angular.module('grafana.controllers');
module.controller('DashCtrl', function( module.controller('DashboardCtrl', function(
$scope, $rootScope, dashboardKeybindings, $scope, $rootScope, dashboardKeybindings,
filterSrv, dashboardSrv, dashboardViewStateSrv, filterSrv, dashboardSrv, dashboardViewStateSrv,
panelMoveSrv, timer) { panelMoveSrv, timer) {
......
src/app/controllers/dashLoader.js → src/app/controllers/dashboardNavCtrl.js
...@@ -10,7 +10,7 @@ function (angular, _, moment, config) { ...@@ -10,7 +10,7 @@ function (angular, _, moment, config) {
var module = angular.module('grafana.controllers'); var module = angular.module('grafana.controllers');
module.controller('dashLoader', function($scope, $rootScope, $http, alertSrv, $location, playlistSrv, datasourceSrv) { module.controller('DashboardNavCtrl', function($scope, $rootScope, alertSrv, $location, playlistSrv, datasourceSrv) {
$scope.init = function() { $scope.init = function() {
$scope.db = datasourceSrv.getGrafanaDB(); $scope.db = datasourceSrv.getGrafanaDB();
......
src/app/partials/dashboard.html
<div ng-controller="DashCtrl" body-class ng-class="{'dashboard-fullscreen': dashboardViewState.fullscreen}"> <div ng-controller="DashboardCtrl" body-class ng-class="{'dashboard-fullscreen': dashboardViewState.fullscreen}">
<div class="navbar navbar-static-top"> <div ng-include="'app/partials/dashboard_topnav.html'">
<div class="navbar-inner">
<div class="container-fluid">
<span class="brand"><img src="img/small.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
<ul class="nav pull-right" ng-controller='dashLoader' ng-init="init()" ng-include="'app/partials/dashLoader.html'">
</ul>
</div>
</div>
</div> </div>
<div class="submenu-controls"> <div class="submenu-controls">
......
src/app/partials/dashLoader.html → src/app/partials/dashboard_topnav.html
<style> <div class="navbar navbar-static-top">
.noarrow>a:after { <div class="navbar-inner">
display: none !important; <div class="container-fluid">
} <span class="brand"><img src="img/small.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
</style> <ul class="nav pull-right" ng-controller='DashboardNavCtrl' ng-init="init()">
<li ng-show="dashboardViewState.fullscreen"> <li ng-show="dashboardViewState.fullscreen">
<a ng-click="exitFullscreen()"> <a ng-click="exitFullscreen()">
Back to dashboard Back to dashboard
</a> </a>
</li> </li>
<li class="grafana-menu-zoom-out"> <li class="grafana-menu-zoom-out">
<a class='small' ng-click='zoom(2)'> <a class='small' ng-click='zoom(2)'>
Zoom Out Zoom Out
</a> </a>
</li> </li>
<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable"> <li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable">
<grafana-simple-panel type="pulldown.type" ng-cloak> <grafana-simple-panel type="pulldown.type" ng-cloak>
</grafana-simple-panel> </grafana-simple-panel>
</li> </li>
<li class="dropdown grafana-menu-save"> <li class="dropdown grafana-menu-save">
<a href="#" bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()"> <a href="#" bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
<i class='icon-save'></i> <i class='icon-save'></i>
</a> </a>
...@@ -55,17 +55,23 @@ ...@@ -55,17 +55,23 @@
</a> </a>
</li> </li>
</ul> </ul>
</li> </li>
<li class="dropdown grafana-menu-load" ng-controller="SearchCtrl" ng-init="init()" ng-include="'app/partials/search.html'"> <li class="dropdown grafana-menu-load" ng-controller="SearchCtrl" ng-init="init()" ng-include="'app/partials/search.html'">
</li> </li>
<li class="grafana-menu-home"><a bs-tooltip="'Goto saved default'" data-placement="bottom" href='#/'><i class='icon-home'></i></a></li> <li class="grafana-menu-home"><a bs-tooltip="'Goto saved default'" data-placement="bottom" href='#/'><i class='icon-home'></i></a></li>
<li class="grafana-menu-edit" ng-show="dashboard.editable" bs-tooltip="'Configure dashboard'" data-placement="bottom"><a class="link" config-modal="app/partials/dasheditor.html"><i class='icon-cog pointer'></i></a></li> <li class="grafana-menu-edit" ng-show="dashboard.editable" bs-tooltip="'Configure dashboard'" data-placement="bottom"><a class="link" config-modal="app/partials/dasheditor.html"><i class='icon-cog pointer'></i></a></li>
<li class="grafana-menu-stop-playlist hide"> <li class="grafana-menu-stop-playlist hide">
<a class='small' ng-click='stopPlaylist(2)'> <a class='small' ng-click='stopPlaylist(2)'>
Stop playlist Stop playlist
</a> </a>
</li> </li>
</ul>
</div>
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment