summaryrefslogtreecommitdiff
path: root/client/js
diff options
context:
space:
mode:
Diffstat (limited to 'client/js')
-rw-r--r--client/js/app.js4
-rw-r--r--client/js/controllers/home/main.js (renamed from client/js/controllers/home.js)0
-rw-r--r--client/js/controllers/login.js7
-rw-r--r--client/js/controllers/network/main.js (renamed from client/js/controllers/network.js)0
-rw-r--r--client/js/controllers/status.js3
5 files changed, 9 insertions, 5 deletions
diff --git a/client/js/app.js b/client/js/app.js
index c931d7e..0e9c423 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -6,11 +6,11 @@ var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize']);
mainApp.config(['$routeProvider', function($routeProvider){
$routeProvider.
when('/home',{
- templateUrl: 'partials/home.html',
+ templateUrl: 'partials/home/main.html',
controller: 'homeCtrl'
}).
when('/network',{
- templateUrl: 'partials/network.html',
+ templateUrl: 'partials/network/main.html',
controller: 'networkCtrl'
}).otherwise({
redirectTo: '/home'
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();