# HG changeset patch
# User Mike Becker <universe@uap-core.de>
# Date 1627996243 -7200
# Node ID c50da26a6d310cb7f63c08bc217573b34784d738
# Parent  8066895cc57e48d60a762e929154d616e641ca0f
#154 improves issue view

diff -r 8066895cc57e -r c50da26a6d31 src/main/resources/localization/strings.properties
--- a/src/main/resources/localization/strings.properties	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/resources/localization/strings.properties	Tue Aug 03 15:10:43 2021 +0200
@@ -24,6 +24,7 @@
 app.changelog=Changelog
 app.license.title=License
 app.name=Lightweight Project and Issue Tracking
+button.back=Back
 button.cancel=Cancel
 button.comment.edit=Edit Comment
 button.comment=Comment
@@ -32,7 +33,7 @@
 button.issue.all=All Issues
 button.issue.create.another=Create another Issue
 button.issue.create=New Issue
-button.issue.edit=Edit Issue
+button.issue.edit=Edit
 button.language.submit = Switch language
 button.okay=OK
 button.project.create=New Project
@@ -62,7 +63,7 @@
 feed.issues.title=LightPIT Issues
 feed.issues.updated=Issue has been updated.
 feed=Feed
-issue.affected-versions=Affected Versions
+issue.affected-versions=Affected
 issue.assignee=Assignee
 issue.category.Bug=Bug
 issue.category.Feature=Feature
@@ -78,7 +79,7 @@
 issue.description=Description
 issue.eta=ETA
 issue.id=Issue ID
-issue.resolved-versions=Target Versions
+issue.resolved-versions=Target
 issue.status.Done=Done
 issue.status.Duplicate=Duplicate
 issue.status.InProgress=In Progress
diff -r 8066895cc57e -r c50da26a6d31 src/main/resources/localization/strings_de.properties
--- a/src/main/resources/localization/strings_de.properties	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/resources/localization/strings_de.properties	Tue Aug 03 15:10:43 2021 +0200
@@ -23,6 +23,7 @@
 
 app.changelog=Versionshistorie
 app.license.title=Lizenz (Englisch)
+button.back=Zur\u00fcck
 button.cancel=Abbrechen
 button.comment.edit=Absenden
 button.comment=Kommentieren
@@ -31,7 +32,7 @@
 button.issue.all=Alle Vorg\u00e4nge
 button.issue.create.another=Weiteren Vorgang erstellen
 button.issue.create=Neuer Vorgang
-button.issue.edit=Vorgang Bearbeiten
+button.issue.edit=Bearbeiten
 button.language.submit = Sprache ausw\u00e4hlen
 button.okay=OK
 button.project.create=Neues Projekt
@@ -61,7 +62,7 @@
 feed.issues.title=LightPIT Vorg\u00e4nge
 feed.issues.updated=Vorgang wurde aktualisiert.
 feed=Feed
-issue.affected-versions=Betroffene Versionen
+issue.affected-versions=Betroffen
 issue.assignee=Zugewiesen
 issue.category.Bug=Fehler
 issue.category.Feature=Feature
@@ -77,7 +78,7 @@
 issue.description=Beschreibung
 issue.eta=Zieldatum
 issue.id=Vorgangs-ID
-issue.resolved-versions=Zielversionen
+issue.resolved-versions=Ziel
 issue.status.Done=Erledigt
 issue.status.Duplicate=Duplikat
 issue.status.InProgress=In Arbeit
diff -r 8066895cc57e -r c50da26a6d31 src/main/webapp/WEB-INF/changelogs/changelog-de.jspf
--- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Tue Aug 03 15:10:43 2021 +0200
@@ -29,6 +29,7 @@
 <ul>
     <li>Infoseite hinzugefügt.</li>
     <li>Eigene Kommentare können nun bearbeitet werden.</li>
+    <li>Verbesserte Vorgangsansicht.</li>
     <li>Sortierreihenfolge der Versionen in der Übersicht an die Sortierreihenfolge im Seitenmenü angeglichen.</li>
     <li>Duplikate in Komponenten- und Versionslisten behoben.</li>
     <li>Fehler behoben, bei dem vorbereitete Datenbankabfragen nicht geschlossen wurden.</li>
diff -r 8066895cc57e -r c50da26a6d31 src/main/webapp/WEB-INF/changelogs/changelog.jspf
--- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Tue Aug 03 15:10:43 2021 +0200
@@ -29,6 +29,7 @@
 <ul>
     <li>Adds about page.</li>
     <li>Adds possibility to edit own comments.</li>
+    <li>Improves Issue View.</li>
     <li>Changes sort order of versions in the versions overview to be the same as in the left menu.</li>
     <li>Fixes duplicates in the components and versions lists.</li>
     <li>Fixes leaking prepared statements.</li>
diff -r 8066895cc57e -r c50da26a6d31 src/main/webapp/WEB-INF/jsp/issue-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Tue Aug 03 15:10:43 2021 +0200
@@ -38,6 +38,7 @@
 <c:set var="issuesHref" value="./projects/${project.node}/issues/${empty version ? '-' : version.node }/${empty component ? '-' : component.node}/"/>
 
 <form action="${issuesHref}-/commit" method="post">
+    <input type="hidden" name="project" value="${issue.project.id}" />
     <table class="formtable fullwidth">
         <colgroup>
             <col>
@@ -51,40 +52,6 @@
         </tr>
         </c:if>
         <tr>
-            <th><fmt:message key="project"/></th>
-            <td>
-                <c:choose>
-                    <c:when test="${issue.project.id ge 0}">
-                        <c:out value="${issue.project.name}" />
-                        <input type="hidden" name="project" value="${issue.project.id}" />
-                    </c:when>
-                    <c:otherwise>
-                        <select name="project" required>
-                            <c:forEach var="project" items="${viewmodel.projects}">
-                                <option value="${project.id}">
-                                    <c:out value="${project.name}" />
-                                </option>
-                            </c:forEach>
-                        </select>
-                    </c:otherwise>
-                </c:choose>
-            </td>
-        </tr>
-        <tr>
-            <th><fmt:message key="issue.created"/></th>
-            <td>
-                <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}"/>
-                <%@include file="../jspf/date-with-tooltip.jspf"%>
-            </td>
-        </tr>
-        <tr>
             <th><fmt:message key="component"/></th>
             <td>
                 <select name="component">
diff -r 8066895cc57e -r c50da26a6d31 src/main/webapp/WEB-INF/jsp/issue-view.jsp
--- 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>
diff -r 8066895cc57e -r c50da26a6d31 src/main/webapp/WEB-INF/jsp/site.jsp
--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Aug 03 15:10:43 2021 +0200
@@ -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="20210802"/>
+<c:set scope="page" var="versionSuffix" value="20210803"/>
 
 <%-- Make the base href easily available at request scope --%>
 <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/>
diff -r 8066895cc57e -r c50da26a6d31 src/main/webapp/projects.css
--- a/src/main/webapp/projects.css	Tue Aug 03 14:46:04 2021 +0200
+++ b/src/main/webapp/projects.css	Tue Aug 03 15:10:43 2021 +0200
@@ -173,4 +173,19 @@
 
 span.eta-overdue {
     color: red;
-}
\ No newline at end of file
+}
+
+table.issue-view {
+    border-collapse: collapse;
+    margin-bottom: 1em;
+}
+
+table.issue-view td, table.issue-view th {
+    background: #f7f7f7;
+    border: solid silver 1pt;
+    padding: .5em;
+}
+
+table.issue-view th {
+    white-space: nowrap;
+}