Merge branch 'loic' of github.com:manzerbredes/istic-openstack into loic

1 files changed, 25 insertions, 23 deletions

diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 2f74414..d08a9f2 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -1,8 +1,3 @@
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 
 /**
  * Represents a book.
@@ -10,30 +5,37 @@
  */
 mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
 {
-     // Define default states
-     $('#loginModal').modal({backdrop: 'static', keyboard: false});
-     $('#loadingLoginButton').hide();
-     $('#failedToLoginAlert').hide();
+    // Define default states
+    $('#loginModal').modal({backdrop: 'static', keyboard: false});
+    $('#loadingLoginButton').hide();
+    $('#failedToLoginAlert').hide();
      
      
-     $('#loginButton').click(function(){
-        $('#loginButton').hide();
-        $('#loadingLoginButton').show();
-        $('#failedToLoginAlert').hide();
+    $('#loginButton').click(function(){
+    $('#loginButton').hide();
+    $('#loadingLoginButton').show();
+    $('#failedToLoginAlert').hide();
 
-        
+    var result=identity.login($("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val());
 
-        $interval(
-          function() 
-          {
-                           $('#failedToLoginAlert').show();
 
+    $interval(
+        function() 
+        {
+            // Check for error
+            if(!errors.checkForLogin(result)){
+                $('#failedToLoginAlert').show();
+            }
+            else {
+                $('#loginModal').modal('hide');
+            }
+            
+            // Reset button state
             $('#loginButton').show();
-        $('#loadingLoginButton').hide();
-        
-          }, 2000,1);
-        
+            $('#loadingLoginButton').hide();
+        }, 2000,1);
+
 
         
      });
-})
+});