From e2be86814e8ac92778bfa9fc49e1d02946a7efbc Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 2 Mar 2016 20:46:24 +0100
Subject: Clean some things

---
 client/partials/home/machineDetails.html |  2 +-
 client/partials/nav.html                 | 29 -----------------------------
 client/partials/status.html              | 29 +++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 client/partials/nav.html
 create mode 100644 client/partials/status.html

(limited to 'client/partials')

diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 47a65fb..c4c8a38 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -26,7 +26,7 @@
 							&nbsp;
 							<button class="btn btn-danger" ng-if="machine.status=='ACTIVE'" ng-click="toggleMachineState()">Turn Off</button>		 
 							<button class="btn btn-success" ng-if="machine.status!=='ACTIVE'" ng-click="toggleMachineState()">Turn On</button>		 
-							&nbsp;<img src="images/spin/32x32/Preloader_1.gif" id="waitingForToggleMachine"></span>
+							&nbsp;<img src="images/spin/32x32/Preloader_1.gif" ng-if="machineIsStarting"></span>
 
 							
 						</div>
diff --git a/client/partials/nav.html b/client/partials/nav.html
deleted file mode 100644
index 01b9079..0000000
--- a/client/partials/nav.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-        <a class="navbar-brand"><b>Status</b></a>
-    </div>
-
-    <div class="navbar-"></div>
-    
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-
-      <ul class="nav navbar-nav">
-        <li class="nav-divider"></li>
-        <li><a>User : {{ profile.username }}</a></li>
-        <li><a>Project Name : {{ profile.projectname }}</a></li>
-      </ul>    
-      <ul class="nav navbar-nav navbar-right">
-		  <li><a ng-click="logout()">Logout</a></li>
-      </ul>
-    </div>
-  </div>
-</nav>
diff --git a/client/partials/status.html b/client/partials/status.html
new file mode 100644
index 0000000..01b9079
--- /dev/null
+++ b/client/partials/status.html
@@ -0,0 +1,29 @@
+<nav class="navbar navbar-default">
+  <div class="container-fluid">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+        <a class="navbar-brand"><b>Status</b></a>
+    </div>
+
+    <div class="navbar-"></div>
+    
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+
+      <ul class="nav navbar-nav">
+        <li class="nav-divider"></li>
+        <li><a>User : {{ profile.username }}</a></li>
+        <li><a>Project Name : {{ profile.projectname }}</a></li>
+      </ul>    
+      <ul class="nav navbar-nav navbar-right">
+		  <li><a ng-click="logout()">Logout</a></li>
+      </ul>
+    </div>
+  </div>
+</nav>
-- 
cgit v1.2.3