From 6cc1502c8998332fc4409ea15e68e42c1724144b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 14 Jan 2015 10:19:23 +0100 Subject: [PATCH] Renamed register routes/ctrl to signup --- src/app/controllers/all.js | 2 +- src/app/controllers/{registerCtrl.js => signUpCtrl.js} | 4 ++-- src/app/partials/login.html | 2 +- src/app/routes/backend/all.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/app/controllers/{registerCtrl.js => signUpCtrl.js} (76%) diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index 9f162c53ca5..752df8b3894 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -7,6 +7,6 @@ define([ './inspectCtrl', './jsonEditorCtrl', './loginCtrl', - './registerCtrl', + './signUpCtrl', './errorCtrl', ], function () {}); diff --git a/src/app/controllers/registerCtrl.js b/src/app/controllers/signUpCtrl.js similarity index 76% rename from src/app/controllers/registerCtrl.js rename to src/app/controllers/signUpCtrl.js index 5395826c1a3..081cee5a7b1 100644 --- a/src/app/controllers/registerCtrl.js +++ b/src/app/controllers/signUpCtrl.js @@ -6,7 +6,7 @@ function (angular) { var module = angular.module('grafana.routes'); - module.controller('RegisterCtrl', function($scope, backendSrv, $location) { + module.controller('SignUpCtrl', function($scope, backendSrv, $location) { $scope.loginModel = {}; $scope.grafana.sidemenu = false; @@ -19,7 +19,7 @@ function (angular) { return; } - backendSrv.post('/api/account', $scope.loginModel).then(function() { + backendSrv.post('/api/account/signup', $scope.loginModel).then(function() { $location.path('/login'); }); }; diff --git a/src/app/partials/login.html b/src/app/partials/login.html index 119b8dc6553..fcaff528ff9 100644 --- a/src/app/partials/login.html +++ b/src/app/partials/login.html @@ -38,7 +38,7 @@
- Sign up now! + Sign up now!
diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js index 5d0e623c8e5..00fe1123bdb 100644 --- a/src/app/routes/backend/all.js +++ b/src/app/routes/backend/all.js @@ -46,9 +46,9 @@ define([ templateUrl: 'app/partials/login.html', controller : 'LoginCtrl', }) - .when('/register', { + .when('/signup', { templateUrl: 'app/partials/register.html', - controller : 'RegisterCtrl', + controller : 'SignUpCtrl', }) .when('/dashboard/solo/:id/', { templateUrl: 'app/partials/solo-panel.html',