diff --git a/pkg/api/index.go b/pkg/api/index.go index 64b6da6a3a7..cffbf04482e 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -100,6 +100,14 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { } } + if c.IsGrafanaAdmin { + data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ + Text: "Admin", + Icon: "fa fa-fw fa-cogs", + Url: setting.AppSubUrl + "/admin", + }) + } + return &data, nil } diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html index 02369f5f608..8f070616d6e 100644 --- a/public/app/core/components/navbar/navbar.html +++ b/public/app/core/components/navbar/navbar.html @@ -1,5 +1,6 @@
+
@@ -10,12 +11,10 @@
-
- - - {{ctrl.title}} - - + +
+ +
diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts index f4bea8f089a..044c2579820 100644 --- a/public/app/core/components/navbar/navbar.ts +++ b/public/app/core/components/navbar/navbar.ts @@ -29,4 +29,28 @@ export function navbarDirective() { }; } +var navButtonTemplate = ` +
+ + + {{::title}} + +
+`; + +function navButton() { + return { + restrict: 'E', + template: navButtonTemplate, + scope: { + title: "@", + titleUrl: "@", + }, + link: function(scope, elem, attrs, ctrl) { + scope.icon = attrs.icon; + } + }; +} + coreModule.directive('navbar', navbarDirective); +coreModule.directive('navButton', navButton); diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index 837e3e386b0..f4221367fdf 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -26,16 +26,6 @@ -
  • -
    - -
    -
    Grafana Admin
    -
    v {{ctrl.grafanaVersion}}
    -
    -
    -
    • -
  • @@ -54,15 +44,6 @@
    • - -
  • diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 80eb967f377..0147eb51062 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -11,8 +11,6 @@ export class SideMenuCtrl { user: any; mainLinks: any; orgMenu: any; - systemSection: any; - grafanaVersion: any; appSubUrl: string; /** @ngInject */ @@ -21,11 +19,11 @@ export class SideMenuCtrl { this.user = contextSrv.user; this.appSubUrl = config.appSubUrl; this.showSignout = this.contextSrv.isSignedIn && !config['authProxyEnabled']; - this.updateMenu(); + + this.mainLinks = config.bootData.mainNavLinks; this.openUserDropdown(); this.$scope.$on('$routeChangeSuccess', () => { - this.updateMenu(); if (!this.contextSrv.pinned) { this.contextSrv.sidemenu = false; } @@ -37,10 +35,6 @@ export class SideMenuCtrl { return config.appSubUrl + url; } - setupMainNav() { - this.mainLinks = config.bootData.mainNavLinks; - } - openUserDropdown() { this.orgMenu = [ {section: 'You', cssClass: 'dropdown-menu-title'}, @@ -70,10 +64,6 @@ export class SideMenuCtrl { this.orgMenu.push({cssClass: "divider"}); - if (this.contextSrv.isGrafanaAdmin) { - this.orgMenu.push({text: "Grafana adminstration", icon: "fa fa-fw fa-cogs", url: this.getUrl("/admin/settings")}); - } - this.backendSrv.get('/api/user/orgs').then(orgs => { orgs.forEach(org => { if (org.orgId === this.contextSrv.user.orgId) { @@ -100,48 +90,6 @@ export class SideMenuCtrl { window.location.href = window.location.href; }); }; - - setupAdminNav() { - this.systemSection = true; - this.grafanaVersion = config.buildInfo.version; - - this.mainLinks.push({ - text: "System info", - icon: "fa fa-fw fa-info", - url: this.getUrl("/admin/settings"), - }); - - this.mainLinks.push({ - text: "Stats", - icon: "fa fa-fw fa-bar-chart", - url: this.getUrl("/admin/stats"), - }); - - this.mainLinks.push({ - text: "Users", - icon: "fa fa-fw fa-user", - url: this.getUrl("/admin/users"), - }); - - this.mainLinks.push({ - text: "Organizations", - icon: "fa fa-fw fa-users", - url: this.getUrl("/admin/orgs"), - }); - - } - - updateMenu() { - this.systemSection = false; - this.mainLinks = []; - - var currentPath = this.$location.path(); - if (currentPath.indexOf('/admin') === 0) { - this.setupAdminNav(); - } else { - this.setupMainNav(); - } - }; } export function sideMenuDirective() { diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts index c3ae868d12c..7d33cf8df85 100644 --- a/public/app/core/routes/routes.ts +++ b/public/app/core/routes/routes.ts @@ -12,6 +12,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) { var loadOrgBundle = new BundleLoader('app/features/org/all'); var loadAppsBundle = new BundleLoader('app/features/apps/all'); + var loadAdminBundle = new BundleLoader('app/features/admin/admin'); $routeProvider .when('/', { @@ -95,35 +96,49 @@ function setupAngularRoutes($routeProvider, $locationProvider) { templateUrl: 'public/app/features/profile/partials/select_org.html', controller : 'SelectOrgCtrl', }) + // ADMIN + .when('/admin', { + templateUrl: 'public/app/features/admin/partials/admin_home.html', + controller : 'AdminHomeCtrl', + resolve: loadAdminBundle, + }) .when('/admin/settings', { templateUrl: 'public/app/features/admin/partials/settings.html', controller : 'AdminSettingsCtrl', + resolve: loadAdminBundle, }) .when('/admin/users', { templateUrl: 'public/app/features/admin/partials/users.html', controller : 'AdminListUsersCtrl', + resolve: loadAdminBundle, }) .when('/admin/users/create', { templateUrl: 'public/app/features/admin/partials/new_user.html', controller : 'AdminEditUserCtrl', + resolve: loadAdminBundle, }) .when('/admin/users/edit/:id', { templateUrl: 'public/app/features/admin/partials/edit_user.html', controller : 'AdminEditUserCtrl', + resolve: loadAdminBundle, }) .when('/admin/orgs', { templateUrl: 'public/app/features/admin/partials/orgs.html', controller : 'AdminListOrgsCtrl', + resolve: loadAdminBundle, }) .when('/admin/orgs/edit/:id', { templateUrl: 'public/app/features/admin/partials/edit_org.html', controller : 'AdminEditOrgCtrl', + resolve: loadAdminBundle, }) .when('/admin/stats', { templateUrl: 'public/app/features/admin/partials/stats.html', controller : 'AdminStatsCtrl', controllerAs: 'ctrl', + resolve: loadAdminBundle, }) + // LOGIN / SIGNUP .when('/login', { templateUrl: 'public/app/partials/login.html', controller : 'LoginCtrl', diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts new file mode 100644 index 00000000000..47757520afe --- /dev/null +++ b/public/app/features/admin/admin.ts @@ -0,0 +1,38 @@ +import './adminListUsersCtrl'; +import './adminListOrgsCtrl'; +import './adminEditOrgCtrl'; +import './adminEditUserCtrl'; + +import coreModule from 'app/core/core_module'; + +class AdminSettingsCtrl { + + /** @ngInject **/ + constructor($scope, backendSrv) { + + backendSrv.get('/api/admin/settings').then(function(settings) { + $scope.settings = settings; + }); + + } +} + +class AdminHomeCtrl { + /** @ngInject **/ + constructor() {} +} + +export class AdminStatsCtrl { + stats: any; + + /** @ngInject */ + constructor(backendSrv: any) { + backendSrv.get('/api/admin/stats').then(stats => { + this.stats = stats; + }); + } +} + +coreModule.controller('AdminSettingsCtrl', AdminSettingsCtrl); +coreModule.controller('AdminHomeCtrl', AdminHomeCtrl); +coreModule.controller('AdminStatsCtrl', AdminStatsCtrl); diff --git a/public/app/features/admin/adminStatsCtrl.ts b/public/app/features/admin/adminStatsCtrl.ts deleted file mode 100644 index aa3ed6de343..00000000000 --- a/public/app/features/admin/adminStatsCtrl.ts +++ /dev/null @@ -1,18 +0,0 @@ -/// - -import angular from 'angular'; - -export class AdminStatsCtrl { - stats: any; - - /** @ngInject */ - constructor(private backendSrv: any) {} - - init() { - this.backendSrv.get('/api/admin/stats').then(stats => { - this.stats = stats; - }); - } -} - -angular.module('grafana.controllers').controller('AdminStatsCtrl', AdminStatsCtrl); diff --git a/public/app/features/admin/all.js b/public/app/features/admin/all.js deleted file mode 100644 index 786210f064f..00000000000 --- a/public/app/features/admin/all.js +++ /dev/null @@ -1,8 +0,0 @@ -define([ - './adminListUsersCtrl', - './adminListOrgsCtrl', - './adminEditOrgCtrl', - './adminEditUserCtrl', - './adminSettingsCtrl', - './adminStatsCtrl', -], function () {}); diff --git a/public/app/features/admin/partials/admin_home.html b/public/app/features/admin/partials/admin_home.html new file mode 100644 index 00000000000..aa667ddd2d0 --- /dev/null +++ b/public/app/features/admin/partials/admin_home.html @@ -0,0 +1,28 @@ + + + +
    +
    +

    + Server Administration +

    +
    + +     + Manage Users + + + + Manage Organizations + + + + View Server Settings + + + + View Server Stats + + +
    + diff --git a/public/app/features/admin/partials/edit_org.html b/public/app/features/admin/partials/edit_org.html index 975a4b6c93b..804076d8eed 100644 --- a/public/app/features/admin/partials/edit_org.html +++ b/public/app/features/admin/partials/edit_org.html @@ -1,14 +1,13 @@ - - + +
    -
    -

    - Organization Details -

    +
    +

    + Edit Organization +

    +
    diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index 8bf705a6067..192a1e556ea 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -1,150 +1,148 @@ - - + +
    -
    -

    +
    +

    Edit User -

    - - -
    -
    -
      -
    • - Name -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Email -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Username -
      • -
    • - -
      • -
    -
    -
    -
    - -
    - - - -

    - Change password -

    - -
    -
    -
    -
      -
    • - New password -
      • -
    • - -
      • -
    -
    -
    -
    - -
    - -
    - -

    - Permissions -

    +

    +
    +
    -
    +
      -
    • - Grafana Admin  - - +
    • + Name +
      • +
    • +
    -
    - -
    -
    - -

    - Organizations -

    - -
      -
    • - Add organization +
    • + Email
    • - +
      • -
    • - Role -
      • -
    • - -
      • -
    • - -
      • -
    +
    - +
    +
      +
    • + Username +
      • +
    • + +
      • +
    +
    +
    +
    - - - - - - - - - - - -
    NameRole
    - {{org.name}} Current - - - - - - -
    +
    + + +

    + Change password +

    + +
    +
    +
    +
      +
    • + New password +
      • +
    • + +
      • +
    +
    +
    +
    + +
    + +
    + +

    + Permissions +

    + +
    +
    +
      +
    • + Grafana Admin  + + +
      • +
    +
    +
    +
    + +
    + +

    + Organizations +

    + +
    +
    +
      +
    • + Add organization +
      • +
    • + +
      • +
    • + Role +
      • +
    • + +
      • +
    • + +
      • +
      +
    +
    +
    + + + + + + + + + + + + +
    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 f0812a15b6d..99d2f974565 100644 --- a/public/app/features/admin/partials/new_user.html +++ b/public/app/features/admin/partials/new_user.html @@ -1,65 +1,63 @@ - - + +
    -
    -

    +
    +

    Add new user -

    - -
    -
    -
    -
      -
    • - Name -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Email -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Username -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Password -
      • -
    • - -
      • -
    -
    -
    -
    - -
    - -
    +

    + +
    +
    +
    +
      +
    • + Name +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Email +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Username +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Password +
      • +
    • + +
      • +
    +
    +
    +
    + +
    + +
    diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html index 8ef7930c638..fbda738b501 100644 --- a/public/app/features/admin/partials/orgs.html +++ b/public/app/features/admin/partials/orgs.html @@ -1,35 +1,37 @@ - + +
    -
    -

    +
    +

    Organizations -

    - - - - - - - - - - - - - - - -
    IdName
    {{org.id}}{{org.name}} - - - Edit - -    - - - -
    +

    + + + + + + + + + + + + + + + + +
    IdName
    {{org.id}}{{org.name}} + + + Edit + +    + + + +
    diff --git a/public/app/features/admin/partials/settings.html b/public/app/features/admin/partials/settings.html index 2b55b968955..a941ed69bae 100644 --- a/public/app/features/admin/partials/settings.html +++ b/public/app/features/admin/partials/settings.html @@ -1,11 +1,12 @@ - +
    -
    -

    - System information -

    +
    +

    + Server settings +

    +
    These system settings are defined in grafana.ini or grafana.custom.ini (or overriden in ENV variables). @@ -22,7 +23,6 @@ {{keyValue}} -
    diff --git a/public/app/features/admin/partials/stats.html b/public/app/features/admin/partials/stats.html index 1d20e59349d..e9af199fa60 100644 --- a/public/app/features/admin/partials/stats.html +++ b/public/app/features/admin/partials/stats.html @@ -1,57 +1,57 @@ - +
    -
    +

    - Overview + Stats

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameValue
    Total dashboards{{ctrl.stats.dashboard_count}}
    Total users{{ctrl.stats.user_count}}
    Total grafana admins{{ctrl.stats.grafana_admin_count}}
    Total organizations{{ctrl.stats.org_count}}
    Total datasources{{ctrl.stats.data_source_count}}
    Total playlists{{ctrl.stats.playlist_count}}
    Total snapshots{{ctrl.stats.db_snapshot_count}}
    Total dashboard tags{{ctrl.stats.db_tag_count}}
    Total starred dashboards{{ctrl.stats.starred_db_count}}
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameValue
    Total dashboards{{ctrl.stats.dashboard_count}}
    Total users{{ctrl.stats.user_count}}
    Total grafana admins{{ctrl.stats.grafana_admin_count}}
    Total organizations{{ctrl.stats.org_count}}
    Total datasources{{ctrl.stats.data_source_count}}
    Total playlists{{ctrl.stats.playlist_count}}
    Total snapshots{{ctrl.stats.db_snapshot_count}}
    Total dashboard tags{{ctrl.stats.db_tag_count}}
    Total starred dashboards{{ctrl.stats.starred_db_count}}
    diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html index 00182db3fde..adafe2ddf6f 100644 --- a/public/app/features/admin/partials/users.html +++ b/public/app/features/admin/partials/users.html @@ -1,45 +1,46 @@ - + +
    -
    - +
    +

    Users

    + +     Add new user - -

    Users

    - - - - - - - - - - - - - - - - - - - - - - -
    IdNameLoginEmailGrafana Admin
    {{user.id}}{{user.name}}{{user.login}}{{user.email}}{{user.isAdmin}} - - - Edit - -    - - - -
    + + + + + + + + + + + + + + + + + + + + + + +
    IdNameLoginEmailGrafana Admin
    {{user.id}}{{user.name}}{{user.login}}{{user.email}}{{user.isAdmin}} + + + Edit + +    + + + +
    diff --git a/public/app/features/all.js b/public/app/features/all.js index 4ec4719ebdd..dcaf33c8331 100644 --- a/public/app/features/all.js +++ b/public/app/features/all.js @@ -10,5 +10,4 @@ define([ './profile/profileCtrl', './profile/changePasswordCtrl', './profile/selectOrgCtrl', - './admin/all', ], function () {});