Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 32 insertions, 4 deletions

diff --git a/client/partials/image/image.html b/client/partials/image/image.html
index 8af8af5..886a11d 100644
--- a/client/partials/image/image.html
+++ b/client/partials/image/image.html
@@ -1,10 +1,38 @@
- <div class="panel panel-default" ng-controller="imageCtrl">
+
+
+<div class="panel panel-default" ng-controller="imageCtrl">
     <div class="panel-heading">
-        Images disponibles
+        Image Manager
     </div>
     <div class="panel-body">
-        <div ng-repeat="image in images">
-			{{image.name}}
+
+		
+		<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>