diff options
| -rw-r--r-- | client/js/controllers/login.js | 3 | ||||
| -rw-r--r-- | client/js/controllers/status.js | 6 | ||||
| -rw-r--r-- | client/js/services/Identity.js | 6 | ||||
| -rw-r--r-- | client/partials/nav.html | 26 |
4 files changed, 17 insertions, 24 deletions
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 1a89563..63cb6d1 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -16,10 +16,11 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s // Manager logout event $scope.$on('logoutEvent', function(){ - Identity.logout(); $('#loginModal').modal({backdrop: 'static', keyboard: false}); }); + + // Hide loading button and message alert $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index 940d794..6f398ad 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -11,10 +11,10 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($ // Give profile to model $scope.profile=Identity.getProfile(); - + // Function to logout - $scope.raiseLogoutEvent=function(){ - $rootScope.$broadcast('logoutEvent'); + $scope.logout=function(){ + Identity.logout(); }; }]); diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index da85ecd..e6a9daf 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -1,5 +1,5 @@ -mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ +mainApp.factory('Identity',[ '$http', '$cookies', '$rootScope', function($http, $cookies, $rootScope){ /* Create profile structure to store informations * about current session @@ -51,6 +51,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ token=null; profile.username=null; profile.projectname=null; + + // Reload Page + location.reload(); } @@ -95,6 +98,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ else{ requestParserResult.failReason="Please check your username, password and project name !"; } + return requestParserResult; }; diff --git a/client/partials/nav.html b/client/partials/nav.html index b3ef76a..01b9079 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -8,7 +8,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="#"><b>Status</b></a> + <a class="navbar-brand"><b>Status</b></a> </div> <div class="navbar-"></div> @@ -18,24 +18,12 @@ <ul class="nav navbar-nav"> <li class="nav-divider"></li> - <li><a href="#">User : {{ profile.username }}</a></li> - <li><a href="#">Project Name : {{ profile.projectname }}</a></li> - - <!--<li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>--> - - </ul> - + <li><a>User : {{ profile.username }}</a></li> + <li><a>Project Name : {{ profile.projectname }}</a></li> + </ul> <ul class="nav navbar-nav navbar-right"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Account<span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="#">Informations</a></li> - <li><a href="#">Settings</a></li> - <li role="separator" class="divider"></li> - <li><a href="#" ng-click="raiseLogoutEvent()">Logout</a></li> - </ul> - </li> + <li><a ng-click="logout()">Logout</a></li> </ul> - </div><!-- /.navbar-collapse --> - </div><!-- /.container-fluid --> + </div> + </div> </nav> |