Centralize JSPs

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / WEB-INF / jsp / slcExecutionView.jsp

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
index ee5e40ca38d78bfa7b973a512168701492cc8d0d..360e98ef61e9ec8822802b00822a1e6b985eba88 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
@@ -1,38 +1,45 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
-<h1>SLC Execution Details</h1>\r
-<h2>Uuid = ${slcExecution.uuid}</h2>\r
-<br>\r
-<h2>Execution Steps</h2>\r
+<h1>SLC Execution #${slcExecution.uuid}</h1>\r
+\r
+<h2>Details</h2>\r
 <table>\r
        <tr>\r
-               <td>UUID</td>\r
-               <td>TYPE</td>\r
-               <td>BEGIN</td>\r
+               <td>Host</td>\r
+               <td>${slcExecution.host}</td>\r
        </tr>\r
-       <c:forEach items="${slcExecutionSteps}" var="slcExecutionStep">\r
-               <tr>\r
-                       <td>${slcExecutionStep.uuid}</td>\r
-                       <td>${slcExecutionStep.type}</td>\r
-                       <td>${slcExecutionStep.begin}</td>\r
-               </tr>\r
-               <c:forEach items="${slcExecutionStep.logLines}" var="slcExecutionStepLog">\r
-               <tr>\r
-                       <td colspan="3">- <em>${slcExecutionStepLog}</em></td>\r
-               </tr>\r
-               </c:forEach>\r
-               <tr>\r
-               </tr>\r
-       </c:forEach>\r
-\r
+       <tr>\r
+               <td>User</td>\r
+               <td>${slcExecution.user}</td>\r
+       </tr>\r
+       <tr>\r
+               <td>Status</td>\r
+               <td>${slcExecution.status}</td>\r
+       </tr>\r
+       <tr>\r
+               <td>Type</td>\r
+               <td>${slcExecution.type}</td>\r
+       </tr>\r
+       <c:choose>\r
+               <c:when test="${slcExecution.type == 'org.argeo.slc.ant'}">\r
+                       <tr>\r
+                               <td>Script</td>\r
+                               <td>${slcExecution.attributes['ant.file']}</td>\r
+                       </tr>\r
+               </c:when>\r
+       </c:choose>\r
 </table>\r
-</div>\r
 \r
-<%@include file="footer.txt"%>
\ No newline at end of file
+<h2>Execution Steps</h2>\r
+<c:forEach items="${slcExecutionSteps}" var="slcExecutionStep">\r
+       <a name="step_${slcExecutionStep.uuid}"></a>\r
+       <h3 class="executionStep">${slcExecutionStep.begin} -\r
+       ${slcExecutionStep.uuid} (${slcExecutionStep.type})</h3>\r
+       <table>\r
+               <c:forEach items="${slcExecutionStep.logLines}"\r
+                       var="slcExecutionStepLogLine">\r
+                       <tr>\r
+                               <td colspan="3">${slcExecutionStepLogLine}</td>\r
+                       </tr>\r
+               </c:forEach>\r
+       </table>\r
+</c:forEach></div>\r