Mercurial > hg > LightPIT / changeset

--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Tue Feb 04 18:28:55 2025 +0100
+++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Tue Feb 04 18:43:13 2025 +0100
@@ -107,7 +107,7 @@
                         </option>
                     </c:forEach>
                 </select>
-                <div id="issue-variant-status">
+                <div id="issue-variant-status" class="issue-variant-status">
                     <c:forEach items="${viewmodel.variants}" var="variant">
                         <div title="<c:out value="${variant.description}" />">
                             <label for="issue-status-variant-${variant.id}" >

--- a/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Tue Feb 04 18:28:55 2025 +0100
+++ b/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Tue Feb 04 18:43:13 2025 +0100
@@ -50,7 +50,12 @@
     <tr>
         <th><fmt:message key="issue.id"/></th>
         <td>${issue.id}</td>
-        <td colspan="2"></td>
+        <th><fmt:message key="issue.category"/></th>
+        <td>
+            <div class="issue-tag ${issue.category}">
+                <fmt:message key="issue.category.${issue.category}" />
+            </div>
+        </td>
     </tr>
     <tr>
         <th><fmt:message key="issue.created"/></th>
@@ -84,20 +89,6 @@
         </td>
     </tr>
     <tr>
-        <th><fmt:message key="issue.category"/></th>
-        <td>
-            <div class="issue-tag ${issue.category}">
-                <fmt:message key="issue.category.${issue.category}" />
-            </div>
-        </td>
-        <th><fmt:message key="issue.status"/></th>
-        <td>
-            <div class="issue-tag phase-${issue.status.phase.number}">
-                <fmt:message key="issue.status.${issue.status}" />
-            </div>
-        </td>
-    </tr>
-    <tr>
         <th><fmt:message key="issue.resolved-versions"/></th>
         <td>
             <c:out value="${issue.resolved.name}"/>
@@ -107,6 +98,36 @@
             <c:out value="${issue.affected.name}"/>
         </td>
     </tr>
+    <tr>
+        <th><fmt:message key="issue.status"/></th>
+        <td>
+            <div class="issue-tag phase-${issue.status.phase.number}">
+                <fmt:message key="issue.status.${issue.status}" />
+            </div>
+        </td>
+        <c:if test="${not issue.trackingVariantStatus}">
+        <td colspan="2"></td>
+        </c:if>
+        <c:if test="${issue.trackingVariantStatus}">
+        <th><fmt:message key="issue.variants"/></th>
+        <td>
+            <div class="issue-variant-status">
+                <c:forEach items="${issue.variantStatus}" var="vs">
+                    <div>
+                        <div>
+                            <a href="./projects/${issue.project.node}/issues/-/-/${vs.key.node}/"><c:out value="${vs.key.name}"/></a>:
+                        </div>
+                        <div class="issue-tag phase-${vs.value.phase.number}"
+                             title="<c:out value="${vs.key.description}"/>"
+                        >
+                            <fmt:message key="issue.status.${vs.value}" />
+                        </div>
+                    </div>
+                </c:forEach>
+            </div>
+        </td>
+        </c:if>
+    </tr>
     </tbody>
 </table>
 <table class="issue-view fullwidth">

--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Feb 04 18:28:55 2025 +0100
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Feb 04 18:43:13 2025 +0100
@@ -31,7 +31,7 @@
 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 <%-- Version suffix for forcing browsers to update the CSS / JS files --%>
-<c:set scope="page" var="versionSuffix" value="20250202"/>
+<c:set scope="page" var="versionSuffix" value="20250204"/>
 
 <%-- Make the base href easily available at request scope --%>
 <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/>

--- a/src/main/webapp/projects.css	Tue Feb 04 18:28:55 2025 +0100
+++ b/src/main/webapp/projects.css	Tue Feb 04 18:43:13 2025 +0100
@@ -193,7 +193,7 @@
     white-space: nowrap;
 }
 
-#issue-variant-status {
+.issue-variant-status {
     display: flex;
     gap: 1em;
     flex-wrap: wrap;