Fixed Cancel button and scrolling on processing flash
Change-Id: I23f74ac3423dbe18b0ba9c90bb32f25127397788
Signed-off-by: Dirk Fauth <Dirk.Fauth@de.bosch.com>
diff --git a/manager/src/main/resources/templates/status.html b/manager/src/main/resources/templates/status.html
index 5a3ab6b..8bf804a 100644
--- a/manager/src/main/resources/templates/status.html
+++ b/manager/src/main/resources/templates/status.html
@@ -10,7 +10,11 @@
<ul>
<li th:text="${msg}" th:each="msg : ${workflowStatus.messages}">Message</li>
</ul>
- <span id="flashMessage" class="flash"></span>
+ <div
+ style="height:2em;"
+ th:if="${(!workflowStatus.done && workflowStatus.uuid != null)}">
+ <span id="flashMessage" class="flash"></span>
+ </div>
</div>
<div th:fragment="errorList" id="workflowErrors">
diff --git a/manager/src/main/resources/templates/workflow.html b/manager/src/main/resources/templates/workflow.html
index 66c7700..1ce4f39 100644
--- a/manager/src/main/resources/templates/workflow.html
+++ b/manager/src/main/resources/templates/workflow.html
@@ -68,7 +68,7 @@
class="btn btn-primary mt-2 left-btn mb-4"/>
<button
id="workflowCancel"
- style="display: none;"
+ th:style="*{(!done && uuid != null) ? '' : 'display:none'}"
class="btn btn-primary mt-2 left-btn">Cancel</button>
</div>
</div>
