From 2f7770b165452e0d927d012e9a8d100db457c037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 30 Jan 2015 09:47:16 +0100 Subject: [PATCH] Work on new top nav design --- src/app/controllers/grafanaCtrl.js | 1 + src/app/directives/all.js | 1 + src/app/features/dashboard/dashboardCtrl.js | 3 + src/app/partials/dashboard_topnav.html | 30 +++++---- src/app/partials/sidemenu.html | 6 ++ src/css/less/bootswatch.dark.less | 2 +- src/css/less/grafana.less | 70 +++++++++++++-------- 7 files changed, 72 insertions(+), 41 deletions(-) diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js index 8df9b4155d6..fb022624045 100644 --- a/src/app/controllers/grafanaCtrl.js +++ b/src/app/controllers/grafanaCtrl.js @@ -30,6 +30,7 @@ function (angular, config, _, $, store) { $scope.grafana.style = 'dark'; $scope.grafana.user = userSrv.getSignedInUser(); $scope.grafana.sidemenu = store.getBool('grafana.sidemenu'); + $scope.topnav = { title: 'Grafana' }; $scope.onAppEvent('logged-out', function() { $scope.grafana.sidemenu = false; diff --git a/src/app/directives/all.js b/src/app/directives/all.js index 879b61e2512..b07e3812db5 100644 --- a/src/app/directives/all.js +++ b/src/app/directives/all.js @@ -16,4 +16,5 @@ define([ './graphiteSegment', './grafanaVersionCheck', './dropdown.typeahead', + './navHeader', ], function () {}); diff --git a/src/app/features/dashboard/dashboardCtrl.js b/src/app/features/dashboard/dashboardCtrl.js index c88d6dfa725..d19dcd30d81 100644 --- a/src/app/features/dashboard/dashboardCtrl.js +++ b/src/app/features/dashboard/dashboardCtrl.js @@ -61,6 +61,9 @@ 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.isPanel = function(obj) { diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index bf66c417677..e695f306089 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -1,19 +1,23 @@
- - - - Menu - - -
-
- Dashboards -
- - {{dashboard.title}} - + +
+ + + + menu + + + + + + + + + + {{topnav.title}} + diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index 44e8ef8a484..bb0a93092a6 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -1,5 +1,11 @@