Centralize server spring configs

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
index ae95c9502f03e1e0c666efa16a53980ed4295b68..b3141a7884b1a203f53340bc1c5006367d7b4f5b 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
@@ -1,19 +1,16 @@
-<?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="form" uri="http://www.springframework.org/tags/form"%>\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>Result #${result.uuid}</h1>\r
 \r
 <jsp:useBean id="describedPaths" type="java.util.SortedMap"\r
-       scope="request" /> <jsp:useBean id="toc" type="java.util.SortedMap"\r
+       scope="request" /> \r
+<jsp:useBean id="toc" type="java.util.SortedMap"\r
        scope="request" />\r
 \r
+<p>\r
+<a href="addResultToCollection.web?resultUuid=${result.uuid}&collectionId=staging">Add to staging collection</a><br/>\r
+<a href="addResultToCollection.web?resultUuid=${result.uuid}&collectionId=official">Add to official collection</a>\r
+</p>\r
+\r
 <table>\r
        <c:forEach items="${toc}" var="tocEntry">\r
                <jsp:useBean id="tocEntry" type="java.util.Map.Entry" />\r
@@ -29,14 +26,22 @@
 \r
        <h2><%=describedPaths.get(resultPartEntry.getKey())%></h2>\r
        <table>\r
+               <c:forEach items="${result.elements[resultPartEntry.key].tags}" var="tagEntry">\r
+                       <tr>\r
+                               <td style="font-style: italic;font-size: 80%">${tagEntry.key}</td>\r
+                               <td style="font-size: 80%">${tagEntry.value}</td>\r
+                       </tr>\r
+               </c:forEach>\r
+       </table>\r
+       <table>\r
+       \r
                <c:forEach items="${resultPartEntry.value.parts}" var="part">\r
                        <tr>\r
                                <td class="${part.status == 0 ? 'passed' : 'failed'}">\r
                                ${part.message}</td>\r
                                <c:if test="${part.testRunUuid!=null}">\r
                                        <td>\r
-                                       <a href="testRunView.web?uuid=${part.testRunUuid}">related\r
-                                       test run</a>\r
+                                       <a href="testRunView.web?uuid=${part.testRunUuid}">test run</a>\r
                                        </td>\r
                                </c:if>\r
                        </tr>\r
@@ -44,5 +49,3 @@
        </table>\r
 \r
 </c:forEach></div>\r
-\r
-<%@include file="footer.txt"%>
\ No newline at end of file