Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 49 insertions, 48 deletions

diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 63cb6d1..4a0de42 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -5,62 +5,63 @@
  * @param {$sce} $sce The $sce angular service
  * @param {$http} $http The $http angular service
  * @param {Identity} The Identity service
-
+ 
  */
-mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$sce, Identity)
-{
-	// Check for login and define default states
-	if(!Identity.isAlreadyLogin()){
-		$('#loginModal').modal({backdrop: 'static', keyboard: false});
-	}
+mainApp.controller('loginCtrl', ['$scope', '$sce', 'Identity', '$rootScope', function ($scope, $sce, Identity, $rootScope)
+    {
+        // Check for login and define default states
+        if (!Identity.isAlreadyLogin()) {
+            $('#loginModal').modal({backdrop: 'static', keyboard: false});
+        }
 
-	// Manager logout event
-	$scope.$on('logoutEvent', function(){
-		$('#loginModal').modal({backdrop: 'static', keyboard: false});
-	});
+        // Manager logout event
+        $scope.$on('logoutEvent', function () {
+            $('#loginModal').modal({backdrop: 'static', keyboard: false});
+        });
 
 
-	
-	// Hide loading button and message alert
-    $('#loadingLoginButton').hide();
-    $('#failedToLoginAlert').hide();
 
-	
-	// Defined function for login
-    $scope.loginAction=function(){
-		
-		// Begin login state for template
-        $('#loginButton').hide();
-        $('#loadingLoginButton').show();
+        // Hide loading button and message alert
+        $('#loadingLoginButton').hide();
         $('#failedToLoginAlert').hide();
 
-		// Get data from templates
-        var username=$("#loginFormUsername").val();
-        var password=$("#loginFormPassword").val();
-        var projectname=$("#loginFormProjectname").val();
 
-		// Function to call to handle result
-		var responseCallback=function(response){
+        // Defined function for login
+        $scope.loginAction = function () {
+
+            // Begin login state for template
+            $('#loginButton').hide();
+            $('#loadingLoginButton').show();
+            $('#failedToLoginAlert').hide();
+
+            // Get data from templates
+            var username = $("#loginFormUsername").val();
+            var password = $("#loginFormPassword").val();
+            var projectname = $("#loginFormProjectname").val();
+
+            // Function to call to handle result
+            var responseCallback = function (response) {
+
+                if (response.status !== 0) {
+                    // Set reason of fail
+                    $scope.failReason = response.failReason;
+
+                    // Display the error
+                    $('#failedToLoginAlert').show();
+                } else {
+                    // Else the user is online !
+                    $('#loginModal').modal('hide');
+                    // Send login event
+                    $rootScope.$broadcast("loginEvent");
+                }
 
-            if(response.status!==0){
-				// Set reason of fail
-                $scope.failReason=response.failReason;
+                // Reset button state
+                $('#loginButton').show();
+                $('#loadingLoginButton').hide();
+            };
 
-				// Display the error
-                $('#failedToLoginAlert').show();
-            }
-            else {
-				// Else the user is online !
-				$('#loginModal').modal('hide');				
-            }
+            // Try to login
+            Identity.login(username, password, projectname, responseCallback);
+        };
 
-            // Reset button state
-            $('#loginButton').show();
-            $('#loadingLoginButton').hide();	
-		}
-		
-		// Try to login
-        Identity.login(username, password, projectname, responseCallback);
-    };
-	
-}]);
+    }]);