diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js index fb022624045..33c7f028567 100644 --- a/src/app/controllers/grafanaCtrl.js +++ b/src/app/controllers/grafanaCtrl.js @@ -10,7 +10,7 @@ function (angular, config, _, $, store) { var module = angular.module('grafana.controllers'); - module.controller('GrafanaCtrl', function($scope, alertSrv, utilSrv, grafanaVersion, $rootScope, $controller, userSrv) { + module.controller('GrafanaCtrl', function($scope, alertSrv, utilSrv, grafanaVersion, $rootScope, $controller, userSrv, $timeout) { $scope.init = function() { $scope.grafana = {}; @@ -45,6 +45,10 @@ function (angular, config, _, $, store) { $scope.toggleSideMenu = function() { $scope.grafana.sidemenu = !$scope.grafana.sidemenu; store.set('grafana.sidemenu', $scope.grafana.sidemenu); + + $timeout(function() { + $scope.$broadcast("render"); + }, 50); }; $rootScope.onAppEvent = function(name, callback) { diff --git a/src/app/directives/topnav.js b/src/app/directives/topnav.js index 3d670983309..5ff418c7c77 100644 --- a/src/app/directives/topnav.js +++ b/src/app/directives/topnav.js @@ -10,6 +10,53 @@ function (angular) { .directive('topnav', function() { return { restrict: 'E', + transclude: true, + scope: { + title: "@", + section: "@", + titleAction: "&", + toggle: "&", + showMenuBtn: "=", + }, + template: + '
' + + '
' + + '' + + '' + + '' + + 'menu' + + '' + + '' + + + '' + + '' + + '' + + '' + + + '' + + '{{section}}' + + '' + + '' + + + '' + + '{{title}}' + + '' + + '' + + '' + + '' + + '
', + link: function(scope, elem, attrs) { + scope.icon = attrs.icon; + } + }; + }); + + angular + .module('grafana.directives') + .directive('topnavDash', function() { + return { + restrict: 'E', + transclude: true, scope: { title: "@", section: "@", @@ -49,4 +96,5 @@ function (angular) { }; }); + }); diff --git a/src/app/features/account/partials/account.html b/src/app/features/account/partials/account.html index 5465d0c7094..56e65c8de35 100644 --- a/src/app/features/account/partials/account.html +++ b/src/app/features/account/partials/account.html @@ -1,15 +1,8 @@ -
+ -
+
-
-
- - Account information -
-
- -
+
diff --git a/src/app/features/account/partials/apikeys.html b/src/app/features/account/partials/apikeys.html index 612a29b9a79..cc78bf89d33 100644 --- a/src/app/features/account/partials/apikeys.html +++ b/src/app/features/account/partials/apikeys.html @@ -1,15 +1,13 @@ -
+ + -
+
-
-
- - API Tokens -
-
- -
+
diff --git a/src/app/features/account/partials/datasources.html b/src/app/features/account/partials/datasources.html index b715619262e..25de55c4d4c 100644 --- a/src/app/features/account/partials/datasources.html +++ b/src/app/features/account/partials/datasources.html @@ -1,127 +1,120 @@ -
+ + -
-
-
- -
-
- - Data sources -
- -
-
-
-
- -
- - -
- -
-
-
- No datasources defined -
- - - - - - - - - - - - - - - -
NameUrl
-   - {{ds.name}} - - {{ds.url}} - - - default - - - - - Edit - - - - - -
-
-
- -
-
-
- - -
-
- - -
- -
- -
-
- - -
-
- - -
-
- -
-
-
InfluxDB Details
-
- - -
-
- - -
-
- - -
-
-
-
-
-
Elastic search details
-
- - -
-
-
-
- -
- - - -
- - +
+
+
+
+ +
+
+
+
+
+ No datasources defined +
+ + + + + + + + + + + + + + + +
NameUrl
+   + {{ds.name}} + + {{ds.url}} + + + default + + + + + Edit + + + + + +
+
+
+ +
+
+
+ + +
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+ +
+
+
InfluxDB Details
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
Elastic search details
+
+ + +
+
+
+
+ +
+ + + +
+ + +
diff --git a/src/app/features/account/partials/users.html b/src/app/features/account/partials/users.html index 819e5ef76ba..3d964aaa1e6 100644 --- a/src/app/features/account/partials/users.html +++ b/src/app/features/account/partials/users.html @@ -1,15 +1,8 @@ -
+ -
+
-
-
- - Users -
-
- -
+
diff --git a/src/app/features/admin/partials/admin.html b/src/app/features/admin/partials/admin.html index 637dd49f396..968d7ba23b6 100644 --- a/src/app/features/admin/partials/admin.html +++ b/src/app/features/admin/partials/admin.html @@ -1,23 +1,9 @@ -
+ + -
-
-
- -
-
- - System administration -
- -
-
-
-
- -
- -
-
-
+
diff --git a/src/app/features/admin/partials/users.html b/src/app/features/admin/partials/users.html index 0a2b48aa435..57a4eca5159 100644 --- a/src/app/features/admin/partials/users.html +++ b/src/app/features/admin/partials/users.html @@ -1,9 +1,13 @@ -
+ + -
- -
+
+
diff --git a/src/app/features/profile/partials/profile.html b/src/app/features/profile/partials/profile.html index 800062c8453..57ba7a249a0 100644 --- a/src/app/features/profile/partials/profile.html +++ b/src/app/features/profile/partials/profile.html @@ -1,17 +1,24 @@ -
+ + -
-
-
-
-
+ +
+
+ +
+
+
Personal information
-
+
@@ -56,65 +63,66 @@
+
-
-
-
- +
+ +
+
+
+ Your accounts
-
- -
- - - - - - -
Name: {{ac.name}}Role: {{ac.role}} - - active now - - - - Select - -
+
+ + + + + + + +
Name: {{ac.name}}Role: {{ac.role}} + + active now + + + + Select + +
+
+
-
- -
-
+
+
+
+
Add account
-
- - -
-
    -
  • - Account name -
    • -
  • - -
    • -
  • - -
    • -
-
-
- +
+
+
+
    +
  • + Account name +
    • +
  • + +
    • +
  • + +
    • +
+
+
+
+
-
-
-
diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index b75de3f3f2f..bd3b9945a2c 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -2,20 +2,21 @@
- - + - - +
  • @@ -35,8 +36,6 @@
    • - -
  • Stop playlist diff --git a/src/app/partials/navbar.html b/src/app/partials/navbar.html index 7b349e944f5..0823495755e 100644 --- a/src/app/partials/navbar.html +++ b/src/app/partials/navbar.html @@ -1,15 +1,12 @@
    - - - - - - - - {{pageTitle}} - + +
    diff --git a/src/css/less/gfbox.less b/src/css/less/gfbox.less index cd42a5573b9..2e58913a833 100644 --- a/src/css/less/gfbox.less +++ b/src/css/less/gfbox.less @@ -1,9 +1,8 @@ .gf-box { - margin: 30px; + margin: 15px; background-color: @grafanaPanelBackground; position: relative; border: 1px solid @grafanaTargetFuncBackground; - border-top: none; } .gf-box-header-close-btn { @@ -30,10 +29,9 @@ } .gf-box-header { + border-bottom: 1px solid @grafanaTargetFuncBackground; overflow: hidden; background-color: @grafanaTargetBackground; - border-top: 1px solid @grafanaTargetFuncBackground; - border-bottom: 1px solid @grafanaTargetFuncBackground; .tabs { float: left; } @@ -43,8 +41,8 @@ } .gf-box-title { - border-bottom: 1px solid @fullEditBorder; padding-right: 20px; + padding-left: 10px; float: left; color: @linkColor; font-size: 18px; diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index c53b71df775..a591a38bea4 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -295,7 +295,6 @@ max-width: 400px; } - .grafana-version-info { position: absolute; bottom: 2px; diff --git a/src/css/less/sidemenu.less b/src/css/less/sidemenu.less index 5d8d28e3b77..7e11c4e01db 100644 --- a/src/css/less/sidemenu.less +++ b/src/css/less/sidemenu.less @@ -13,7 +13,7 @@ left: 0; width: 200px; background: @bodyBackground; - border-right: 2px solid black; + border-right: 1px solid black; min-height: 100%; z-index: 101; }