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

client/index.html

@@ -73,6 +73,7 @@
     
     <!-- Include resquest dependencies -->
     <script src="./js/requests/identity.js"></script>
+    <script src="./js/requests/errors.js"></script>
 
     <!-- Include controller -->
     <script src="./js/controllers/login.js"></script>

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
+    // Define default states
-     $('#loginModal').modal({backdrop: 'static', keyboard: false});
+    $('#loginModal').modal({backdrop: 'static', keyboard: false});
-     $('#loadingLoginButton').hide();
+    $('#loadingLoginButton').hide();
-     $('#failedToLoginAlert').hide();
+    $('#failedToLoginAlert').hide();
      
      
-     $('#loginButton').click(function(){
+    $('#loginButton').click(function(){
-        $('#loginButton').hide();
+    $('#loginButton').hide();
-        $('#loadingLoginButton').show();
+    $('#loadingLoginButton').show();
-        $('#failedToLoginAlert').hide();
+    $('#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();
+            $('#loadingLoginButton').hide();
-        
+        }, 2000,1);
-          }, 2000,1);
+
-        
 
         
      });
-})
+});

client/js/requests/errors.js

@@ -0,0 +1,14 @@
+/* 
+ * 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.
+ */
+
+
+var errors={};
+
+
+errors.checkForLogin=function(result){
+    // TODO
+    return true;
+};

client/js/requests/identity.js

@@ -1,9 +1,14 @@
 
 // Make Namespace
-var identity = {} ;
+var identity = {};
-
 
 
+identity.login=function(username, projectname, password){
+    
+    // Todo
+    
+    return "tokens";
+};
 
 
 

client/partials/login.html

@@ -12,18 +12,18 @@
             <div class="modal-body">
 
                 <div class="form-group">
-                    <label label-default="" for="inputUser">User</label>
+                    <label label-default="" for="loginFormUsername">User</label>
-                    <input class="form-control" id="inputUser"
+                    <input class="form-control" id="loginFormUsername"
                     placeholder="Email" type="text" ng-model="identityFormData.user">
                 </div>
                 <div class="form-group">
-                    <label label-default="" for="inputProject">Project</label>
+                    <label label-default="" for="loginFormProjectname">Project</label>
-                    <input class="form-control" id="inputProject"
+                    <input class="form-control" id="loginFormProjectname"
                     placeholder="Project Name" type="password" ng-model="identityFormData.project">
                 </div>
                 <div class="form-group">
-                    <label label-default="" for="inputPassword">Password</label>
+                    <label label-default="" for="loginFormPassword">Password</label>
-                    <input class="form-control" id="inputPassword"
+                    <input class="form-control" id="loginFormPassword"
                     placeholder="Password" type="password" ng-model="identityFormData.password">
                 </div>