Merge branch 'loic' into develop

1 files changed, 7 insertions, 2 deletions

diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 0767202..01fdcc3 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -4,15 +4,20 @@
 
 
 
-mainApp.controller('statusCtrl', function ($scope,$interval)
+mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
 {
     
     // Update status every 2 seconds
     $interval(function(){   
         var status=identity.fetchStatus();
-        $scope.connection=status[0];
         $scope.username=status[1];
         $scope.lastconnection=status[2];
+        if(status[0] == "1"){
+            $scope.connection=$sce.trustAsHtml("Connection : <span style=\"color:green;\">Online</span>");
+        }
+        else{
+            $scope.connection="Connection : <span style=\"color:red;\">Offline</span>";
+        }
     }, 2000);