Merge branch 'develop' into Evan

3 files changed, 32 insertions, 11 deletions

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index e629779..d25bfad 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -3,8 +3,15 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', function ($scope)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute)
 {
-     
+
+
+	var updatePage=function(){
+		// TODO Update graph etc...
+	}
+
+	// Retrieve all Data
+	Compute.pullData(updatePage);
     
-});
\ No newline at end of file
+}]);
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 6358a6d..829fc1d 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -9,14 +9,20 @@
  */
 mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$sce, Identity)
 {
-    // Define default states
-    $('#loginModal').modal({backdrop: 'static', keyboard: false});
+	// Check for login and define default states
+	if(!Identity.isAlreadyLogin()){
+		$('#loginModal').modal({backdrop: 'static', keyboard: false});
+	}
+	$scope.$on('logoutEvent', function(){
+		$('#loginModal').modal({backdrop: 'static', keyboard: false});
+	});
+	
     $('#loadingLoginButton').hide();
     $('#failedToLoginAlert').hide();
 
      
-    $('#loginButton').click(function(){
-
+    $scope.loginAction=function(){
+		
 		// Begin login state for template
         $('#loginButton').hide();
         $('#loadingLoginButton').show();
@@ -49,6 +55,6 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
 		
 		// Try to login
         Identity.login(username, password, projectname, responseCallback);
-    });
+    };
 	
 }]);
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 2930e34..e01df34 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -6,9 +6,17 @@
  * @param {$scope} $scope The $scope service from angular
  * @param {Identity} The Identity service
  */
-mainApp.controller('statusCtrl', ['$scope','Identity', function ($scope, Identity)
+mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope)
 {
+
+	// Give profile to model
     $scope.profile=Identity.profile;
-    
-     
+
+    // Function to logout
+    $scope.logout=function(){
+		Identity.logout();
+		$rootScope.$broadcast('logoutEvent');
+
+	};
+
 }]);