Renamed register routes/ctrl to signup

pull/1442/head
Torkel Ödegaard 11 years ago
parent 9f4ea7301a
commit 6cc1502c89
  1. 2
      src/app/controllers/all.js
  2. 4
      src/app/controllers/signUpCtrl.js
  3. 2
      src/app/partials/login.html
  4. 4
      src/app/routes/backend/all.js

@ -7,6 +7,6 @@ define([
'./inspectCtrl', './inspectCtrl',
'./jsonEditorCtrl', './jsonEditorCtrl',
'./loginCtrl', './loginCtrl',
'./registerCtrl', './signUpCtrl',
'./errorCtrl', './errorCtrl',
], function () {}); ], function () {});

@ -6,7 +6,7 @@ function (angular) {
var module = angular.module('grafana.routes'); var module = angular.module('grafana.routes');
module.controller('RegisterCtrl', function($scope, backendSrv, $location) { module.controller('SignUpCtrl', function($scope, backendSrv, $location) {
$scope.loginModel = {}; $scope.loginModel = {};
$scope.grafana.sidemenu = false; $scope.grafana.sidemenu = false;
@ -19,7 +19,7 @@ function (angular) {
return; return;
} }
backendSrv.post('/api/account', $scope.loginModel).then(function() { backendSrv.post('/api/account/signup', $scope.loginModel).then(function() {
$location.path('/login'); $location.path('/login');
}); });
}; };

@ -38,7 +38,7 @@
</div> </div>
<div class="register-box text-center"> <div class="register-box text-center">
<a href="register" class="btn btn-info">Sign up now!</a> <a href="signup" class="btn btn-info">Sign up now!</a>
</div> </div>
</div> </div>

@ -46,9 +46,9 @@ define([
templateUrl: 'app/partials/login.html', templateUrl: 'app/partials/login.html',
controller : 'LoginCtrl', controller : 'LoginCtrl',
}) })
.when('/register', { .when('/signup', {
templateUrl: 'app/partials/register.html', templateUrl: 'app/partials/register.html',
controller : 'RegisterCtrl', controller : 'SignUpCtrl',
}) })
.when('/dashboard/solo/:id/', { .when('/dashboard/solo/:id/', {
templateUrl: 'app/partials/solo-panel.html', templateUrl: 'app/partials/solo-panel.html',

Loading…
Cancel
Save