From c00384ad0644f9db7cdfa426c559d8fc3347a1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 22 Aug 2014 18:05:51 +0200
Subject: [PATCH] work on account registration

---
 src/app/controllers/p_grafanaCtrl.js |  2 +-
 src/app/partials/pro/register.html   |  7 +++++--
 src/app/routes/p_login.js            | 14 +++++---------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/app/controllers/p_grafanaCtrl.js b/src/app/controllers/p_grafanaCtrl.js
index e9484d76d64..65bb8745195 100644
--- a/src/app/controllers/p_grafanaCtrl.js
+++ b/src/app/controllers/p_grafanaCtrl.js
@@ -14,7 +14,7 @@ function (angular, config, _, $, store) {
 
     $scope.grafanaVersion = grafanaVersion[0] === '@' ? 'master' : grafanaVersion;
     $scope.consoleEnabled = store.getBool('grafanaConsole');
-    $scope.showProSideMenu = store.getBool('grafanaProSideMenu');
+    //$scope.showProSideMenu = store.getBool('grafanaProSideMenu');
 
     $rootScope.profilingEnabled = store.getBool('profilingEnabled');
     $rootScope.performance = { loadStart: new Date().getTime() };
diff --git a/src/app/partials/pro/register.html b/src/app/partials/pro/register.html
index 3a3ffe0b456..b6b1f94f500 100644
--- a/src/app/partials/pro/register.html
+++ b/src/app/partials/pro/register.html
@@ -5,7 +5,10 @@
 
 		<div class="login-box-logo">
 			<img src="/img/logo_transparent_200x75.png">
-			<h3>Grafana account registration</32>
+		</div>
+
+		<div class="text-center" style="margin-bottom: 50px">
+ 			<h3>Account registration</32>
 		</div>
 
 		<form name="loginForm" class="form-horizontal">
@@ -31,7 +34,7 @@
 					</div>
 				</div>
 				<div class="span4">
-					<button type="submit" ng-click="login()" class="btn btn-success btn-large">
+					<button type="submit" ng-click="register()" class="btn btn-success btn-large">
 						<i class="icon-lock"></i>
 						Sign up
 					</button>
diff --git a/src/app/routes/p_login.js b/src/app/routes/p_login.js
index e97bba49a0e..91f9242a300 100644
--- a/src/app/routes/p_login.js
+++ b/src/app/routes/p_login.js
@@ -30,20 +30,16 @@ function (angular) {
     $scope.register = function() {
       delete $scope.registerError;
 
-      if (!$scope.loginForm.$valid) {
+      if (!$scope.loginForm.$valid) { return; }
+      if ($scope.loginModel.password !== $scope.loginModel.password2) {
+        $scope.registerError = "Passwords do not match";
         return;
       }
 
       $http.post('/api/register/user', $scope.loginModel).then(function() {
-        $scope.emitAppEvent('logged-in');
-        $location.path('/');
+        $location.path('/login');
       }, function(err) {
-        if (err.status === 401) {
-          $scope.registerError = "Username or password is incorrect";
-        }
-        else {
-          $scope.loginError = "Unexpected error";
-        }
+        $scope.registerError = "Unexpected error: " + err;
       });
     };