From b3a1bb201739c364dad9df9a8d7430f3735b7c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 7 Feb 2015 12:28:47 +0100 Subject: [PATCH] Sub nav for account page, some css changes --- src/app/directives/topnav.js | 8 ++ .../features/account/partials/account.html | 109 +----------------- src/app/features/account/partials/import.html | 10 +- src/app/features/account/partials/users.html | 9 +- src/app/features/admin/adminSettingsCtrl.js | 18 --- src/app/features/admin/partials/admin.html | 10 +- src/app/features/admin/partials/settings.html | 11 -- src/app/features/admin/partials/users.html | 11 +- src/app/features/all.js | 2 +- .../features/profile/partials/profile.html | 3 +- src/app/routes/backend/all.js | 6 +- src/css/less/navbar.less | 13 ++- src/css/less/sidemenu.less | 4 +- 13 files changed, 55 insertions(+), 159 deletions(-) delete mode 100644 src/app/features/admin/adminSettingsCtrl.js delete mode 100644 src/app/features/admin/partials/settings.html diff --git a/src/app/directives/topnav.js b/src/app/directives/topnav.js index b27a6be6241..039269cf27b 100644 --- a/src/app/directives/topnav.js +++ b/src/app/directives/topnav.js @@ -13,9 +13,11 @@ function (angular) { transclude: true, scope: { title: "@", + section: "@", titleAction: "&", toggle: "&", showMenuBtn: "=", + subnav: "=", }, template: '
' + @@ -29,9 +31,15 @@ function (angular) { '' + '' + + '' + + '{{section}}' + + '' + + '' + + '' + '{{title}}' + '' + + '' + '
', link: function(scope, elem, attrs) { scope.icon = attrs.icon; diff --git a/src/app/features/account/partials/account.html b/src/app/features/account/partials/account.html index a4c4db89aaf..d05cb90b1e1 100644 --- a/src/app/features/account/partials/account.html +++ b/src/app/features/account/partials/account.html @@ -1,4 +1,9 @@ - + +
@@ -32,60 +37,6 @@
-

- Account users -

- -
-
-
-
-
-
-
    -
  • - Username or Email -
    • -
  • - -
    • -
  • - role -
    • -
  • - -
    • -
  • - -
    • -
-
-
-
-
-
- - -
- - - - - - -
{{user.email}} - {{user.role}} - - - - -
-
- -
-
-

API Keys

@@ -136,54 +87,6 @@ -

Import dashboards

-
-
-
-
-
-
    -
  • - Dashboard source -
    • -
  • - -
    • -
  • - Destination -
    • -
  • - -
    • -
  • - -
    • -
-
-
-
-
- -
-
-
{{infoText}}
- -
- - - - - -
{{dash.name}} - {{dash.info}} -
-
-
-
-
-
diff --git a/src/app/features/account/partials/import.html b/src/app/features/account/partials/import.html index f94b5e7c7e8..3777d3707f8 100644 --- a/src/app/features/account/partials/import.html +++ b/src/app/features/account/partials/import.html @@ -1,7 +1,9 @@ - + +
diff --git a/src/app/features/account/partials/users.html b/src/app/features/account/partials/users.html index 3d964aaa1e6..b7919da0e6a 100644 --- a/src/app/features/account/partials/users.html +++ b/src/app/features/account/partials/users.html @@ -1,4 +1,11 @@ - + + + +
diff --git a/src/app/features/admin/adminSettingsCtrl.js b/src/app/features/admin/adminSettingsCtrl.js deleted file mode 100644 index 736e5ce55d2..00000000000 --- a/src/app/features/admin/adminSettingsCtrl.js +++ /dev/null @@ -1,18 +0,0 @@ -define([ - 'angular', -], -function (angular) { - 'use strict'; - - var module = angular.module('grafana.controllers'); - - module.controller('AdminSettingsCtrl', function($scope) { - - $scope.init = function() { - - }; - - $scope.init(); - - }); -}); diff --git a/src/app/features/admin/partials/admin.html b/src/app/features/admin/partials/admin.html index 6dcf42e25fc..f5b717f8e8e 100644 --- a/src/app/features/admin/partials/admin.html +++ b/src/app/features/admin/partials/admin.html @@ -1,8 +1,10 @@ - + + +
diff --git a/src/app/features/admin/partials/settings.html b/src/app/features/admin/partials/settings.html deleted file mode 100644 index bea1f5fd4c7..00000000000 --- a/src/app/features/admin/partials/settings.html +++ /dev/null @@ -1,11 +0,0 @@ -
- -
-
-
-
- -
-
-
-
diff --git a/src/app/features/admin/partials/users.html b/src/app/features/admin/partials/users.html index 74cac3befae..da16d469f13 100644 --- a/src/app/features/admin/partials/users.html +++ b/src/app/features/admin/partials/users.html @@ -1,11 +1,12 @@ - + +
-

Users

+

Users

diff --git a/src/app/features/all.js b/src/app/features/all.js index 8e72a8221cb..a262a57b5ba 100644 --- a/src/app/features/all.js +++ b/src/app/features/all.js @@ -15,6 +15,6 @@ define([ './account/importCtrl', './account/accountCtrl', './admin/adminUsersCtrl', - './admin/adminSettingsCtrl', + './admin/adminCtrl', './grafanaDatasource/datasource', ], function () {}); diff --git a/src/app/features/profile/partials/profile.html b/src/app/features/profile/partials/profile.html index e39a663584e..8689a2785eb 100644 --- a/src/app/features/profile/partials/profile.html +++ b/src/app/features/profile/partials/profile.html @@ -1,5 +1,6 @@ diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js index e3e347f63d8..2ffd773ea82 100644 --- a/src/app/routes/backend/all.js +++ b/src/app/routes/backend/all.js @@ -54,9 +54,9 @@ define([ templateUrl: 'app/features/profile/partials/profile.html', controller : 'ProfileCtrl', }) - .when('/admin/settings', { - templateUrl: 'app/features/admin/partials/settings.html', - controller : 'AdminSettingsCtrl', + .when('/admin', { + templateUrl: 'app/features/admin/partials/admin.html', + controller : 'AdminCtrl', }) .when('/admin/users', { templateUrl: 'app/features/admin/partials/users.html', diff --git a/src/css/less/navbar.less b/src/css/less/navbar.less index d7f5d435061..95d135f36ee 100644 --- a/src/css/less/navbar.less +++ b/src/css/less/navbar.less @@ -9,12 +9,13 @@ .top-nav { float: left; + font-size: 16px; } .fa.top-nav-breadcrumb-icon { - margin: 15px 21px 8px 0px; + margin: 17px 0 6px 5px; float: left; - font-size: 160%; + font-size: 120%; color: @textColor; } @@ -27,7 +28,7 @@ width: 30px; height: 30px; padding: 4px; - margin: 7px 6px 3px 9px; + margin: 6px 6px 3px 9px; .fa { color: @textColor; width: 30px; @@ -87,9 +88,9 @@ } .top-nav-icon { + margin: 5px 0px 0 11px; line-height: 34px; float: left; - margin: 5px 11px; } .top-nav-section { @@ -105,9 +106,9 @@ .top-nav-title { display: block; float: left; - padding: 16px 10px 10px 0px; - font-size: 1.3em; + padding: 17px 10px 10px 13px; font-weight: bold; + color: @textColor; i { padding-left: 4px; position: relative; diff --git a/src/css/less/sidemenu.less b/src/css/less/sidemenu.less index 98b2d85d0d0..6ca430a5daf 100644 --- a/src/css/less/sidemenu.less +++ b/src/css/less/sidemenu.less @@ -28,6 +28,7 @@ } .sidemenu { + font-size: 16px; list-style: none; margin: 0; padding: 0; @@ -85,7 +86,7 @@ position: relative; left: 11px; top: 5px; - font-size: 135%; + font-size: 125%; } } @@ -96,7 +97,6 @@ color: #f80; line-height: 34px; padding: 14px 10px 14px 20px; - font-weight: bold; display: block; .sidemenu-item-text {