1.1 --- a/src/main/webapp/WEB-INF/jsp/issue-view.jsp Tue Aug 03 14:46:04 2021 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-view.jsp Tue Aug 03 15:10:43 2021 +0200
1.3 @@ -37,23 +37,18 @@
1.4
1.5 <c:set var="issuesHref" scope="page" value="./projects/${project.node}/issues/${empty version ? '-' : version.node }/${empty component ? '-' : component.node}/"/>
1.6
1.7 -<table class="formtable fullwidth">
1.8 +<table class="issue-view fullwidth">
1.9 <colgroup>
1.10 <col>
1.11 - <col style="width: 100%">
1.12 + <col style="width: 50%">
1.13 + <col>
1.14 + <col style="width: 50%">
1.15 </colgroup>
1.16 <tbody>
1.17 - <c:if test="${viewmodel.issue.id ge 0}">
1.18 <tr>
1.19 <th><fmt:message key="issue.id"/></th>
1.20 <td>${issue.id}</td>
1.21 - </tr>
1.22 - </c:if>
1.23 - <tr>
1.24 - <th><fmt:message key="project"/></th>
1.25 - <td>
1.26 - <c:out value="${issue.project.name}" />
1.27 - </td>
1.28 + <td colspan="2"></td>
1.29 </tr>
1.30 <tr>
1.31 <th><fmt:message key="issue.created"/></th>
1.32 @@ -61,8 +56,6 @@
1.33 <c:set var="dateValue" value="${issue.created}"/>
1.34 <%@include file="../jspf/date-with-tooltip.jspf"%>
1.35 </td>
1.36 - </tr>
1.37 - <tr>
1.38 <th><fmt:message key="issue.updated"/></th>
1.39 <td>
1.40 <c:set var="dateValue" value="${issue.updated}"/>
1.41 @@ -70,6 +63,10 @@
1.42 </td>
1.43 </tr>
1.44 <tr>
1.45 + <th><fmt:message key="project"/></th>
1.46 + <td>
1.47 + <c:out value="${issue.project.name}" />
1.48 + </td>
1.49 <th><fmt:message key="component"/></th>
1.50 <td>
1.51 <c:if test="${not empty issue.component}">
1.52 @@ -87,8 +84,6 @@
1.53 <fmt:message key="issue.category.${issue.category}" />
1.54 </div>
1.55 </td>
1.56 - </tr>
1.57 - <tr>
1.58 <th><fmt:message key="issue.status"/></th>
1.59 <td>
1.60 <div class="issue-tag phase-${issue.status.phase.number}" style="width: auto">
1.61 @@ -97,6 +92,28 @@
1.62 </td>
1.63 </tr>
1.64 <tr>
1.65 + <th><fmt:message key="issue.resolved-versions"/></th>
1.66 + <td>
1.67 + <c:forEach var="version" items="${issue.resolvedVersions}">
1.68 + <c:out value="${version.name}"/>
1.69 + </c:forEach>
1.70 + </td>
1.71 + <th><fmt:message key="issue.affected-versions"/></th>
1.72 + <td>
1.73 + <c:forEach var="version" items="${issue.affectedVersions}">
1.74 + <c:out value="${version.name}"/>
1.75 + </c:forEach>
1.76 + </td>
1.77 + </tr>
1.78 + </tbody>
1.79 +</table>
1.80 +<table class="issue-view fullwidth">
1.81 + <colgroup>
1.82 + <col>
1.83 + <col style="width: 100%">
1.84 + </colgroup>
1.85 + <tbody>
1.86 + <tr>
1.87 <th><fmt:message key="issue.subject"/></th>
1.88 <td><c:out value="${issue.subject}"/></td>
1.89 </tr>
1.90 @@ -120,39 +137,19 @@
1.91 </td>
1.92 </tr>
1.93 <tr>
1.94 - <th class="vtop"><fmt:message key="issue.affected-versions"/></th>
1.95 - <td>
1.96 - <c:forEach var="version" items="${issue.affectedVersions}">
1.97 - <c:out value="${version.name}"/>
1.98 - </c:forEach>
1.99 - </td>
1.100 - </tr>
1.101 - <tr>
1.102 - <th class="vtop"><fmt:message key="issue.resolved-versions"/></th>
1.103 - <td>
1.104 - <c:forEach var="version" items="${issue.resolvedVersions}">
1.105 - <c:out value="${version.name}"/>
1.106 - </c:forEach>
1.107 - </td>
1.108 - </tr>
1.109 - <tr>
1.110 <th><fmt:message key="issue.eta"/></th>
1.111 <td><fmt:formatDate value="${issue.eta}" /></td>
1.112 </tr>
1.113 </tbody>
1.114 - <tfoot>
1.115 - <tr>
1.116 - <td colspan="2">
1.117 - <a href="${issuesHref}" class="button">
1.118 - <fmt:message key="button.cancel"/>
1.119 - </a>
1.120 - <a href="${issuesHref}${issue.id}/edit" class="button submit">
1.121 - <fmt:message key="button.issue.edit"/>
1.122 - </a>
1.123 - </td>
1.124 - </tr>
1.125 - </tfoot>
1.126 </table>
1.127 +<div class="hright">
1.128 + <a href="${issuesHref}" class="button">
1.129 + <fmt:message key="button.back"/>
1.130 + </a>
1.131 + <a href="${issuesHref}${issue.id}/edit" class="button submit">
1.132 + <fmt:message key="button.issue.edit"/>
1.133 + </a>
1.134 +</div>
1.135
1.136 <hr class="comments-separator"/>
1.137 <h2><fmt:message key="issue.comments"/></h2>
