1.1 --- a/src/main/webapp/WEB-INF/jsp/versions.jsp Wed Aug 18 12:47:32 2021 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/versions.jsp Wed Aug 18 14:57:45 2021 +0200
1.3 @@ -28,31 +28,31 @@
1.4 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1.5 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.6
1.7 -<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionsView" scope="request" />
1.8 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionsView" scope="request"/>
1.9
1.10 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
1.11 -<%@include file="../jspf/project-header.jspf"%>
1.12 +<%@include file="../jspf/project-header.jspf" %>
1.13
1.14 <div id="tool-area">
1.15 <a href="./projects/${project.node}/versions/-/create" class="button"><fmt:message key="button.version.create"/></a>
1.16 <a href="./projects/${project.node}/issues/-/-/-/create" class="button"><fmt:message key="button.issue.create"/></a>
1.17 </div>
1.18
1.19 -<h2><fmt:message key="progress" /></h2>
1.20 +<h2><fmt:message key="progress"/></h2>
1.21
1.22 -<c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
1.23 -<%@include file="../jspf/issue-summary.jspf"%>
1.24 +<c:set var="summary" value="${viewmodel.projectInfo.issueSummary}"/>
1.25 +<%@include file="../jspf/issue-summary.jspf" %>
1.26
1.27 <table id="version-list" class="datatable medskip fullwidth">
1.28 <colgroup>
1.29 <col>
1.30 - <col width="28%">
1.31 - <col width="12%">
1.32 - <col width="12%">
1.33 - <col width="12%">
1.34 - <col width="12%">
1.35 - <col width="12%">
1.36 - <col width="12%">
1.37 + <col style="width: 28%">
1.38 + <col style="width: 12%">
1.39 + <col style="width: 12%">
1.40 + <col style="width: 12%">
1.41 + <col style="width: 12%">
1.42 + <col style="width: 12%">
1.43 + <col style="width: 12%">
1.44 </colgroup>
1.45 <thead>
1.46 <tr>
1.47 @@ -67,23 +67,28 @@
1.48 <tr>
1.49 <th></th>
1.50 <th><fmt:message key="version"/></th>
1.51 - <th class="hcenter"><fmt:message key="issues.open" /></th>
1.52 - <th class="hcenter"><fmt:message key="issues.active" /></th>
1.53 - <th class="hcenter"><fmt:message key="issues.done" /></th>
1.54 - <th class="hcenter"><fmt:message key="issues.open" /></th>
1.55 - <th class="hcenter"><fmt:message key="issues.active" /></th>
1.56 - <th class="hcenter"><fmt:message key="issues.done" /></th>
1.57 + <th class="hcenter"><fmt:message key="issues.open"/></th>
1.58 + <th class="hcenter"><fmt:message key="issues.active"/></th>
1.59 + <th class="hcenter"><fmt:message key="issues.done"/></th>
1.60 + <th class="hcenter"><fmt:message key="issues.open"/></th>
1.61 + <th class="hcenter"><fmt:message key="issues.active"/></th>
1.62 + <th class="hcenter"><fmt:message key="issues.done"/></th>
1.63 </tr>
1.64 </thead>
1.65 <tbody>
1.66 - <c:forEach var="versionInfo" items="${viewmodel.versionInfos}" >
1.67 + <c:forEach var="versionInfo" items="${viewmodel.versionInfos}">
1.68 <tr>
1.69 - <td rowspan="2" style="width: 2em;"><a href="./projects/${project.node}/versions/${versionInfo.version.node}/edit">✎</a></td>
1.70 + <td rowspan="2" style="width: 2em;"><a
1.71 + href="./projects/${project.node}/versions/${versionInfo.version.node}/edit">✎</a></td>
1.72 <td rowspan="2">
1.73 <a href="./projects/${project.node}/issues/${versionInfo.version.node}/-/">
1.74 <c:out value="${versionInfo.version.name}"/>
1.75 </a>
1.76 - <div class="version-tag version-${versionInfo.version.status}">
1.77 + <div class="version-tag version-${versionInfo.version.status}"
1.78 + <c:if test="${not empty versionInfo.version.releaseOrEolDate}">
1.79 + title="<fmt:formatDate type="date" value="${versionInfo.version.releaseOrEolDate}"/>"
1.80 + </c:if>
1.81 + >
1.82 <fmt:message key="version.status.${versionInfo.version.status}"/>
1.83 </div>
1.84 </td>
1.85 @@ -104,6 +109,6 @@
1.86 <%@include file="../jspf/issue-progress.jspf" %>
1.87 </td>
1.88 </tr>
1.89 - </c:forEach>
1.90 + </c:forEach>
1.91 </tbody>
1.92 </table>
1.93 \ No newline at end of file
