summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/images/logo.pngbin0 -> 9946 bytes
-rw-r--r--client/js/controllers/home.js1
-rw-r--r--client/js/controllers/network.js1
-rw-r--r--client/js/controllers/status.js4
-rw-r--r--client/js/requests/identity.js7
-rw-r--r--client/partials/favicon.html2
-rw-r--r--client/partials/home.html2
-rw-r--r--client/partials/network.html2
8 files changed, 5 insertions, 14 deletions
diff --git a/client/images/logo.png b/client/images/logo.png
new file mode 100644
index 0000000..82914f3
--- /dev/null
+++ b/client/images/logo.png
Binary files differ
diff --git a/client/js/controllers/home.js b/client/js/controllers/home.js
index d2dafff..4a9fb21 100644
--- a/client/js/controllers/home.js
+++ b/client/js/controllers/home.js
@@ -6,7 +6,6 @@
mainApp.controller('homeCtrl', function ($scope)
{
- $scope.test="Home view";
// Login before use App
//$('#loginModal').modal({backdrop: 'static', keyboard: false});
diff --git a/client/js/controllers/network.js b/client/js/controllers/network.js
index c2a9794..6c916ae 100644
--- a/client/js/controllers/network.js
+++ b/client/js/controllers/network.js
@@ -6,5 +6,4 @@
mainApp.controller('networkCtrl', function ($scope)
{
- $scope.test="Network View";
}); \ No newline at end of file
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index e4f119d..c24997e 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -8,7 +8,7 @@ mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
{
// Update status every 2 seconds
- $interval(function(){
+ /*$interval(function(){
var status=identity.fetchStatus();
$scope.username=status[1];
$scope.lastconnection=status[2];
@@ -18,7 +18,7 @@ mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
else{
$scope.connection=$sce.trustAsHtml("<span style=\"color:red;\">Offline</span>");
}
- }, 2000);
+ }, 2000);*/
diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js
index 19971b8..cad1261 100644
--- a/client/js/requests/identity.js
+++ b/client/js/requests/identity.js
@@ -4,14 +4,7 @@ var identity = {} ;
-// Fetch Status
-identity.fetchStatus = function(){
-
- // TODO
-
- return new Array("0", "user1", "25/02/2016");
-}
/*
diff --git a/client/partials/favicon.html b/client/partials/favicon.html
index d49c651..b341f9b 100644
--- a/client/partials/favicon.html
+++ b/client/partials/favicon.html
@@ -1,3 +1,3 @@
<a href="#" class="thumbnail">
- <img class="media-object" src='./images/logo.gif' />
+ <img class="media-object" src='./images/logo.png' />
</a>
diff --git a/client/partials/home.html b/client/partials/home.html
index b00113a..3882ada 100644
--- a/client/partials/home.html
+++ b/client/partials/home.html
@@ -1,6 +1,6 @@
<div class="panel panel-default">
<div class="panel-heading">
- {{ test }}
+ Home
</div>
<div class="panel-body">
Main Content
diff --git a/client/partials/network.html b/client/partials/network.html
index a520a88..341f1a0 100644
--- a/client/partials/network.html
+++ b/client/partials/network.html
@@ -1,6 +1,6 @@
<div class="panel panel-default">
<div class="panel-heading">
- {{ test }}
+ Network
</div>
<div class="panel-body">
Main Content