From b66894f72780cbed0edb01f9bd26cc47298daa98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 11 Jan 2015 12:12:12 +0100 Subject: [PATCH] Added system admin page skeleton --- .../{admin => account}/accountCtrl.js | 0 .../{admin => account}/datasourcesCtrl.js | 8 +++---- .../{admin => account}/partials/account.html | 0 .../partials/datasources.html | 2 +- src/app/features/admin/adminCtrl.js | 18 +++++++++++++++ src/app/features/admin/partials/admin.html | 23 +++++++++++++++++++ src/app/features/all.js | 5 ++-- src/app/partials/sidemenu.html | 7 ++++-- src/app/routes/backend/all.js | 10 +++++--- 9 files changed, 61 insertions(+), 12 deletions(-) rename src/app/features/{admin => account}/accountCtrl.js (100%) rename src/app/features/{admin => account}/datasourcesCtrl.js (83%) rename src/app/features/{admin => account}/partials/account.html (100%) rename src/app/features/{admin => account}/partials/datasources.html (99%) create mode 100644 src/app/features/admin/adminCtrl.js create mode 100644 src/app/features/admin/partials/admin.html diff --git a/src/app/features/admin/accountCtrl.js b/src/app/features/account/accountCtrl.js similarity index 100% rename from src/app/features/admin/accountCtrl.js rename to src/app/features/account/accountCtrl.js diff --git a/src/app/features/admin/datasourcesCtrl.js b/src/app/features/account/datasourcesCtrl.js similarity index 83% rename from src/app/features/admin/datasourcesCtrl.js rename to src/app/features/account/datasourcesCtrl.js index 5d53151a9ca..3563634fc31 100644 --- a/src/app/features/admin/datasourcesCtrl.js +++ b/src/app/features/account/datasourcesCtrl.js @@ -45,19 +45,19 @@ function (angular) { }; $scope.getDatasources = function() { - backendSrv.get('/api/admin/datasources/list').then(function(results) { + backendSrv.get('/api/datasources/list').then(function(results) { $scope.datasources = results; }); }; $scope.remove = function(ds) { - backendSrv.delete('/api/admin/datasources/' + ds.id).then(function() { + backendSrv.delete('/api/datasources/' + ds.id).then(function() { $scope.getDatasources(); }); }; $scope.update = function() { - backendSrv.post('/api/admin/datasources', $scope.current).then(function() { + backendSrv.post('/api/datasources', $scope.current).then(function() { $scope.editor.index = 0; $scope.getDatasources(); }); @@ -68,7 +68,7 @@ function (angular) { return; } - backendSrv.put('/api/admin/datasources', $scope.current) + backendSrv.put('/api/datasources', $scope.current) .then(function() { $scope.editor.index = 0; $scope.getDatasources(); diff --git a/src/app/features/admin/partials/account.html b/src/app/features/account/partials/account.html similarity index 100% rename from src/app/features/admin/partials/account.html rename to src/app/features/account/partials/account.html diff --git a/src/app/features/admin/partials/datasources.html b/src/app/features/account/partials/datasources.html similarity index 99% rename from src/app/features/admin/partials/datasources.html rename to src/app/features/account/partials/datasources.html index 9d179817f4e..86264721cbe 100644 --- a/src/app/features/admin/partials/datasources.html +++ b/src/app/features/account/partials/datasources.html @@ -6,7 +6,7 @@
- + Data sources
diff --git a/src/app/features/admin/adminCtrl.js b/src/app/features/admin/adminCtrl.js new file mode 100644 index 00000000000..bda82618503 --- /dev/null +++ b/src/app/features/admin/adminCtrl.js @@ -0,0 +1,18 @@ +define([ + 'angular', +], +function (angular) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('AdminCtrl', function($scope) { + + $scope.init = function() { + $scope.editor = {index: 0}; + }; + + $scope.init(); + + }); +}); diff --git a/src/app/features/admin/partials/admin.html b/src/app/features/admin/partials/admin.html new file mode 100644 index 00000000000..637dd49f396 --- /dev/null +++ b/src/app/features/admin/partials/admin.html @@ -0,0 +1,23 @@ +
+ +
+
+
+ +
+
+ + System administration +
+ +
+
+
+
+ +
+ +
+
+
+
diff --git a/src/app/features/all.js b/src/app/features/all.js index 2a22f0c5dd3..296d36f2f38 100644 --- a/src/app/features/all.js +++ b/src/app/features/all.js @@ -7,7 +7,8 @@ define([ './opentsdb/datasource', './elasticsearch/datasource', './dashboard/all', - './admin/accountCtrl', - './admin/datasourcesCtrl', + './account/accountCtrl', + './account/datasourcesCtrl', + './admin/adminCtrl', './grafanaDatasource/datasource', ], function () {}); diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index 4f45264348e..dca7226323a 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -20,13 +20,16 @@ Alerts - + Data sources - Account settings + Account + + + Admin diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js index a99d2b37b46..5d0e623c8e5 100644 --- a/src/app/routes/backend/all.js +++ b/src/app/routes/backend/all.js @@ -30,14 +30,18 @@ define([ controller : 'DashFromImportCtrl', reloadOnSearch: false, }) - .when('/admin/datasources', { - templateUrl: 'app/features/admin/partials/datasources.html', + .when('/account/datasources', { + templateUrl: 'app/features/account/partials/datasources.html', controller : 'DataSourcesCtrl', }) .when('/account', { - templateUrl: 'app/features/admin/partials/account.html', + templateUrl: 'app/features/account/partials/account.html', controller : 'AccountCtrl', }) + .when('/admin/', { + templateUrl: 'app/features/admin/partials/admin.html', + controller : 'AdminCtrl', + }) .when('/login', { templateUrl: 'app/partials/login.html', controller : 'LoginCtrl',