diff options
| -rw-r--r-- | client/index.html | 31 | ||||
| -rw-r--r-- | client/js/controllers/home/home.js (renamed from client/js/controllers/home/main.js) | 0 | ||||
| -rw-r--r-- | client/js/controllers/home/machineDetails.js | 10 | ||||
| -rw-r--r-- | client/js/controllers/login.js | 3 | ||||
| -rw-r--r-- | client/js/controllers/network/network.js (renamed from client/js/controllers/network/main.js) | 0 | ||||
| -rw-r--r-- | client/js/controllers/status.js | 6 | ||||
| -rw-r--r-- | client/js/services/Identity.js | 6 | ||||
| -rw-r--r-- | client/js/services/Loading.js | 15 | ||||
| -rw-r--r-- | client/partials/home/machineDetails.html | 2 | ||||
| -rw-r--r-- | client/partials/nav.html | 41 | ||||
| -rw-r--r-- | client/partials/status.html | 29 |
11 files changed, 70 insertions, 73 deletions
diff --git a/client/index.html b/client/index.html index 8ca2b9f..48ea4a0 100644 --- a/client/index.html +++ b/client/index.html @@ -11,27 +11,28 @@ <link rel="stylesheet" href="./css/style.css"> - <!--[if lt IE 9]> - <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> + <!--[if lt IE 9]> + <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> + <![endif]--> </head> <body> - + + <!-- Overlay --> + <div ng-include="'./partials/login.html'"></div> + <div ng-include="'./partials/home/machineDetails.html'"></div> + <div ng-include="'./partials/loading.html'"></div> + + + <!-- MAIN GRID --> <div class="container-lg"> <!-- Status bar --> <div class="row" ng-controller="statusCtrl"> <div class="col-lg-12"> - <!-- Login Overlay --> - <div ng-include="'./partials/login.html'"></div> - <!-- Machine Details Overlay --> - <div ng-include="'./partials/home/machineDetails.html'"></div> - <div ng-include="'./partials/loading.html'"></div> - - <!-- Nav --> - <div ng-include="'./partials/nav.html'"></div> + <!-- Status bar --> + <div ng-include="'./partials/status.html'"></div> </div> </div> <!-- Page content --> @@ -56,7 +57,7 @@ </div> </div> </div> - </div> + </div> </div> </div> </div> @@ -85,9 +86,9 @@ <!-- Include controller --> <script src="./js/controllers/login.js"></script> <script src="./js/controllers/status.js"></script> - <script src="./js/controllers/home/main.js"></script> + <script src="./js/controllers/home/home.js"></script> <script src="./js/controllers/home/machineDetails.js"></script> - <script src="./js/controllers/network/main.js"></script> + <script src="./js/controllers/network/network.js"></script> diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/home.js index f84f625..f84f625 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/home.js diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js index 24fac42..c015eaa 100644 --- a/client/js/controllers/home/machineDetails.js +++ b/client/js/controllers/home/machineDetails.js @@ -6,23 +6,25 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout) { + // Init scope $scope.machine={}; - $("#waitingForToggleMachine").hide(); + $scope.machineIsStarting=false; // For loading icon + $scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){ $scope.machine=machine; $scope.axioms=axioms; - console.log(machine); $('#machineDetailsModal').modal({backdrop: false, keyboard: true}); }); $scope.toggleMachineState=function(){ - $("#waitingForToggleMachine").show(); + // Display gif + $scope.machineIsStarting=true; // Fake timeout $timeout(function(){ - $("#waitingForToggleMachine").hide(); + $scope.machineIsStarting=false; }, 3000); $timeout(function(){ $scope.machine.online=!$scope.machine.online; 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/network/main.js b/client/js/controllers/network/network.js index 7264aec..7264aec 100644 --- a/client/js/controllers/network/main.js +++ b/client/js/controllers/network/network.js 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..db93e97 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', function($http, $cookies){ /* 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/js/services/Loading.js b/client/js/services/Loading.js index b12aaa0..db06194 100644 --- a/client/js/services/Loading.js +++ b/client/js/services/Loading.js @@ -1,22 +1,23 @@ -mainApp.factory('Loading',[ '$http', 'Identity', function($http, Identity){ - - - - +mainApp.factory('Loading',[ function(){ + /** + * Display Loading modal + */ var start=function(){ $('#loadingModal').modal({backdrop: 'static', keyboard: false}); }; + /** + * Hide Loading modal + */ var stop=function(){ $('#loadingModal').modal('hide'); } + // Service returns return { start:start, stop:stop }; - - }]); diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html index 47a65fb..c4c8a38 100644 --- a/client/partials/home/machineDetails.html +++ b/client/partials/home/machineDetails.html @@ -26,7 +26,7 @@ <button class="btn btn-danger" ng-if="machine.status=='ACTIVE'" ng-click="toggleMachineState()">Turn Off</button> <button class="btn btn-success" ng-if="machine.status!=='ACTIVE'" ng-click="toggleMachineState()">Turn On</button> - <img src="images/spin/32x32/Preloader_1.gif" id="waitingForToggleMachine"></span> + <img src="images/spin/32x32/Preloader_1.gif" ng-if="machineIsStarting"></span> </div> diff --git a/client/partials/nav.html b/client/partials/nav.html deleted file mode 100644 index b3ef76a..0000000 --- a/client/partials/nav.html +++ /dev/null @@ -1,41 +0,0 @@ -<nav class="navbar navbar-default"> - <div class="container-fluid"> - <!-- Brand and toggle get grouped for better mobile display --> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="#"><b>Status</b></a> - </div> - - <div class="navbar-"></div> - - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> - - <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> - - <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> - </ul> - </div><!-- /.navbar-collapse --> - </div><!-- /.container-fluid --> -</nav> diff --git a/client/partials/status.html b/client/partials/status.html new file mode 100644 index 0000000..01b9079 --- /dev/null +++ b/client/partials/status.html @@ -0,0 +1,29 @@ +<nav class="navbar navbar-default"> + <div class="container-fluid"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand"><b>Status</b></a> + </div> + + <div class="navbar-"></div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> + + <ul class="nav navbar-nav"> + <li class="nav-divider"></li> + <li><a>User : {{ profile.username }}</a></li> + <li><a>Project Name : {{ profile.projectname }}</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li><a ng-click="logout()">Logout</a></li> + </ul> + </div> + </div> +</nav> |