diff --git a/src/app/controllers/sideMenuCtrl.js b/src/app/controllers/sideMenuCtrl.js new file mode 100644 index 00000000000..89e852e7e46 --- /dev/null +++ b/src/app/controllers/sideMenuCtrl.js @@ -0,0 +1,40 @@ +define([ + 'angular', + 'config', +], +function (angular, config) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('SideMenuCtrl', function($scope) { + + $scope.menu = [ + { + href: config.appSubUrl, + text: 'Dashboards', + icon: 'fa fa-th-large' + }, + { + href: 'panels', + text: 'Panels', + icon: 'fa fa-signal', + }, + { + href: 'alerts', + text: 'Alerts', + icon: 'fa fa-bolt', + }, + { + href: 'account', + text: 'Account', + icon: 'fa fa-user', + }, + ]; + + $scope.init = function() { + }; + + }); + +}); diff --git a/src/app/features/admin/accountsCtrl.js b/src/app/features/admin/accountsCtrl.js new file mode 100644 index 00000000000..9be27e719a5 --- /dev/null +++ b/src/app/features/admin/accountsCtrl.js @@ -0,0 +1,26 @@ +define([ + 'angular', +], +function (angular) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('AccountsCtrl', function($scope, backendSrv) { + + $scope.init = function() { + $scope.accounts = []; + $scope.getAccounts(); + }; + + $scope.getAccounts = function() { + backendSrv.get('/api/admin/accounts').then(function(accounts) { + console.log(accounts); + $scope.accounts = accounts; + }); + }; + + $scope.init(); + + }); +}); diff --git a/src/app/features/admin/partials/accounts.html b/src/app/features/admin/partials/accounts.html new file mode 100644 index 00000000000..ffd6c701582 --- /dev/null +++ b/src/app/features/admin/partials/accounts.html @@ -0,0 +1,37 @@ +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + +
IdLoginEmailNameAdmin
{{account.id}}{{account.login}}{{account.email}}{{account.name}}{{account.isAdmin}} + + + Edit + +    + + + +
+
+
+
diff --git a/src/app/features/all.js b/src/app/features/all.js index 296d36f2f38..7d6366d51f2 100644 --- a/src/app/features/all.js +++ b/src/app/features/all.js @@ -9,6 +9,6 @@ define([ './dashboard/all', './account/accountCtrl', './account/datasourcesCtrl', - './admin/adminCtrl', + './admin/accountsCtrl', './grafanaDatasource/datasource', ], function () {}); diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index 52739741f67..eadc69af3a2 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -28,7 +28,7 @@ Account - + Admin diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js index 00fe1123bdb..1156308b3c8 100644 --- a/src/app/routes/backend/all.js +++ b/src/app/routes/backend/all.js @@ -38,9 +38,9 @@ define([ templateUrl: 'app/features/account/partials/account.html', controller : 'AccountCtrl', }) - .when('/admin/', { - templateUrl: 'app/features/admin/partials/admin.html', - controller : 'AdminCtrl', + .when('/admin/accounts', { + templateUrl: 'app/features/admin/partials/accounts.html', + controller : 'AccountsCtrl', }) .when('/login', { templateUrl: 'app/partials/login.html', diff --git a/src/css/less/tables_lists.less b/src/css/less/tables_lists.less index faa9069ffb8..f51f214c4cc 100644 --- a/src/css/less/tables_lists.less +++ b/src/css/less/tables_lists.less @@ -5,7 +5,8 @@ background-color: @grafanaListAccent; } - td { + td, th { + text-align: left; padding: 5px 10px; white-space: nowrap; border-bottom: 1px solid @grafanaListBorderBottom;