From c6186b71c12dece6878ca457afa801f2a79bac0b Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 3 Feb 2016 18:57:20 +0100 Subject: Change folder architecture ! --- client/js/controllers/home.js | 11 ----------- client/js/controllers/home/main.js | 11 +++++++++++ client/js/controllers/login.js | 7 +++++-- client/js/controllers/network.js | 9 --------- client/js/controllers/network/main.js | 9 +++++++++ client/js/controllers/status.js | 3 ++- 6 files changed, 27 insertions(+), 23 deletions(-) delete mode 100644 client/js/controllers/home.js create mode 100644 client/js/controllers/home/main.js delete mode 100644 client/js/controllers/network.js create mode 100644 client/js/controllers/network/main.js (limited to 'client/js/controllers') diff --git a/client/js/controllers/home.js b/client/js/controllers/home.js deleted file mode 100644 index 2898de2..0000000 --- a/client/js/controllers/home.js +++ /dev/null @@ -1,11 +0,0 @@ -/* - * home Controller - */ - - - -mainApp.controller('homeCtrl', function ($scope) -{ - - -}); \ No newline at end of file diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js new file mode 100644 index 0000000..2898de2 --- /dev/null +++ b/client/js/controllers/home/main.js @@ -0,0 +1,11 @@ +/* + * home Controller + */ + + + +mainApp.controller('homeCtrl', function ($scope) +{ + + +}); \ No newline at end of file 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.js deleted file mode 100644 index 6c916ae..0000000 --- a/client/js/controllers/network.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * network Controller - */ - - - -mainApp.controller('networkCtrl', function ($scope) -{ -}); \ No newline at end of file diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/main.js new file mode 100644 index 0000000..6c916ae --- /dev/null +++ b/client/js/controllers/network/main.js @@ -0,0 +1,9 @@ +/* + * network Controller + */ + + + +mainApp.controller('networkCtrl', function ($scope) +{ +}); \ No newline at end of file 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(); -- cgit v1.2.3