Merge branch 'develop' into Evan

mise a jour de la branche

4 files changed, 61 insertions, 6 deletions

diff --git a/client/js/controllers/home.js b/client/js/controllers/home/main.js
index d4e1b0e..2898de2 100644
--- a/client/js/controllers/home.js
+++ b/client/js/controllers/home/main.js
@@ -6,5 +6,6 @@
 
 mainApp.controller('homeCtrl', function ($scope)
 {
-     $scope.test="Home view";
+     
+    
 });
\ No newline at end of file
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
new file mode 100644
index 0000000..2f74414
--- /dev/null
+++ b/client/js/controllers/login.js
@@ -0,0 +1,39 @@
+/* 
+ * 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.
+ * @constructor
+ */
+mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
+{
+     // Define default states
+     $('#loginModal').modal({backdrop: 'static', keyboard: false});
+     $('#loadingLoginButton').hide();
+     $('#failedToLoginAlert').hide();
+     
+     
+     $('#loginButton').click(function(){
+        $('#loginButton').hide();
+        $('#loadingLoginButton').show();
+        $('#failedToLoginAlert').hide();
+
+        
+
+        $interval(
+          function() 
+          {
+                           $('#failedToLoginAlert').show();
+
+            $('#loginButton').show();
+        $('#loadingLoginButton').hide();
+        
+          }, 2000,1);
+        
+
+        
+     });
+})
diff --git a/client/js/controllers/network.js b/client/js/controllers/network/main.js
index c2a9794..6c916ae 100644
--- a/client/js/controllers/network.js
+++ b/client/js/controllers/network/main.js
@@ -6,5 +6,4 @@
 
 mainApp.controller('networkCtrl', function ($scope)
 {
-     $scope.test="Network View";
 });
\ No newline at end of file
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 3534912..42a54d4 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -4,9 +4,25 @@
 
 
 
-mainApp.controller('statusCtrl', function ($scope)
+mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
 {
-     $scope.username="User 1";
-     $scope.connection="Online";
-     $scope.lastconnection="1 Septembre";
+    $scope.username="John Doe";
+    $scope.projectname="Web Server";
+    // Update status every 2 seconds
+    /*$interval(function(){   
+        var status=identity.fetchStatus();
+        $scope.username=status[1];
+        $scope.lastconnection=status[2];
+        if(status[0] == "1"){
+            $scope.connection=$sce.trustAsHtml("<span style=\"color:green;\">Online</span>");
+        }
+        else{
+            $scope.connection=$sce.trustAsHtml("<span style=\"color:red;\">Offline</span>");
+        }
+    }, 2000);*/
+
+
+
+     
+     
 });
\ No newline at end of file