diff --git a/src/app/directives/topnav.js b/src/app/directives/topnav.js index d987b652535..9228ce9fcb0 100644 --- a/src/app/directives/topnav.js +++ b/src/app/directives/topnav.js @@ -21,12 +21,10 @@ function (angular) { template: '
' + '
' + - '' + - '' + - '' + - '' + - '' + - '' + + '' + + ' ' + + '' + + '' + '' + '' + @@ -50,46 +48,4 @@ function (angular) { }; }); - angular - .module('grafana.directives') - .directive('topnavDash', function() { - return { - restrict: 'E', - transclude: true, - scope: { - title: "@", - section: "@", - titleAction: "&", - toggle: "&", - showMenuBtn: "=", - }, - template: - '
' + - '' + - '' + - '' + - '' + - '' + - '' + - - '' + - '' + - '' + - - '' + - '{{section}}' + - '' + - '' + - - '' + - '{{title}}' + - '' + - '
', - link: function(scope, elem, attrs) { - scope.icon = attrs.icon; - } - }; - }); - - }); diff --git a/src/app/features/annotations/partials/editor.html b/src/app/features/annotations/partials/editor.html index 47511ff755b..1aee712962a 100644 --- a/src/app/features/annotations/partials/editor.html +++ b/src/app/features/annotations/partials/editor.html @@ -1,6 +1,11 @@
+
+ + Annotations +
+
diff --git a/src/app/features/dashboard/dashboardNavCtrl.js b/src/app/features/dashboard/dashboardNavCtrl.js index 14a914821b1..a9eac45e1ea 100644 --- a/src/app/features/dashboard/dashboardNavCtrl.js +++ b/src/app/features/dashboard/dashboardNavCtrl.js @@ -22,7 +22,6 @@ function (angular, _, moment, config, store) { $scope.onAppEvent('zoom-out', function() { $scope.zoom(2); }); - }; $scope.set_default = function() { @@ -35,6 +34,11 @@ function (angular, _, moment, config, store) { alertSrv.set('Local Default Clear','Your default dashboard has been reset to the default','success', 5000); }; + $scope.openEditView = function(editview) { + var search = _.extend($location.search(), {editview: editview}); + $location.search(search); + }; + $scope.saveForSharing = function() { var clone = angular.copy($scope.dashboard); clone.temp = true; diff --git a/src/app/panels/timepicker/module.html b/src/app/panels/timepicker/module.html index f0cfb2e316c..e73516126ae 100644 --- a/src/app/panels/timepicker/module.html +++ b/src/app/panels/timepicker/module.html @@ -21,6 +21,7 @@
  • + refreshed every {{dashboard.refresh}} diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index 90485f0fa55..2248ab2a645 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -2,34 +2,41 @@
    - - +
    + + + + - - + + + + -
    + + diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html index 21b76cce8e6..75c966420c8 100644 --- a/src/app/partials/dasheditor.html +++ b/src/app/partials/dasheditor.html @@ -1,4 +1,8 @@
    +
    + + Settings +
    diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index 5cc3cf742cd..33ccd1566f4 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -1,17 +1,13 @@
      -
    • +
      • -
    • - Sign in -
      • -
    • diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html index 096b78f6e9d..f6e4b90f477 100644 --- a/src/app/partials/submenu.html +++ b/src/app/partials/submenu.html @@ -1,20 +1,6 @@
      - -
      • diff --git a/src/app/partials/templating_editor.html b/src/app/partials/templating_editor.html index 062ff1fc288..c366f7e7f57 100644 --- a/src/app/partials/templating_editor.html +++ b/src/app/partials/templating_editor.html @@ -1,5 +1,11 @@
        +
        + + Templating +
        + +
        diff --git a/src/css/less/navbar.less b/src/css/less/navbar.less index 90628e3007a..0e131c76365 100644 --- a/src/css/less/navbar.less +++ b/src/css/less/navbar.less @@ -4,6 +4,7 @@ .navbar .nav>li>a { padding: 19px 15px 8px; + .fa { font-size: 130%; } } .top-nav { @@ -13,18 +14,45 @@ .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%; + padding: 11px 9px 11px 14px; + background: @grafanaTargetBackground; + border: 1px solid rgb(55, 54, 54); i { - font-size: 170%; - color: @gray; - padding: 0px 0px 0px 6px; + font-size: 160%; + color: darken(@gray, 15%); + padding: 0px 0px 0px 0px; position: relative; top: 4px; } + &:hover { + background: lighten(@grafanaTargetBackground, 3%); + } +} + +.top-nav-dashboards-btn { + display: block; + float: left; + padding: 15px 7px 9px 14px; + font-size: 1.4em; + font-weight: bold; + color: #a2a2a2; + margin: 0 18px 0 0; + border: 1px solid rgb(55, 54, 54); + border-left: none; + background: @grafanaTargetBackground; + .fa-th-large { + font-size: 123%; + } + .fa-angle-down { + position: relative; + top: 4px; + } + &:hover { + background: lighten(@grafanaTargetBackground, 3%); + .fa { + color: @textColor; + } + } } .top-nav-breadcrumb { diff --git a/src/css/less/sidemenu.less b/src/css/less/sidemenu.less index 3afcc2a0730..5feb72df66f 100644 --- a/src/css/less/sidemenu.less +++ b/src/css/less/sidemenu.less @@ -13,7 +13,6 @@ left: 0; width: 200px; background: @bodyBackground; - border-right: 1px solid black; min-height: 100%; z-index: 101; } @@ -59,15 +58,15 @@ } .sidemenu-top-btn { - padding: 14px 0px 12px 20px; - background: @grafanaPanelBackground; display: block; + padding: 14px 0px 10px 20px; + background: @grafanaTargetBackground; + border: 1px solid rgb(55, 54, 54); i { padding-right: 5px; font-size: 170%; color: @gray; } - border-bottom: 10px solid @bodyBackground; } .sidemenu-icon {