Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into develop

8 files changed, 95 insertions, 43 deletions

diff --git a/client/partials/home/main.html b/client/partials/home/home.html
index f9f8878..f9f8878 100644
--- a/client/partials/home/main.html
+++ b/client/partials/home/home.html
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 @@
 							 
 							<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/image/image.html b/client/partials/image/image.html
new file mode 100644
index 0000000..886a11d
--- /dev/null
+++ b/client/partials/image/image.html
@@ -0,0 +1,38 @@
+
+
+<div class="panel panel-default" ng-controller="imageCtrl">
+    <div class="panel-heading">
+        Image Manager
+    </div>
+    <div class="panel-body">
+
+		
+		<div  class="btn-group btn-group-md" role="group" aria-label="...">
+			<button type="button" class="btn btn-default" data-toggle="modal" data-target="#uploadImageModal"">Upload</button>
+					<button type="button" class="btn btn-default">Download</button>
+		</div>
+		<p></p>
+		<table class="table table-hover">
+			<thead>
+				<tr>
+					<th>Name</th>
+					<th>Size</th>
+					<th>Action</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr ng-repeat="image in images">
+						<td>{{ image.name }}</td>
+						<td>{{ (image.size /  1048576).toFixed(2) }} MB</td>
+						<td><button type="button" class="btn btn-danger">Remove</button></td>
+				</tr>
+			
+			</tbody>
+			  </table>
+
+
+
+		
+
+    </div>
+</div>
diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html
new file mode 100644
index 0000000..9049abf
--- /dev/null
+++ b/client/partials/image/upload.html
@@ -0,0 +1,25 @@
+<div class="modal fade" id="uploadImageModal" ng-controller="loginCtrl">
+    <div class="modal-dialog">
+        <div class="modal-content"></div>
+    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
+                 <h4 class="modal-title">Upload Image</h4>
+
+            </div>
+			
+            <div class="modal-body">
+
+				<label class="control-label">Select File</label>
+				<input id="input-1" type="file" class="file">
+				<p></p>
+				<div class="modal-footer"> 
+                <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
+                
+                <a href="#" class="btn btn-lg btn-primary btn-block" id="loginButton">Upload</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/client/partials/menu.html b/client/partials/menu.html
index dfd5842..a473fd8 100644
--- a/client/partials/menu.html
+++ b/client/partials/menu.html
@@ -1,4 +1,5 @@
 <div class="list-group">
   <a href="#/home" class="list-group-item">Home</a>
   <a href="#/network" class="list-group-item">Network</a>
-</div>
\ No newline at end of file
+  <a href="#/image" class="list-group-item">Images</a>
+</div>
diff --git a/client/partials/nav.html b/client/partials/nav.html
deleted file mode 100644
index b3ef76a..0000000
--- a/client/partials/nav.html
+++ /dev/null
@@ -1,41 +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" href="#"><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 href="#">User : {{ profile.username }}</a></li>
-        <li><a href="#">Project Name : {{ profile.projectname }}</a></li>
-
-        <!--<li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>-->
-
-      </ul>
-    
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Account<span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="#">Informations</a></li>
-            <li><a href="#">Settings</a></li>
-            <li role="separator" class="divider"></li>
-            <li><a href="#" ng-click="raiseLogoutEvent()">Logout</a></li>
-          </ul>
-        </li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
diff --git a/client/partials/network/main.html b/client/partials/network/network.html
index 8b779be..8b779be 100644
--- a/client/partials/network/main.html
+++ b/client/partials/network/network.html
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>