diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-01-31 13:34:43 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-01-31 13:34:43 +0100 |
| commit | 6905bacd589950f2f84900fe7b501591bc8c4f68 (patch) | |
| tree | e3bb47b37555ad4e2d38c7310e4c97ee75d38e88 /client | |
| parent | 81696200b029cecf4060b1021c5eb5c690654b66 (diff) | |
Change status controller and template
Diffstat (limited to 'client')
| -rw-r--r-- | client/js/controllers/status.js | 4 | ||||
| -rw-r--r-- | client/js/requests/identity.js | 2 | ||||
| -rw-r--r-- | client/partials/nav.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index 01fdcc3..e4f119d 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -13,10 +13,10 @@ mainApp.controller('statusCtrl', function ($scope,$interval,$sce) $scope.username=status[1]; $scope.lastconnection=status[2]; if(status[0] == "1"){ - $scope.connection=$sce.trustAsHtml("Connection : <span style=\"color:green;\">Online</span>"); + $scope.connection=$sce.trustAsHtml("<span style=\"color:green;\">Online</span>"); } else{ - $scope.connection="Connection : <span style=\"color:red;\">Offline</span>"; + $scope.connection=$sce.trustAsHtml("<span style=\"color:red;\">Offline</span>"); } }, 2000); diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index 369ce85..d008abf 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -10,6 +10,6 @@ identity.fetchStatus = function(){ // TODO - return new Array("1", "user1", "25/02/2016"); + return new Array("0", "user1", "25/02/2016"); }
\ No newline at end of file diff --git a/client/partials/nav.html b/client/partials/nav.html index b9e51df..0e26922 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -20,7 +20,7 @@ <li class="nav-divider"></li> <li><a href="#">User : {{ username }}</a></li> <li><a href="#">Last Connection : {{ lastconnection }}</a></li> - <li><a href="#" ng-bind-html="connection"></a></li> + <li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li> </ul> |