Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/resources/localization/strings.properties	Tue Aug 03 14:46:04 2021 +0200
     1.2 +++ b/src/main/resources/localization/strings.properties	Tue Aug 03 15:10:43 2021 +0200
     1.3 @@ -24,6 +24,7 @@
     1.4  app.changelog=Changelog
     1.5  app.license.title=License
     1.6  app.name=Lightweight Project and Issue Tracking
     1.7 +button.back=Back
     1.8  button.cancel=Cancel
     1.9  button.comment.edit=Edit Comment
    1.10  button.comment=Comment
    1.11 @@ -32,7 +33,7 @@
    1.12  button.issue.all=All Issues
    1.13  button.issue.create.another=Create another Issue
    1.14  button.issue.create=New Issue
    1.15 -button.issue.edit=Edit Issue
    1.16 +button.issue.edit=Edit
    1.17  button.language.submit = Switch language
    1.18  button.okay=OK
    1.19  button.project.create=New Project
    1.20 @@ -62,7 +63,7 @@
    1.21  feed.issues.title=LightPIT Issues
    1.22  feed.issues.updated=Issue has been updated.
    1.23  feed=Feed
    1.24 -issue.affected-versions=Affected Versions
    1.25 +issue.affected-versions=Affected
    1.26  issue.assignee=Assignee
    1.27  issue.category.Bug=Bug
    1.28  issue.category.Feature=Feature
    1.29 @@ -78,7 +79,7 @@
    1.30  issue.description=Description
    1.31  issue.eta=ETA
    1.32  issue.id=Issue ID
    1.33 -issue.resolved-versions=Target Versions
    1.34 +issue.resolved-versions=Target
    1.35  issue.status.Done=Done
    1.36  issue.status.Duplicate=Duplicate
    1.37  issue.status.InProgress=In Progress

     2.1 --- a/src/main/resources/localization/strings_de.properties	Tue Aug 03 14:46:04 2021 +0200
     2.2 +++ b/src/main/resources/localization/strings_de.properties	Tue Aug 03 15:10:43 2021 +0200
     2.3 @@ -23,6 +23,7 @@
     2.4  
     2.5  app.changelog=Versionshistorie
     2.6  app.license.title=Lizenz (Englisch)
     2.7 +button.back=Zur\u00fcck
     2.8  button.cancel=Abbrechen
     2.9  button.comment.edit=Absenden
    2.10  button.comment=Kommentieren
    2.11 @@ -31,7 +32,7 @@
    2.12  button.issue.all=Alle Vorg\u00e4nge
    2.13  button.issue.create.another=Weiteren Vorgang erstellen
    2.14  button.issue.create=Neuer Vorgang
    2.15 -button.issue.edit=Vorgang Bearbeiten
    2.16 +button.issue.edit=Bearbeiten
    2.17  button.language.submit = Sprache ausw\u00e4hlen
    2.18  button.okay=OK
    2.19  button.project.create=Neues Projekt
    2.20 @@ -61,7 +62,7 @@
    2.21  feed.issues.title=LightPIT Vorg\u00e4nge
    2.22  feed.issues.updated=Vorgang wurde aktualisiert.
    2.23  feed=Feed
    2.24 -issue.affected-versions=Betroffene Versionen
    2.25 +issue.affected-versions=Betroffen
    2.26  issue.assignee=Zugewiesen
    2.27  issue.category.Bug=Fehler
    2.28  issue.category.Feature=Feature
    2.29 @@ -77,7 +78,7 @@
    2.30  issue.description=Beschreibung
    2.31  issue.eta=Zieldatum
    2.32  issue.id=Vorgangs-ID
    2.33 -issue.resolved-versions=Zielversionen
    2.34 +issue.resolved-versions=Ziel
    2.35  issue.status.Done=Erledigt
    2.36  issue.status.Duplicate=Duplikat
    2.37  issue.status.InProgress=In Arbeit

     3.1 --- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Tue Aug 03 14:46:04 2021 +0200
     3.2 +++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Tue Aug 03 15:10:43 2021 +0200
     3.3 @@ -29,6 +29,7 @@
     3.4  <ul>
     3.5      <li>Infoseite hinzugefügt.</li>
     3.6      <li>Eigene Kommentare können nun bearbeitet werden.</li>
     3.7 +    <li>Verbesserte Vorgangsansicht.</li>
     3.8      <li>Sortierreihenfolge der Versionen in der Übersicht an die Sortierreihenfolge im Seitenmenü angeglichen.</li>
     3.9      <li>Duplikate in Komponenten- und Versionslisten behoben.</li>
    3.10      <li>Fehler behoben, bei dem vorbereitete Datenbankabfragen nicht geschlossen wurden.</li>

     4.1 --- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Tue Aug 03 14:46:04 2021 +0200
     4.2 +++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Tue Aug 03 15:10:43 2021 +0200
     4.3 @@ -29,6 +29,7 @@
     4.4  <ul>
     4.5      <li>Adds about page.</li>
     4.6      <li>Adds possibility to edit own comments.</li>
     4.7 +    <li>Improves Issue View.</li>
     4.8      <li>Changes sort order of versions in the versions overview to be the same as in the left menu.</li>
     4.9      <li>Fixes duplicates in the components and versions lists.</li>
    4.10      <li>Fixes leaking prepared statements.</li>

     5.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Tue Aug 03 14:46:04 2021 +0200
     5.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Tue Aug 03 15:10:43 2021 +0200
     5.3 @@ -38,6 +38,7 @@
     5.4  <c:set var="issuesHref" value="./projects/${project.node}/issues/${empty version ? '-' : version.node }/${empty component ? '-' : component.node}/"/>
     5.5  
     5.6  <form action="${issuesHref}-/commit" method="post">
     5.7 +    <input type="hidden" name="project" value="${issue.project.id}" />
     5.8      <table class="formtable fullwidth">
     5.9          <colgroup>
    5.10              <col>
    5.11 @@ -51,40 +52,6 @@
    5.12          </tr>
    5.13          </c:if>
    5.14          <tr>
    5.15 -            <th><fmt:message key="project"/></th>
    5.16 -            <td>
    5.17 -                <c:choose>
    5.18 -                    <c:when test="${issue.project.id ge 0}">
    5.19 -                        <c:out value="${issue.project.name}" />
    5.20 -                        <input type="hidden" name="project" value="${issue.project.id}" />
    5.21 -                    </c:when>
    5.22 -                    <c:otherwise>
    5.23 -                        <select name="project" required>
    5.24 -                            <c:forEach var="project" items="${viewmodel.projects}">
    5.25 -                                <option value="${project.id}">
    5.26 -                                    <c:out value="${project.name}" />
    5.27 -                                </option>
    5.28 -                            </c:forEach>
    5.29 -                        </select>
    5.30 -                    </c:otherwise>
    5.31 -                </c:choose>
    5.32 -            </td>
    5.33 -        </tr>
    5.34 -        <tr>
    5.35 -            <th><fmt:message key="issue.created"/></th>
    5.36 -            <td>
    5.37 -                <c:set var="dateValue" value="${issue.created}"/>
    5.38 -                <%@include file="../jspf/date-with-tooltip.jspf"%>
    5.39 -            </td>
    5.40 -        </tr>
    5.41 -        <tr>
    5.42 -            <th><fmt:message key="issue.updated"/></th>
    5.43 -            <td>
    5.44 -                <c:set var="dateValue" value="${issue.updated}"/>
    5.45 -                <%@include file="../jspf/date-with-tooltip.jspf"%>
    5.46 -            </td>
    5.47 -        </tr>
    5.48 -        <tr>
    5.49              <th><fmt:message key="component"/></th>
    5.50              <td>
    5.51                  <select name="component">

     6.1 --- a/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Tue Aug 03 14:46:04 2021 +0200
     6.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-view.jsp	Tue Aug 03 15:10:43 2021 +0200
     6.3 @@ -37,23 +37,18 @@
     6.4  
     6.5  <c:set var="issuesHref" scope="page" value="./projects/${project.node}/issues/${empty version ? '-' : version.node }/${empty component ? '-' : component.node}/"/>
     6.6  
     6.7 -<table class="formtable fullwidth">
     6.8 +<table class="issue-view fullwidth">
     6.9      <colgroup>
    6.10          <col>
    6.11 -        <col style="width: 100%">
    6.12 +        <col style="width: 50%">
    6.13 +        <col>
    6.14 +        <col style="width: 50%">
    6.15      </colgroup>
    6.16      <tbody>
    6.17 -    <c:if test="${viewmodel.issue.id ge 0}">
    6.18      <tr>
    6.19          <th><fmt:message key="issue.id"/></th>
    6.20          <td>${issue.id}</td>
    6.21 -    </tr>
    6.22 -    </c:if>
    6.23 -    <tr>
    6.24 -        <th><fmt:message key="project"/></th>
    6.25 -        <td>
    6.26 -            <c:out value="${issue.project.name}" />
    6.27 -        </td>
    6.28 +        <td colspan="2"></td>
    6.29      </tr>
    6.30      <tr>
    6.31          <th><fmt:message key="issue.created"/></th>
    6.32 @@ -61,8 +56,6 @@
    6.33              <c:set var="dateValue" value="${issue.created}"/>
    6.34              <%@include file="../jspf/date-with-tooltip.jspf"%>
    6.35          </td>
    6.36 -    </tr>
    6.37 -    <tr>
    6.38          <th><fmt:message key="issue.updated"/></th>
    6.39          <td>
    6.40              <c:set var="dateValue" value="${issue.updated}"/>
    6.41 @@ -70,6 +63,10 @@
    6.42          </td>
    6.43      </tr>
    6.44      <tr>
    6.45 +        <th><fmt:message key="project"/></th>
    6.46 +        <td>
    6.47 +            <c:out value="${issue.project.name}" />
    6.48 +        </td>
    6.49          <th><fmt:message key="component"/></th>
    6.50          <td>
    6.51              <c:if test="${not empty issue.component}">
    6.52 @@ -87,8 +84,6 @@
    6.53                  <fmt:message key="issue.category.${issue.category}" />
    6.54              </div>
    6.55          </td>
    6.56 -    </tr>
    6.57 -    <tr>
    6.58          <th><fmt:message key="issue.status"/></th>
    6.59          <td>
    6.60              <div class="issue-tag phase-${issue.status.phase.number}" style="width: auto">
    6.61 @@ -97,6 +92,28 @@
    6.62          </td>
    6.63      </tr>
    6.64      <tr>
    6.65 +        <th><fmt:message key="issue.resolved-versions"/></th>
    6.66 +        <td>
    6.67 +            <c:forEach var="version" items="${issue.resolvedVersions}">
    6.68 +                <c:out value="${version.name}"/>
    6.69 +            </c:forEach>
    6.70 +        </td>
    6.71 +        <th><fmt:message key="issue.affected-versions"/></th>
    6.72 +        <td>
    6.73 +            <c:forEach var="version" items="${issue.affectedVersions}">
    6.74 +                <c:out value="${version.name}"/>
    6.75 +            </c:forEach>
    6.76 +        </td>
    6.77 +    </tr>
    6.78 +    </tbody>
    6.79 +</table>
    6.80 +<table class="issue-view fullwidth">
    6.81 +    <colgroup>
    6.82 +        <col>
    6.83 +        <col style="width: 100%">
    6.84 +    </colgroup>
    6.85 +    <tbody>
    6.86 +    <tr>
    6.87          <th><fmt:message key="issue.subject"/></th>
    6.88          <td><c:out value="${issue.subject}"/></td>
    6.89      </tr>
    6.90 @@ -120,39 +137,19 @@
    6.91          </td>
    6.92      </tr>
    6.93      <tr>
    6.94 -        <th class="vtop"><fmt:message key="issue.affected-versions"/></th>
    6.95 -        <td>
    6.96 -            <c:forEach var="version" items="${issue.affectedVersions}">
    6.97 -                <c:out value="${version.name}"/>
    6.98 -            </c:forEach>
    6.99 -        </td>
   6.100 -    </tr>
   6.101 -    <tr>
   6.102 -        <th class="vtop"><fmt:message key="issue.resolved-versions"/></th>
   6.103 -        <td>
   6.104 -            <c:forEach var="version" items="${issue.resolvedVersions}">
   6.105 -                <c:out value="${version.name}"/>
   6.106 -            </c:forEach>
   6.107 -        </td>
   6.108 -    </tr>
   6.109 -    <tr>
   6.110          <th><fmt:message key="issue.eta"/></th>
   6.111          <td><fmt:formatDate value="${issue.eta}" /></td>
   6.112      </tr>
   6.113      </tbody>
   6.114 -    <tfoot>
   6.115 -    <tr>
   6.116 -        <td colspan="2">
   6.117 -            <a href="${issuesHref}" class="button">
   6.118 -                <fmt:message key="button.cancel"/>
   6.119 -            </a>
   6.120 -            <a href="${issuesHref}${issue.id}/edit" class="button submit">
   6.121 -                <fmt:message key="button.issue.edit"/>
   6.122 -            </a>
   6.123 -        </td>
   6.124 -    </tr>
   6.125 -    </tfoot>
   6.126  </table>
   6.127 +<div class="hright">
   6.128 +    <a href="${issuesHref}" class="button">
   6.129 +        <fmt:message key="button.back"/>
   6.130 +    </a>
   6.131 +    <a href="${issuesHref}${issue.id}/edit" class="button submit">
   6.132 +        <fmt:message key="button.issue.edit"/>
   6.133 +    </a>
   6.134 +</div>
   6.135  
   6.136  <hr class="comments-separator"/>
   6.137  <h2><fmt:message key="issue.comments"/></h2>

     7.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Aug 03 14:46:04 2021 +0200
     7.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Aug 03 15:10:43 2021 +0200
     7.3 @@ -31,7 +31,7 @@
     7.4  <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
     7.5  
     7.6  <%-- Version suffix for forcing browsers to update the CSS / JS files --%>
     7.7 -<c:set scope="page" var="versionSuffix" value="20210802"/>
     7.8 +<c:set scope="page" var="versionSuffix" value="20210803"/>
     7.9  
    7.10  <%-- Make the base href easily available at request scope --%>
    7.11  <c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/>

     8.1 --- a/src/main/webapp/projects.css	Tue Aug 03 14:46:04 2021 +0200
     8.2 +++ b/src/main/webapp/projects.css	Tue Aug 03 15:10:43 2021 +0200
     8.3 @@ -173,4 +173,19 @@
     8.4  
     8.5  span.eta-overdue {
     8.6      color: red;
     8.7 -}
     8.8 \ No newline at end of file
     8.9 +}
    8.10 +
    8.11 +table.issue-view {
    8.12 +    border-collapse: collapse;
    8.13 +    margin-bottom: 1em;
    8.14 +}
    8.15 +
    8.16 +table.issue-view td, table.issue-view th {
    8.17 +    background: #f7f7f7;
    8.18 +    border: solid silver 1pt;
    8.19 +    padding: .5em;
    8.20 +}
    8.21 +
    8.22 +table.issue-view th {
    8.23 +    white-space: nowrap;
    8.24 +}