From e5fd35db343109feec09d339d5d770dd1de1808a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 18 Sep 2014 12:04:03 +0200 Subject: [PATCH] small progress on adding collaborators --- src/app/controllers/all.js | 2 +- .../{p_grafanaCtrl.js => pro/grafanaCtrl.js} | 0 .../{p_loginCtrl.js => pro/loginCtrl.js} | 0 src/app/partials/pro/account.html | 73 +++++++++++++++++++ src/app/partials/pro/sidemenu.html | 4 +- src/app/routes/p_admin.js | 26 +++++++ src/app/routes/p_login.js | 9 +-- 7 files changed, 104 insertions(+), 10 deletions(-) rename src/app/controllers/{p_grafanaCtrl.js => pro/grafanaCtrl.js} (100%) rename src/app/controllers/{p_loginCtrl.js => pro/loginCtrl.js} (100%) create mode 100644 src/app/partials/pro/account.html diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index 4ce2a6f5822..f5b943e36c6 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -1,5 +1,5 @@ define([ - './p_grafanaCtrl', + './pro/grafanaCtrl', './dashboardCtrl', './dashboardNavCtrl', './row', diff --git a/src/app/controllers/p_grafanaCtrl.js b/src/app/controllers/pro/grafanaCtrl.js similarity index 100% rename from src/app/controllers/p_grafanaCtrl.js rename to src/app/controllers/pro/grafanaCtrl.js diff --git a/src/app/controllers/p_loginCtrl.js b/src/app/controllers/pro/loginCtrl.js similarity index 100% rename from src/app/controllers/p_loginCtrl.js rename to src/app/controllers/pro/loginCtrl.js diff --git a/src/app/partials/pro/account.html b/src/app/partials/pro/account.html new file mode 100644 index 00000000000..177fd611136 --- /dev/null +++ b/src/app/partials/pro/account.html @@ -0,0 +1,73 @@ +
+
+
+ + + + + Account Settings + +
+
+
+ +
+ +
+
+ + Personal information +
+
+ +
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + Collaborators +
+
+ +
+
+
+
+ + + +
+
+
+
+
+ diff --git a/src/app/partials/pro/sidemenu.html b/src/app/partials/pro/sidemenu.html index dd3c728aa6e..182ee652b84 100644 --- a/src/app/partials/pro/sidemenu.html +++ b/src/app/partials/pro/sidemenu.html @@ -8,7 +8,7 @@
  • Logout - + Dashboards @@ -28,7 +28,7 @@ Global options - + User accounts diff --git a/src/app/routes/p_admin.js b/src/app/routes/p_admin.js index 75bf5b27223..24817efc233 100644 --- a/src/app/routes/p_admin.js +++ b/src/app/routes/p_admin.js @@ -14,8 +14,34 @@ function (angular) { }); }); + module.config(function($routeProvider) { + $routeProvider + .when('/account', { + templateUrl: 'app/partials/pro/account.html', + controller : 'AccountCtrl', + }); + }); + module.controller('AdminCtrl', function() { }); + module.controller('AccountCtrl', function($scope, $http) { + + $scope.collaborator = {}; + + $scope.addCollaborator = function() { + if (!$scope.addCollaboratorForm.$valid) { + return; + } + + $http.post('/api/account/collaborators/add', $scope.collaborator).then(function(results) { + + }, function(err) { + + }); + }; + + }); + }); diff --git a/src/app/routes/p_login.js b/src/app/routes/p_login.js index 42b33e045f4..6a9512262a2 100644 --- a/src/app/routes/p_login.js +++ b/src/app/routes/p_login.js @@ -1,6 +1,6 @@ define([ 'angular', - '../controllers/p_loginCtrl', + '../controllers/pro/loginCtrl', ], function (angular) { "use strict"; @@ -19,13 +19,10 @@ function (angular) { }); }); - module.controller('RegisterCtrl', function($scope, $http, $location, $routeParams) { + module.controller('RegisterCtrl', function($scope, $http, $location) { $scope.loginModel = {}; $scope.grafana.sidemenu = false; - $scope.init = function() { - }; - $scope.register = function() { delete $scope.registerError; @@ -42,8 +39,6 @@ function (angular) { }); }; - $scope.init(); - }); });