Merge branch 'develop' into Evan

6 files changed, 40 insertions, 10 deletions

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/home.js
index f84f625..4402e62 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/home.js
@@ -3,7 +3,7 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
 {
 
 	var callMeAfterPullData=function(data){
@@ -16,8 +16,14 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 		Loading.start();
 		Compute.pullData(callMeAfterPullData);		
 	}
+	else{
+		if(Identity.isAlreadyLogin()){
+			callMeAfterPullData();
+		}
+	}
 
-
+	
+	Image.getImages(function(){});
 
 	
 	$scope.raiseShowMachineDetailsEvent=function(id){
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/image/image.js b/client/js/controllers/image/image.js
new file mode 100644
index 0000000..e298fcc
--- /dev/null
+++ b/client/js/controllers/image/image.js
@@ -0,0 +1,21 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading)
+{
+	var callbackTest=function(){
+		$scope.images=Image.getData().images;
+				Loading.stop();
+	};
+
+	if(Image.getData().images==null){
+		Loading.start();
+		Image.getImages(callbackTest);
+	}
+	else{
+		callbackTest();
+	}
+	
+}]);
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();
 	};
 
 }]);