summaryrefslogtreecommitdiffstats
path: root/src/main/resources
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2022-05-12 01:43:27 +0200
committerGeorg Pfuetzenreuter2022-05-12 01:43:27 +0200
commit789bd112f3bf7e99dd7ddcbc71743aea7ff89cc6 (patch)
tree5d50474a7352b0e3e05d2fa4f51929b68fcc773e /src/main/resources
parent9648a8b9d03fce135b60f03379d92b628ff10a9a (diff)
downloadpubsh-web-789bd112f3bf7e99dd7ddcbc71743aea7ff89cc6.tar.gz
pubsh-web-789bd112f3bf7e99dd7ddcbc71743aea7ff89cc6.tar.bz2
pubsh-web-789bd112f3bf7e99dd7ddcbc71743aea7ff89cc6.zip
Add expiration date to frontend, custom container object
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/templates/admin.html15
-rw-r--r--src/main/resources/templates/portal.html6
2 files changed, 16 insertions, 5 deletions
diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html
index 88ef9e4..dc8d56b 100644
--- a/src/main/resources/templates/admin.html
+++ b/src/main/resources/templates/admin.html
@@ -42,11 +42,17 @@
</table>
<h2>Existing containers:</h2>
<table>
- <tr th:each="container: ${docker_containers}">
+ <!-- tr th:each="container: ${docker_containers}">
<td th:text="${container.names[0]}" />
<td th:text="${container.image}" />
<td th:text="${container.id}" />
+ <td th:text="${container.status}" /-->
+ <tr th:each="container: ${custom_containers}">
+ <td th:text="${container.name}" />
+ <td th:text="${container.image}" />
+ <td th:text="${container.id}" />
<td th:text="${container.status}" />
+ <td th:text="${container.ExpirationDate}" />
<!-- 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>
@@ -68,8 +74,11 @@
onclick="if (!confirm(this.getAttribute('data-confirm-delete'))) return false" -->
</tr>
- </table>
-
+ </table>
+ <!-- <p></p><p></p>
+<p><span th:text="${custom_containers[0].status}"></span></p>
+<p><span th:text="${docker_containers[0].status}"></span></p>
+<p></p-->
<p></p>
<a href="/logout">Logout</a>
</div>
diff --git a/src/main/resources/templates/portal.html b/src/main/resources/templates/portal.html
index f5e9342..3db362c 100644
--- a/src/main/resources/templates/portal.html
+++ b/src/main/resources/templates/portal.html
@@ -22,6 +22,7 @@
<option value="">Select duration ...</option>
<option th:value="5" th:attr="value=5" th:text="5"></option>
<option th:value="10" th:attr="value=10" th:text="10"></option>
+ <option th:value="3600" th:attr="value=3600" th:text="3600"></option>
</select>
<button class="btn btn-primary" th:id="request_submission" th:type="submit">Generate</button>
</form>
@@ -49,11 +50,12 @@
<h3>Existing shells:</h3>
<table th:if="${docker_containers!=null and !docker_containers.empty}">
- <tr th:each="container: ${docker_containers}">
- <td th:text="${container.names[0]}" />
+ <tr th:each="container: ${custom_containers}">
+ <td th:text="${container.name}" />
<!-- td th:text="${container.image}" / -->
<!-- td th:text="${container.id}" / -->
<td th:text="${container.status}" />
+ <td th:text="${container.ExpirationDate}" />
<td>
<form id="deletion_pseudoform" action="#" th:action="@{'/frontend/shell/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') + ' ?');">
<button class="btn btn-danger" id="deletion_submission" type="submit">Delete</button>