From 496e5bdad926824d14972f8c4274ad604d0c2e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 1 Feb 2015 11:56:01 +0100 Subject: [PATCH] More progress on new design --- src/app/controllers/sidemenuCtrl.js | 31 ++++++----- src/app/partials/sidemenu.html | 2 +- src/css/less/grafana.less | 83 +---------------------------- src/css/less/navbar.less | 65 ++++++++++++++++++++++ src/css/less/sidemenu.less | 26 ++------- src/views/index.html | 6 +-- 6 files changed, 92 insertions(+), 121 deletions(-) create mode 100644 src/css/less/navbar.less diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js index 708564d8a8a..93954006309 100644 --- a/src/app/controllers/sidemenuCtrl.js +++ b/src/app/controllers/sidemenuCtrl.js @@ -34,12 +34,16 @@ function (angular, _, $, config) { text: "Account", href: $scope.getUrl("/account"), requireRole: "Admin", icon: "fa fa-shield", - links: [ - { text: 'Info', href: $scope.getUrl("/account")}, - { text: 'Data sources', href: $scope.getUrl("/account/datasources")}, - { text: 'Users', href: $scope.getUrl("/account/users")}, - { text: 'API Keys', href: $scope.getUrl("/account/apikeys")}, - ] + }); + $scope.menu.push({ + text: "Users", href: $scope.getUrl("/account/users"), + requireRole: "Admin", + icon: "fa fa-users", + }); + $scope.menu.push({ + text: "API Keys", href: $scope.getUrl("/account/apikeys"), + requireRole: "Admin", + icon: "fa fa-key", }); } @@ -50,13 +54,6 @@ function (angular, _, $, config) { }); } - if ($scope.grafana.user.isSignedIn) { - $scope.menu.push({ - text: "Sign out", href: $scope.getUrl("/logout"), - icon: "fa fa-sign-out", - }); - } - if ($scope.grafana.user.isGrafanaAdmin) { $scope.menu.push({ text: "Admin", href: $scope.getUrl("/admin/users"), @@ -70,6 +67,14 @@ function (angular, _, $, config) { }); } + if ($scope.grafana.user.isSignedIn) { + $scope.menu.push({ + text: "Sign out", href: $scope.getUrl("/logout"), + target: "_self", + icon: "fa fa-sign-out", + }); + } + $scope.onAppEvent('$routeUpdate', function() { $scope.updateState(); }); diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index c199a829fa2..5cc3cf742cd 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -13,7 +13,7 @@
  • - + {{item.text}} diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 0f753c2991c..abfbf8a23e9 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -11,6 +11,7 @@ @import "tightform.less"; @import "sidemenu.less"; @import "gfbox.less"; +@import "navbar.less"; .row-control-inner { padding:0px; @@ -51,70 +52,6 @@ width: 24px; } -.navbar-inner { - padding-left: 0px; -} - -.navbar .nav>li>a { - padding: 19px 15px 8px; -} - -.top-nav { - float: left; -} - -.top-nav-menu-btn { - display: block; - float: left; - padding: 11px 6px 12px 14px; - position: relative; - border-right: 1px solid @black; - font-weight: bold; - font-size: 90%; - i { - font-size: 170%; - color: @gray; - padding: 0px 0px 0px 6px; - position: relative; - top: 4px; - } -} - -.top-nav-breadcrumb { - display: block; - float: left; - padding: 18px 9px 8px 12px; - font-size: 1.4em; - font-weight: bold; - color: darken(@gray, 10%); - i { - padding-left: 9px; - } -} - -.top-nav-section { - display: block; - float: left; - padding: 19px 9px 8px 0; - font-weight: bold; - i { - padding-left: 8px; - } -} - -.top-nav-title { - display: block; - float: left; - padding: 18px 10px 10px 0px; - font-size: 1.3em; - font-weight: bold; - i { - padding-left: 4px; - position: relative; - top: 2px; - } -} - .row-button { width: 24px; } @@ -128,24 +65,6 @@ top: 30%; } -.grafana-search-metric-actions { - visibility: hidden; - padding-left: 20px; -} - -.grafana-search-metric-name { - white-space: nowrap; -} - -.grafana-search-metric-result:hover { - .grafana-search-metric-actions { - visibility: visible; - } - .grafana-search-metric-name { - color: @blue; - } -} - .dashboard-fullscreen { .main-view-container { overflow: hidden; diff --git a/src/css/less/navbar.less b/src/css/less/navbar.less new file mode 100644 index 00000000000..90628e3007a --- /dev/null +++ b/src/css/less/navbar.less @@ -0,0 +1,65 @@ +.navbar-inner { + padding-left: 0px; +} + +.navbar .nav>li>a { + padding: 19px 15px 8px; +} + +.top-nav { + float: left; +} + +.top-nav-menu-btn { + display: block; + float: left; + padding: 11px 6px 12px 14px; + position: relative; + border-right: 1px solid @black; + font-weight: bold; + font-size: 90%; + i { + font-size: 170%; + color: @gray; + padding: 0px 0px 0px 6px; + position: relative; + top: 4px; + } +} + +.top-nav-breadcrumb { + display: block; + float: left; + padding: 18px 9px 8px 12px; + font-size: 1.4em; + font-weight: bold; + color: darken(@gray, 10%); + i { + padding-left: 9px; + } +} + +.top-nav-section { + display: block; + float: left; + padding: 19px 9px 8px 0; + font-weight: bold; + i { + padding-left: 8px; + } +} + +.top-nav-title { + display: block; + float: left; + padding: 18px 10px 10px 0px; + font-size: 1.3em; + font-weight: bold; + i { + padding-left: 4px; + position: relative; + top: 2px; + } +} + + diff --git a/src/css/less/sidemenu.less b/src/css/less/sidemenu.less index 42b02987037..3afcc2a0730 100644 --- a/src/css/less/sidemenu.less +++ b/src/css/less/sidemenu.less @@ -1,4 +1,4 @@ -.sidemenu-container { +.sidemenu-wrapper { display: none; a:focus { text-decoration: none; @@ -6,7 +6,7 @@ } .sidemenu-open { - .sidemenu-container { + .sidemenu-wrapper { display: block; position: absolute; top: 0; @@ -23,7 +23,7 @@ width: auto; } - .pro-main-view { + .main-view { padding-left: 200px; } @@ -95,25 +95,7 @@ .sidemenu-item-text { padding-left: 15px; + text-shadow: 1px 0px 10px @orange; } } -.sidemenu-logo-container { - background: @grafanaPanelBackground; - text-align: center; - border-bottom: 1px solid black; - img { - display: inline-block; - width: 102px; - padding: 6px 0px 6px 11px; - } -} - -.sidemenu-toggle { - float: right; - display: block; - font-size: 200%; - padding: 11px 8px 11px 8px; - background: @grafanaTargetFuncBackground; -} - diff --git a/src/views/index.html b/src/views/index.html index 52458331966..e0ee9c6757d 100644 --- a/src/views/index.html +++ b/src/views/index.html @@ -27,9 +27,9 @@ -
    +
    -
    -
    +