Mercurial > hg > LightPIT / changeset

--- a/src/main/resources/localization/projects.properties	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/resources/localization/projects.properties	Sat Aug 29 11:49:53 2020 +0200
@@ -50,7 +50,7 @@
 issues.done=Done
 issues.total=Total
 issues.reported=Reported Issues
-issues.resolved=Issues
+issues.resolved=Assigned Issues
 
 version.project=Project
 version.name=Version

--- a/src/main/resources/localization/projects_de.properties	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/resources/localization/projects_de.properties	Sat Aug 29 11:49:53 2020 +0200
@@ -49,7 +49,7 @@
 issues.active=In Arbeit
 issues.done=Erledigt
 issues.reported=Er\u00f6ffnete Vorg\u00e4nge
-issues.resolved=Vorg\u00e4nge
+issues.resolved=Enthaltene Vorg\u00e4nge
 issues.total=Summe
 
 version.project=Projekt

--- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat Aug 29 11:49:53 2020 +0200
@@ -63,11 +63,11 @@
         <%@include file="../jspf/issue-list.jsp"%>
     </c:if>
 
-    <h3><fmt:message key="issues.reported"/> </h3>
-    <c:set var="summary" value="${versionInfo.reportedTotal}"/>
-    <%@include file="../jspf/issue-summary.jsp"%>
     <c:set var="issues" value="${versionInfo.reported}"/>
     <c:if test="${not empty issues}">
+        <h3><fmt:message key="issues.reported"/> </h3>
+        <c:set var="summary" value="${versionInfo.reportedTotal}"/>
+        <%@include file="../jspf/issue-summary.jsp"%>
         <%@include file="../jspf/issue-list.jsp"%>
     </c:if>
 </c:forEach>
\ No newline at end of file

--- a/src/main/webapp/WEB-INF/jspf/issue-list.jsp	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/webapp/WEB-INF/jspf/issue-list.jsp	Sat Aug 29 11:49:53 2020 +0200
@@ -32,13 +32,13 @@
                     <fmt:message key="placeholder.null-assignee" />
                 </c:if>
             </td>
-            <td class="hcenter">
-                <div class="issue-tag ${issue.category}">
+            <td>
+                <div class="fullwidth issue-tag ${issue.category}">
                     <fmt:message key="issue.category.${issue.category}" />
                 </div>
             </td>
-            <td class="hcenter">
-                <div class="issue-tag phase-${issue.status.phase}">
+            <td>
+                <div class="fullwidth issue-tag phase-${issue.status.phase}">
                     <fmt:message key="issue.status.${issue.status}" />
                 </div>
             </td>

--- a/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Sat Aug 29 11:49:53 2020 +0200
@@ -2,7 +2,12 @@
 summary: IssueSummary
 --%>
 
-<div class="issue-summary">
+<div class="issue-progress-bar">
+    <div class="open" style="width: ${summary.openPercent}%"></div>
+    <div class="active" style="width: ${summary.activePercent}%"></div>
+    <div class="done" style="width: ${summary.donePercent}%"></div>
+</div>
+<div class="table issue-summary">
     <div class="row">
         <div class="caption"><fmt:message key="issues.open"/>:</div>
         <div><c:out value="${summary.open}"/></div>
@@ -12,9 +17,3 @@
         <div><c:out value="${summary.done}"/></div>
     </div>
 </div>
-
-<div class="issue-progress-bar" style="width: 100ex; height: 1.25em;">
-    <div class="open" style="width: ${summary.openPercent}%"></div>
-    <div class="active" style="width: ${summary.activePercent}%"></div>
-    <div class="done" style="width: ${summary.donePercent}%"></div>
-</div>
\ No newline at end of file

--- a/src/main/webapp/WEB-INF/jspf/project-header.jsp	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/webapp/WEB-INF/jspf/project-header.jsp	Sat Aug 29 11:49:53 2020 +0200
@@ -1,7 +1,7 @@
 <%--
 project: Project
 --%>
-<div class="project-attributes">
+<div class="table project-attributes">
     <div class="row">
         <div class="caption"><fmt:message key="name"/>:</div>
         <div><c:out value="${project.name}"/></div>

--- a/src/main/webapp/lightpit.css	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/webapp/lightpit.css	Sat Aug 29 11:49:53 2020 +0200
@@ -234,10 +234,36 @@
     margin-top: .5em;
 }
 
-.info-box {
+.info-box, .error-box, .warn-box {
     margin: 2em;
     border-style: dashed;
     border-width: 1pt;
     border-color: deepskyblue;
     padding: 1em;
-}
\ No newline at end of file
+}
+
+.error-box {
+    border-color: red;
+}
+
+.warn-box {
+    border-color: gold;
+}
+
+.table {
+    display: table;
+    border-spacing: .5em;
+    margin: -.5em;
+}
+
+.row {
+    display: table-row;
+}
+
+.caption {
+    font-weight: bold;
+}
+
+.row > div {
+    display: table-cell;
+}

--- a/src/main/webapp/projects.css	Sat Aug 29 11:06:31 2020 +0200
+++ b/src/main/webapp/projects.css	Sat Aug 29 11:49:53 2020 +0200
@@ -27,27 +27,11 @@
  *
  */
 
-.project-attributes, .issue-summary {
-    display: table;
-}
-
 .project-attributes {
     margin-bottom: 2em;
 }
 
-.row {
-    display: table-row;
-}
-
-.caption {
-    font-weight: bold;
-}
-
-.row > div {
-    display: table-cell;
-}
-
-.row > div + div {
+.project-attributes .row > div + div {
     padding-left: 2em;
 }
 
@@ -56,10 +40,13 @@
 }
 
 .issue-progress-bar {
+    box-sizing: border-box;
+    width: 100%;
+    height: 0.5em;
     display: flex;
     position: relative;
-    border-style: inset;
-    border-width: 2pt;
+    border-style: solid;
+    border-width: 1pt;
     border-color: #6060cc;
 }
 
@@ -79,15 +66,16 @@
 }
 
 .issue-tag {
-    width: auto;
     padding: .1em 2ex .1em 2ex;
     display: inline-block;
+    box-sizing: border-box;
     border-style: outset;
     border-width: 2pt;
     border-color: silver;
     border-radius: 6pt;
     background: lightgray;
     text-transform: uppercase;
+    text-align: center;
     font-weight: bolder;
     font-size: smaller;
     color: whitesmoke;