User -> portal, Admin -> admin

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

2 files changed, 25 insertions, 25 deletions

diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/admin.html
index a5473ee..d2f1847 100644
--- a/src/main/resources/templates/user.html
+++ b/src/main/resources/templates/admin.html
@@ -40,7 +40,10 @@
 			</select>
 			<button class="btn btn-primary" th:id="request_submission" th:type="submit">Generate</button>
 			</form>
-			
+		
+		
+		
+		
 		<h2>Existing containers:</h2>     	
 		<table>
 		<tr th:each="container: ${docker_containers}">
@@ -48,15 +51,35 @@
 			<td th:text="${container.image}" />
 			<td th:text="${container.id}" />
 			<td th:text="${container.status}" />
+		<!-- td><form id="deletion_pseudoform" action="#" th:action="@{'/frontend/container/delete/{id}'(id=${container.id})}" th:method="delete" >
+  <input type="hidden" name="_method" value="delete" />
+  <button id="deletion_submission" type="submit">Delete</button>
+</form></td-->
 <td>
 <form id="deletion_pseudoform" action="#" th:action="@{'/frontend/container/delete/{id}'(id=${container.id})}" th:method="delete" th:containerid="${container.id}" th:containerShaSum="${container.imageId}" th:onsubmit="return confirm('Do you really want to delete the container with ID ' + this.getAttribute('containerid') + ' which is attached to the image with checksum ' + this.getAttribute('containerShaSum') + ' ?');">
+<!--a
+  href=""
+  class="btn btn-danger  "
+  th:data-confirm-delete="|Are you sure you want to delete the container with ID ${container.id}?|"
+  onclick="if (!confirm(this.getAttribute('data-confirm-delete'))) return false"
+>
+  Delete
+</a-->
 <button class="btn btn-danger" id="deletion_submission" type="submit">Delete</button>
 </form>
 </td>
+		 <!-- th:data-confirm-delete="|Are you sure you want to delete this employee ${tempEmployee.firstName}?|"
+  onclick="if (!confirm(this.getAttribute('data-confirm-delete'))) return false" -->
+		
 		</tr>
 		</table>		
+
+
+
+		<!--div id="pagefoot" th:include="layout :: footerFragment">Footer</div-->
 		<p></p>
 		<a href="/logout">Logout</a>
 	</div>
+	<!-- container -->
 </body>
 </html>
diff --git a/src/main/resources/templates/portal.html b/src/main/resources/templates/portal.html
index d2f1847..a5473ee 100644
--- a/src/main/resources/templates/portal.html
+++ b/src/main/resources/templates/portal.html
@@ -40,10 +40,7 @@
 			</select>
 			<button class="btn btn-primary" th:id="request_submission" th:type="submit">Generate</button>
 			</form>
-		
-		
-		
-		
+			
 		<h2>Existing containers:</h2>     	
 		<table>
 		<tr th:each="container: ${docker_containers}">
@@ -51,35 +48,15 @@
 			<td th:text="${container.image}" />
 			<td th:text="${container.id}" />
 			<td th:text="${container.status}" />
-		<!-- td><form id="deletion_pseudoform" action="#" th:action="@{'/frontend/container/delete/{id}'(id=${container.id})}" th:method="delete" >
-  <input type="hidden" name="_method" value="delete" />
-  <button id="deletion_submission" type="submit">Delete</button>
-</form></td-->
 <td>
 <form id="deletion_pseudoform" action="#" th:action="@{'/frontend/container/delete/{id}'(id=${container.id})}" th:method="delete" th:containerid="${container.id}" th:containerShaSum="${container.imageId}" th:onsubmit="return confirm('Do you really want to delete the container with ID ' + this.getAttribute('containerid') + ' which is attached to the image with checksum ' + this.getAttribute('containerShaSum') + ' ?');">
-<!--a
-  href=""
-  class="btn btn-danger  "
-  th:data-confirm-delete="|Are you sure you want to delete the container with ID ${container.id}?|"
-  onclick="if (!confirm(this.getAttribute('data-confirm-delete'))) return false"
->
-  Delete
-</a-->
 <button class="btn btn-danger" id="deletion_submission" type="submit">Delete</button>
 </form>
 </td>
-		 <!-- th:data-confirm-delete="|Are you sure you want to delete this employee ${tempEmployee.firstName}?|"
-  onclick="if (!confirm(this.getAttribute('data-confirm-delete'))) return false" -->
-		
 		</tr>
 		</table>		
-
-
-
-		<!--div id="pagefoot" th:include="layout :: footerFragment">Footer</div-->
 		<p></p>
 		<a href="/logout">Logout</a>
 	</div>
-	<!-- container -->
 </body>
 </html>