Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/versions.jsp	Wed Aug 18 12:47:32 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/versions.jsp	Wed Aug 18 14:57:45 2021 +0200
@@ -28,31 +28,31 @@
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
-<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionsView" scope="request" />
+<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionsView" scope="request"/>
 
 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
-<%@include file="../jspf/project-header.jspf"%>
+<%@include file="../jspf/project-header.jspf" %>
 
 <div id="tool-area">
     <a href="./projects/${project.node}/versions/-/create" class="button"><fmt:message key="button.version.create"/></a>
     <a href="./projects/${project.node}/issues/-/-/-/create" class="button"><fmt:message key="button.issue.create"/></a>
 </div>
 
-<h2><fmt:message key="progress" /></h2>
+<h2><fmt:message key="progress"/></h2>
 
-<c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
-<%@include file="../jspf/issue-summary.jspf"%>
+<c:set var="summary" value="${viewmodel.projectInfo.issueSummary}"/>
+<%@include file="../jspf/issue-summary.jspf" %>
 
 <table id="version-list" class="datatable medskip fullwidth">
     <colgroup>
         <col>
-        <col width="28%">
-        <col width="12%">
-        <col width="12%">
-        <col width="12%">
-        <col width="12%">
-        <col width="12%">
-        <col width="12%">
+        <col style="width: 28%">
+        <col style="width: 12%">
+        <col style="width: 12%">
+        <col style="width: 12%">
+        <col style="width: 12%">
+        <col style="width: 12%">
+        <col style="width: 12%">
     </colgroup>
     <thead>
     <tr>
@@ -67,23 +67,28 @@
     <tr>
         <th></th>
         <th><fmt:message key="version"/></th>
-        <th class="hcenter"><fmt:message key="issues.open" /></th>
-        <th class="hcenter"><fmt:message key="issues.active" /></th>
-        <th class="hcenter"><fmt:message key="issues.done" /></th>
-        <th class="hcenter"><fmt:message key="issues.open" /></th>
-        <th class="hcenter"><fmt:message key="issues.active" /></th>
-        <th class="hcenter"><fmt:message key="issues.done" /></th>
+        <th class="hcenter"><fmt:message key="issues.open"/></th>
+        <th class="hcenter"><fmt:message key="issues.active"/></th>
+        <th class="hcenter"><fmt:message key="issues.done"/></th>
+        <th class="hcenter"><fmt:message key="issues.open"/></th>
+        <th class="hcenter"><fmt:message key="issues.active"/></th>
+        <th class="hcenter"><fmt:message key="issues.done"/></th>
     </tr>
     </thead>
     <tbody>
-        <c:forEach var="versionInfo" items="${viewmodel.versionInfos}" >
+    <c:forEach var="versionInfo" items="${viewmodel.versionInfos}">
         <tr>
-            <td rowspan="2" style="width: 2em;"><a href="./projects/${project.node}/versions/${versionInfo.version.node}/edit">&#x270e;</a></td>
+            <td rowspan="2" style="width: 2em;"><a
+                    href="./projects/${project.node}/versions/${versionInfo.version.node}/edit">&#x270e;</a></td>
             <td rowspan="2">
                 <a href="./projects/${project.node}/issues/${versionInfo.version.node}/-/">
                     <c:out value="${versionInfo.version.name}"/>
                 </a>
-                <div class="version-tag version-${versionInfo.version.status}">
+                <div class="version-tag version-${versionInfo.version.status}"
+                        <c:if test="${not empty versionInfo.version.releaseOrEolDate}">
+                            title="<fmt:formatDate type="date" value="${versionInfo.version.releaseOrEolDate}"/>"
+                        </c:if>
+                >
                     <fmt:message key="version.status.${versionInfo.version.status}"/>
                 </div>
             </td>
@@ -104,6 +109,6 @@
                 <%@include file="../jspf/issue-progress.jspf" %>
             </td>
         </tr>
-        </c:forEach>
+    </c:forEach>
     </tbody>
 </table>
\ No newline at end of file