Add image creation and suppression

4 files changed, 48 insertions, 33 deletions

diff --git a/client/partials/image/create.html b/client/partials/image/create.html
new file mode 100644
index 0000000..ca479e5
--- /dev/null
+++ b/client/partials/image/create.html
@@ -0,0 +1,33 @@
+<div class="modal fade" id="createImageModal" ng-controller="createImageCtrl">
+    <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">
+                <form class="form-horizontal" role="form">
+                    <div class="form-group">
+                        <label class="control-label col-sm-2">Name</label>
+                        <div class="col-sm-20">
+                            <input ng-model="name" type="text" value="" />
+                        </div>
+
+                    </div>
+                    
+
+                </form>
+		
+				<div class="modal-footer"> 
+                <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
+                
+                <a class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="doCreation()">Create</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html
index 4420f52..2b58065 100644
--- a/client/partials/image/edit.html
+++ b/client/partials/image/edit.html
@@ -34,6 +34,19 @@
                     </fieldset>
 
                 </form>
+                <form action="../server/index.php" method="post">
+                    <input type="hidden" name="task" value="image" />
+                    <input type="hidden" name="token" value="{{ token}}" />
+                    <input type="hidden" name="action" value="uploadImage" />
+                    <input type="hidden" name="id" value="60ed9403-419e-4ea8-933f-dd1750d97360" />
+                    <input type="hidden" name="file_name" value="bob.iso" />
+                    <fieldset class="form-group">
+                        <label class="control-label col-sm-2">Upload</label>
+                        <input name="file" type="file" />
+                        <input type="submit" value="Upload" />
+
+                    </fieldset>
+                </form>
                 <div class="modal-footer"> 
                     <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
 
diff --git a/client/partials/image/image.html b/client/partials/image/image.html
index a789ae8..1604b30 100644
--- a/client/partials/image/image.html
+++ b/client/partials/image/image.html
@@ -8,7 +8,7 @@
 
 
         <div  class="btn-group btn-group-md" role="group" aria-label="...">
-            <button type="button" class="btn btn-default" ng-click="showUploadImageModal()">Upload</button>
+            <button type="button" class="btn btn-default" ng-click="showCreateImageModal()">Create Image</button>
             <button type="button" class="btn btn-default">Download</button>
         </div>
         <p></p>
@@ -30,7 +30,7 @@
                     <td>{{ (image.size / 1048576).toFixed(2)}} MB</td>
                     <td>
                         <button type="button" class="btn btn-primary" ng-click="edit(image)">Edit</button>
-                        <button type="button" class="btn btn-danger">Remove</button>
+                        <button type="button" class="btn btn-danger" ng-click="deleteImage(image.id)">Remove</button>
                     </td>
                 </tr>
 
diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html
deleted file mode 100644
index b3e8767..0000000
--- a/client/partials/image/upload.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="modal fade" id="uploadImageModal" ng-controller="uploadImageCtrl">
-    <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">
-                <form action="../server/index.php" method="post">
-                    <input type="hidden" name="task" value="image" />
-                    <input type="hidden" name="token" value="{{ token }}" />
-                    <input type="hidden" name="action" value="uploadImage" />
-                    <input type="hidden" name="id" value="60ed9403-419e-4ea8-933f-dd1750d97360" />
-                    <input type="hidden" name="file_name" value="bob.iso" />
-                    <input name="file" type="file" />
-                    <input type="submit" value="Upload" />
-                </form>
-		
-				<div class="modal-footer"> 
-                <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
-                
-                <a class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="doUpload()">Upload</a>
-            </div>
-        </div>
-    </div>
-</div>