diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-03 18:57:20 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-03 18:57:20 +0100 |
| commit | c6186b71c12dece6878ca457afa801f2a79bac0b (patch) | |
| tree | 00ab4fb45532a98919c0af09a53904c0450c41e0 /client/js/controllers | |
| parent | fe06bd586aa2af6ea6bfc426caadee429d100380 (diff) | |
Change folder architecture !
Diffstat (limited to 'client/js/controllers')
| -rw-r--r-- | client/js/controllers/home/main.js (renamed from client/js/controllers/home.js) | 0 | ||||
| -rw-r--r-- | client/js/controllers/login.js | 7 | ||||
| -rw-r--r-- | client/js/controllers/network/main.js (renamed from client/js/controllers/network.js) | 0 | ||||
| -rw-r--r-- | client/js/controllers/status.js | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/client/js/controllers/home.js b/client/js/controllers/home/main.js index 2898de2..2898de2 100644 --- a/client/js/controllers/home.js +++ b/client/js/controllers/home/main.js diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 6de348c..026ce36 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -4,11 +4,14 @@ * and open the template in the editor. */ - +/** + * Represents a book. + * @constructor + */ mainApp.controller('loginCtrl', function ($scope,$interval,$sce) { // Define default states - $('#loginModal').modal({backdrop: 'static', keyboard: false}); + //$('#loginModal').modal({backdrop: 'static', keyboard: false}); $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); diff --git a/client/js/controllers/network.js b/client/js/controllers/network/main.js index 6c916ae..6c916ae 100644 --- a/client/js/controllers/network.js +++ b/client/js/controllers/network/main.js diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index c24997e..42a54d4 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -6,7 +6,8 @@ mainApp.controller('statusCtrl', function ($scope,$interval,$sce) { - + $scope.username="John Doe"; + $scope.projectname="Web Server"; // Update status every 2 seconds /*$interval(function(){ var status=identity.fetchStatus(); |
