diff --git a/pkg/api/index.go b/pkg/api/index.go index 3c4d658ce19..eb9e70bb404 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -263,16 +263,18 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Divider: true, HideFromTabs: true, }) cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{ - Text: "Server Admin", - Id: "admin", - Icon: "fa fa-fw fa-shield", - Url: setting.AppSubUrl + "/admin", + Text: "Server Admin", + HideFromTabs: true, + SubTitle: "Manage all users & orgs", + Id: "admin", + Icon: "fa fa-fw fa-shield", + Url: setting.AppSubUrl + "/admin/users", Children: []*dtos.NavLink{ - {Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users"}, - {Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"}, - {Text: "Server Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings"}, - {Text: "Server Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats"}, - {Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/styleguide"}, + {Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users", Icon: "icon-gf icon-gf-fw icon-gf-users"}, + {Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs", Icon: "gicon gicon-org"}, + {Text: "Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings", Icon: "fa fa-fw fa-sliders"}, + {Text: "Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats", Icon: "fa fa-fw fa-bar-chart"}, + {Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/styleguide", Icon: "fa fa-fw fa-eyedropper"}, }, }) } diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts index 24f9101a88f..68595da4296 100644 --- a/public/app/core/routes/routes.ts +++ b/public/app/core/routes/routes.ts @@ -48,12 +48,6 @@ function setupAngularRoutes($routeProvider, $locationProvider) { reloadOnSearch: false, pageClass: 'page-dashboard', }) - .when('/configuration', { - templateUrl: 'public/app/features/admin/partials/configuration_home.html', - controller : 'ConfigurationHomeCtrl', - controllerAs: 'ctrl', - resolve: loadAdminBundle, - }) .when('/datasources', { templateUrl: 'public/app/features/plugins/partials/ds_list.html', controller : 'DataSourcesCtrl', diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts index 4092669cb15..6683ad6e85b 100644 --- a/public/app/features/admin/admin.ts +++ b/public/app/features/admin/admin.ts @@ -10,7 +10,7 @@ class AdminSettingsCtrl { /** @ngInject **/ constructor($scope, backendSrv, navModelSrv) { - this.navModel = navModelSrv.getNav('cfg', 'admin', 'server-settings'); + this.navModel = navModelSrv.getNav('cfg', 'admin', 'server-settings', 1); backendSrv.get('/api/admin/settings').then(function(settings) { $scope.settings = settings; @@ -24,7 +24,7 @@ class AdminHomeCtrl { /** @ngInject **/ constructor(navModelSrv) { - this.navModel = navModelSrv.getNav('cfg', 'admin'); + this.navModel = navModelSrv.getNav('cfg', 'admin', 1); } } @@ -34,7 +34,7 @@ export class AdminStatsCtrl { /** @ngInject */ constructor(backendSrv: any, navModelSrv) { - this.navModel = navModelSrv.getNav('cfg', 'admin', 'server-stats'); + this.navModel = navModelSrv.getNav('cfg', 'admin', 'server-stats', 1); backendSrv.get('/api/admin/stats').then(stats => { this.stats = stats; @@ -42,16 +42,6 @@ export class AdminStatsCtrl { } } -export class ConfigurationHomeCtrl { - navModel: any; - - /** @ngInject */ - constructor(navModelSrv) { - this.navModel = navModelSrv.getNav('cfg'); - } -} - -coreModule.controller('ConfigurationHomeCtrl', ConfigurationHomeCtrl); coreModule.controller('AdminSettingsCtrl', AdminSettingsCtrl); coreModule.controller('AdminHomeCtrl', AdminHomeCtrl); coreModule.controller('AdminStatsCtrl', AdminStatsCtrl); diff --git a/public/app/features/admin/admin_edit_org_ctrl.ts b/public/app/features/admin/admin_edit_org_ctrl.ts index 40ad467da9f..2c69c00ef9d 100644 --- a/public/app/features/admin/admin_edit_org_ctrl.ts +++ b/public/app/features/admin/admin_edit_org_ctrl.ts @@ -5,7 +5,7 @@ export class AdminEditOrgCtrl { /** @ngInject */ constructor($scope, $routeParams, backendSrv, $location, navModelSrv) { $scope.init = function() { - $scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs'); + $scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1); if ($routeParams.id) { $scope.getOrg($routeParams.id); diff --git a/public/app/features/admin/admin_edit_user_ctrl.ts b/public/app/features/admin/admin_edit_user_ctrl.ts index 714f38357a9..1ed885505c3 100644 --- a/public/app/features/admin/admin_edit_user_ctrl.ts +++ b/public/app/features/admin/admin_edit_user_ctrl.ts @@ -8,7 +8,7 @@ export class AdminEditUserCtrl { $scope.user = {}; $scope.newOrg = { name: '', role: 'Editor' }; $scope.permissions = {}; - $scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-users'); + $scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-users', 1); $scope.init = function() { if ($routeParams.id) { diff --git a/public/app/features/admin/admin_list_orgs_ctrl.ts b/public/app/features/admin/admin_list_orgs_ctrl.ts index 4b016d430de..e8722f7e19b 100644 --- a/public/app/features/admin/admin_list_orgs_ctrl.ts +++ b/public/app/features/admin/admin_list_orgs_ctrl.ts @@ -5,7 +5,7 @@ export class AdminListOrgsCtrl { /** @ngInject */ constructor($scope, backendSrv, navModelSrv) { $scope.init = function() { - $scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs'); + $scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1); $scope.getOrgs(); }; diff --git a/public/app/features/admin/admin_list_users_ctrl.ts b/public/app/features/admin/admin_list_users_ctrl.ts index b2fcf403702..1574bd07a77 100644 --- a/public/app/features/admin/admin_list_users_ctrl.ts +++ b/public/app/features/admin/admin_list_users_ctrl.ts @@ -10,7 +10,7 @@ export default class AdminListUsersCtrl { /** @ngInject */ constructor(private $scope, private backendSrv, navModelSrv) { - this.navModel = navModelSrv.getNav('cfg', 'admin', 'global-users'); + this.navModel = navModelSrv.getNav('cfg', 'admin', 'global-users', 1); this.query = ''; this.getUsers(); } diff --git a/public/app/features/admin/partials/admin_home.html b/public/app/features/admin/partials/admin_home.html index 266a4698cdc..ea61385f006 100644 --- a/public/app/features/admin/partials/admin_home.html +++ b/public/app/features/admin/partials/admin_home.html @@ -1,35 +1,11 @@ - + -
-
- -
+
-
-
    -
  1. - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - {{navItem.text}} -
    -
    - {{navItem.description}} -
    -
    -
    -     -
    2. -
-
+
+ Grafana is a multi-tenant system where most can be configured per organization. These + admin pages are for server admins where you can manage orgs, & all users across all orgs. +
diff --git a/public/app/features/admin/partials/configuration_home.html b/public/app/features/admin/partials/configuration_home.html deleted file mode 100644 index 7ebc5127b4a..00000000000 --- a/public/app/features/admin/partials/configuration_home.html +++ /dev/null @@ -1,29 +0,0 @@ - - -
-
-
    -
  1. - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - {{navItem.text}} -
    -
    - {{navItem.description}} -
    -
    -
    -     -
    2. -
-
-
diff --git a/public/app/features/admin/partials/edit_org.html b/public/app/features/admin/partials/edit_org.html index 39028645b38..c50cf2c7701 100644 --- a/public/app/features/admin/partials/edit_org.html +++ b/public/app/features/admin/partials/edit_org.html @@ -1,9 +1,7 @@ - + -
-
-

Edit Organization

-
+
+

Edit Organization

diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index 384601affb7..7686ac7f079 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -1,8 +1,9 @@ - + -
-
-

Edit User

+
+ +
+

Edit User

@@ -54,7 +55,7 @@
- Add organization + Add
@@ -67,12 +68,14 @@
- - - - - - +
NameRole
+ + + + + + +
NameRole
{{org.name}} Current diff --git a/public/app/features/admin/partials/new_user.html b/public/app/features/admin/partials/new_user.html index aca2ef89701..5199d957c33 100644 --- a/public/app/features/admin/partials/new_user.html +++ b/public/app/features/admin/partials/new_user.html @@ -1,7 +1,7 @@ - + -
-
+
+

Add new user

diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html index 9b337ccb3dd..a3b0f04d39d 100644 --- a/public/app/features/admin/partials/orgs.html +++ b/public/app/features/admin/partials/orgs.html @@ -1,8 +1,12 @@ - + -
-
-

Organizations

+
+
+
+ + + New Org +
diff --git a/public/app/features/admin/partials/settings.html b/public/app/features/admin/partials/settings.html index c8aa4fd3790..918a0d90f6e 100644 --- a/public/app/features/admin/partials/settings.html +++ b/public/app/features/admin/partials/settings.html @@ -1,25 +1,22 @@ - + -
-
-

Server settings

-
+
-
- These system settings are defined in grafana.ini or custom.ini (or overridden in ENV variables). - To change these you currently need to restart grafana. -
+
+ These system settings are defined in grafana.ini or custom.ini (or overridden in ENV variables). + To change these you currently need to restart grafana. +
-
- - - - - - - - -
{{secName}}
{{keyName}}{{keyValue}}
+ + + + + + + + + +
{{secName}}
{{keyName}}{{keyValue}}
diff --git a/public/app/features/admin/partials/stats.html b/public/app/features/admin/partials/stats.html index 8cc9134cad0..e2a4bb62301 100644 --- a/public/app/features/admin/partials/stats.html +++ b/public/app/features/admin/partials/stats.html @@ -1,10 +1,6 @@ - - -
-
-

Stats

-
+ +
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html index 601e062def9..e98299eac64 100644 --- a/public/app/features/admin/partials/users.html +++ b/public/app/features/admin/partials/users.html @@ -1,22 +1,18 @@ - - -
-
-

Users

+ +
+
+
+ + +
+
Add new user
-
- - - - -
-
diff --git a/public/app/features/org/change_password_ctrl.ts b/public/app/features/org/change_password_ctrl.ts index 93dc1a3ceef..ebd36d6288c 100644 --- a/public/app/features/org/change_password_ctrl.ts +++ b/public/app/features/org/change_password_ctrl.ts @@ -8,7 +8,7 @@ export class ChangePasswordCtrl { $scope.command = {}; $scope.authProxyEnabled = config.authProxyEnabled; $scope.ldapEnabled = config.ldapEnabled; - $scope.navModel = navModelSrv.getNav('profile', 'change-password'); + $scope.navModel = navModelSrv.getNav('profile', 'change-password', 0); $scope.changePassword = function() { if (!$scope.userForm.$valid) { return; } diff --git a/public/app/features/org/new_org_ctrl.ts b/public/app/features/org/new_org_ctrl.ts index 72601df248f..2fce0ab513f 100644 --- a/public/app/features/org/new_org_ctrl.ts +++ b/public/app/features/org/new_org_ctrl.ts @@ -5,7 +5,7 @@ export class NewOrgCtrl { /** @ngInject **/ constructor($scope, $http, backendSrv, navModelSrv) { - $scope.navModel = navModelSrv.getOrgNav(0); + $scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1); $scope.newOrg = {name: ''}; $scope.createOrg = function() { diff --git a/public/app/features/org/partials/change_password.html b/public/app/features/org/partials/change_password.html index 982c2fe16a8..b02f7b4d017 100644 --- a/public/app/features/org/partials/change_password.html +++ b/public/app/features/org/partials/change_password.html @@ -1,9 +1,9 @@ - + -
-
- -
+
+

+ Change your password +

You cannot change password when ldap or auth proxy authentication is enabled. diff --git a/public/app/features/org/partials/newOrg.html b/public/app/features/org/partials/newOrg.html index bd2fce86bf7..424c55d6eb7 100644 --- a/public/app/features/org/partials/newOrg.html +++ b/public/app/features/org/partials/newOrg.html @@ -1,9 +1,9 @@ - + -
-
-

New Organization

-
+
+

+ New Organization +

Each organization contains their own dashboards, data sources and configuration, and cannot be shared between orgs. While users may belong to more than one, mutiple organization are most frequently used in multi-tenant deployments.

diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html index 854af218e77..96dba65d1ad 100644 --- a/public/app/features/org/partials/orgApiKeys.html +++ b/public/app/features/org/partials/orgApiKeys.html @@ -2,7 +2,7 @@
-

Add new

+

Add new

@@ -20,7 +20,7 @@
-

Existing Keys

+

Existing Keys

diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html index da99436a93d..f5a49e3d3ee 100644 --- a/public/app/features/org/partials/orgDetails.html +++ b/public/app/features/org/partials/orgDetails.html @@ -1,34 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/public/app/features/org/prefs_control.ts b/public/app/features/org/prefs_control.ts index 7843b5229d1..1bc758bf2cc 100644 --- a/public/app/features/org/prefs_control.ts +++ b/public/app/features/org/prefs_control.ts @@ -49,7 +49,7 @@ export class PrefsControlCtrl { var template = `
-

Preferences

+

Preferences

UI Theme diff --git a/public/app/features/styleguide/styleguide.html b/public/app/features/styleguide/styleguide.html index 4229349a030..7a003168ec8 100644 --- a/public/app/features/styleguide/styleguide.html +++ b/public/app/features/styleguide/styleguide.html @@ -1,34 +1,10 @@ - - -
-
- - - - - Switch theme - - -
- -
+ -
+
-
-
    -
  • - ${{color.name}} - {{color.value}} -
    • -
-
+

Buttons

-
+
-
+
@@ -46,13 +22,13 @@
-
-

From grafana 3.0 it's very easy to develop your own plugins and share them with other grafana users.

-

More information about plugin development can be found at docs.grafana.org

-
+

Forms

-
- forms +
+
+ + +
diff --git a/public/app/features/styleguide/styleguide.ts b/public/app/features/styleguide/styleguide.ts index 7f3e0f57f95..be155d0a994 100644 --- a/public/app/features/styleguide/styleguide.ts +++ b/public/app/features/styleguide/styleguide.ts @@ -8,7 +8,7 @@ class StyleGuideCtrl { theme: string; buttonNames = ['primary', 'secondary', 'inverse', 'success', 'warning', 'danger']; buttonSizes = ['btn-small', '', 'btn-large']; - buttonVariants = ['-', '-outline-']; + buttonVariants = ['-']; icons: any = []; page: any; pages = ['colors', 'buttons', 'icons', 'plugins']; @@ -16,7 +16,7 @@ class StyleGuideCtrl { /** @ngInject **/ constructor(private $http, private $routeParams, private backendSrv, navModelSrv) { - this.navModel = navModelSrv.getNav('cfg', 'admin', 'styleguide'); + this.navModel = navModelSrv.getNav('cfg', 'admin', 'styleguide', 1); this.theme = config.bootData.user.lightTheme ? 'light': 'dark'; this.page = {}; diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss index e8dc28c96b6..eb4a699eea5 100644 --- a/public/sass/base/_icons.scss +++ b/public/sass/base/_icons.scss @@ -51,5 +51,6 @@ background-image: url('../img/icons_#{$theme-name}_theme/icon_user_group.svg'); } - - +.gicon-org { + background-image: url('../img/icons_#{$theme-name}_theme/icon_org.svg'); +} diff --git a/public/sass/components/_page_header.scss b/public/sass/components/_page_header.scss index 1211e244a91..8099334446b 100644 --- a/public/sass/components/_page_header.scss +++ b/public/sass/components/_page_header.scss @@ -47,7 +47,7 @@ position: relative; &.fa { - top: 8px; + top: 10px; } &.gicon {