Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Tue Aug 03 15:10:43 2021 +0200
@@ -37,23 +37,18 @@
 
 <c:set var="issuesHref" scope="page" value="./projects/${project.node}/issues/${empty version ? '-' : version.node }/${empty component ? '-' : component.node}/"/>
 
-<table class="formtable fullwidth">
+<table class="issue-view fullwidth">
     <colgroup>
         <col>
-        <col style="width: 100%">
+        <col style="width: 50%">
+        <col>
+        <col style="width: 50%">
     </colgroup>
     <tbody>
-    <c:if test="${viewmodel.issue.id ge 0}">
     <tr>
         <th><fmt:message key="issue.id"/></th>
         <td>${issue.id}</td>
-    </tr>
-    </c:if>
-    <tr>
-        <th><fmt:message key="project"/></th>
-        <td>
-            <c:out value="${issue.project.name}" />
-        </td>
+        <td colspan="2"></td>
     </tr>
     <tr>
         <th><fmt:message key="issue.created"/></th>
@@ -61,8 +56,6 @@
             <c:set var="dateValue" value="${issue.created}"/>
             <%@include file="../jspf/date-with-tooltip.jspf"%>
         </td>
-    </tr>
-    <tr>
         <th><fmt:message key="issue.updated"/></th>
         <td>
             <c:set var="dateValue" value="${issue.updated}"/>
@@ -70,6 +63,10 @@
         </td>
     </tr>
     <tr>
+        <th><fmt:message key="project"/></th>
+        <td>
+            <c:out value="${issue.project.name}" />
+        </td>
         <th><fmt:message key="component"/></th>
         <td>
             <c:if test="${not empty issue.component}">
@@ -87,8 +84,6 @@
                 <fmt:message key="issue.category.${issue.category}" />
             </div>
         </td>
-    </tr>
-    <tr>
         <th><fmt:message key="issue.status"/></th>
         <td>
             <div class="issue-tag phase-${issue.status.phase.number}" style="width: auto">
@@ -97,6 +92,28 @@
         </td>
     </tr>
     <tr>
+        <th><fmt:message key="issue.resolved-versions"/></th>
+        <td>
+            <c:forEach var="version" items="${issue.resolvedVersions}">
+                <c:out value="${version.name}"/>
+            </c:forEach>
+        </td>
+        <th><fmt:message key="issue.affected-versions"/></th>
+        <td>
+            <c:forEach var="version" items="${issue.affectedVersions}">
+                <c:out value="${version.name}"/>
+            </c:forEach>
+        </td>
+    </tr>
+    </tbody>
+</table>
+<table class="issue-view fullwidth">
+    <colgroup>
+        <col>
+        <col style="width: 100%">
+    </colgroup>
+    <tbody>
+    <tr>
         <th><fmt:message key="issue.subject"/></th>
         <td><c:out value="${issue.subject}"/></td>
     </tr>
@@ -120,39 +137,19 @@
         </td>
     </tr>
     <tr>
-        <th class="vtop"><fmt:message key="issue.affected-versions"/></th>
-        <td>
-            <c:forEach var="version" items="${issue.affectedVersions}">
-                <c:out value="${version.name}"/>
-            </c:forEach>
-        </td>
-    </tr>
-    <tr>
-        <th class="vtop"><fmt:message key="issue.resolved-versions"/></th>
-        <td>
-            <c:forEach var="version" items="${issue.resolvedVersions}">
-                <c:out value="${version.name}"/>
-            </c:forEach>
-        </td>
-    </tr>
-    <tr>
         <th><fmt:message key="issue.eta"/></th>
         <td><fmt:formatDate value="${issue.eta}" /></td>
     </tr>
     </tbody>
-    <tfoot>
-    <tr>
-        <td colspan="2">
-            <a href="${issuesHref}" class="button">
-                <fmt:message key="button.cancel"/>
-            </a>
-            <a href="${issuesHref}${issue.id}/edit" class="button submit">
-                <fmt:message key="button.issue.edit"/>
-            </a>
-        </td>
-    </tr>
-    </tfoot>
 </table>
+<div class="hright">
+    <a href="${issuesHref}" class="button">
+        <fmt:message key="button.back"/>
+    </a>
+    <a href="${issuesHref}${issue.id}/edit" class="button submit">
+        <fmt:message key="button.issue.edit"/>
+    </a>
+</div>
 
 <hr class="comments-separator"/>
 <h2><fmt:message key="issue.comments"/></h2>