X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fjsp%2FslcExecutionView.jsp;h=360e98ef61e9ec8822802b00822a1e6b985eba88;hb=c0e22fbfb28fc864579d6cd34b6c274f1b5382bc;hp=ee5e40ca38d78bfa7b973a512168701492cc8d0d;hpb=2f8b18b713e45a45501b75ac88db76d56eb82a7b;p=gpl%2Fargeo-slc.git

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