Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/resources/localization/projects.properties	Sat Aug 29 11:06:31 2020 +0200
     1.2 +++ b/src/main/resources/localization/projects.properties	Sat Aug 29 11:49:53 2020 +0200
     1.3 @@ -50,7 +50,7 @@
     1.4  issues.done=Done
     1.5  issues.total=Total
     1.6  issues.reported=Reported Issues
     1.7 -issues.resolved=Issues
     1.8 +issues.resolved=Assigned Issues
     1.9  
    1.10  version.project=Project
    1.11  version.name=Version

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

     3.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat Aug 29 11:06:31 2020 +0200
     3.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat Aug 29 11:49:53 2020 +0200
     3.3 @@ -63,11 +63,11 @@
     3.4          <%@include file="../jspf/issue-list.jsp"%>
     3.5      </c:if>
     3.6  
     3.7 -    <h3><fmt:message key="issues.reported"/> </h3>
     3.8 -    <c:set var="summary" value="${versionInfo.reportedTotal}"/>
     3.9 -    <%@include file="../jspf/issue-summary.jsp"%>
    3.10      <c:set var="issues" value="${versionInfo.reported}"/>
    3.11      <c:if test="${not empty issues}">
    3.12 +        <h3><fmt:message key="issues.reported"/> </h3>
    3.13 +        <c:set var="summary" value="${versionInfo.reportedTotal}"/>
    3.14 +        <%@include file="../jspf/issue-summary.jsp"%>
    3.15          <%@include file="../jspf/issue-list.jsp"%>
    3.16      </c:if>
    3.17  </c:forEach>
    3.18 \ No newline at end of file

     4.1 --- a/src/main/webapp/WEB-INF/jspf/issue-list.jsp	Sat Aug 29 11:06:31 2020 +0200
     4.2 +++ b/src/main/webapp/WEB-INF/jspf/issue-list.jsp	Sat Aug 29 11:49:53 2020 +0200
     4.3 @@ -32,13 +32,13 @@
     4.4                      <fmt:message key="placeholder.null-assignee" />
     4.5                  </c:if>
     4.6              </td>
     4.7 -            <td class="hcenter">
     4.8 -                <div class="issue-tag ${issue.category}">
     4.9 +            <td>
    4.10 +                <div class="fullwidth issue-tag ${issue.category}">
    4.11                      <fmt:message key="issue.category.${issue.category}" />
    4.12                  </div>
    4.13              </td>
    4.14 -            <td class="hcenter">
    4.15 -                <div class="issue-tag phase-${issue.status.phase}">
    4.16 +            <td>
    4.17 +                <div class="fullwidth issue-tag phase-${issue.status.phase}">
    4.18                      <fmt:message key="issue.status.${issue.status}" />
    4.19                  </div>
    4.20              </td>

     5.1 --- a/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Sat Aug 29 11:06:31 2020 +0200
     5.2 +++ b/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Sat Aug 29 11:49:53 2020 +0200
     5.3 @@ -2,7 +2,12 @@
     5.4  summary: IssueSummary
     5.5  --%>
     5.6  
     5.7 -<div class="issue-summary">
     5.8 +<div class="issue-progress-bar">
     5.9 +    <div class="open" style="width: ${summary.openPercent}%"></div>
    5.10 +    <div class="active" style="width: ${summary.activePercent}%"></div>
    5.11 +    <div class="done" style="width: ${summary.donePercent}%"></div>
    5.12 +</div>
    5.13 +<div class="table issue-summary">
    5.14      <div class="row">
    5.15          <div class="caption"><fmt:message key="issues.open"/>:</div>
    5.16          <div><c:out value="${summary.open}"/></div>
    5.17 @@ -12,9 +17,3 @@
    5.18          <div><c:out value="${summary.done}"/></div>
    5.19      </div>
    5.20  </div>
    5.21 -
    5.22 -<div class="issue-progress-bar" style="width: 100ex; height: 1.25em;">
    5.23 -    <div class="open" style="width: ${summary.openPercent}%"></div>
    5.24 -    <div class="active" style="width: ${summary.activePercent}%"></div>
    5.25 -    <div class="done" style="width: ${summary.donePercent}%"></div>
    5.26 -</div>
    5.27 \ No newline at end of file

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

     7.1 --- a/src/main/webapp/lightpit.css	Sat Aug 29 11:06:31 2020 +0200
     7.2 +++ b/src/main/webapp/lightpit.css	Sat Aug 29 11:49:53 2020 +0200
     7.3 @@ -234,10 +234,36 @@
     7.4      margin-top: .5em;
     7.5  }
     7.6  
     7.7 -.info-box {
     7.8 +.info-box, .error-box, .warn-box {
     7.9      margin: 2em;
    7.10      border-style: dashed;
    7.11      border-width: 1pt;
    7.12      border-color: deepskyblue;
    7.13      padding: 1em;
    7.14 -}
    7.15 \ No newline at end of file
    7.16 +}
    7.17 +
    7.18 +.error-box {
    7.19 +    border-color: red;
    7.20 +}
    7.21 +
    7.22 +.warn-box {
    7.23 +    border-color: gold;
    7.24 +}
    7.25 +
    7.26 +.table {
    7.27 +    display: table;
    7.28 +    border-spacing: .5em;
    7.29 +    margin: -.5em;
    7.30 +}
    7.31 +
    7.32 +.row {
    7.33 +    display: table-row;
    7.34 +}
    7.35 +
    7.36 +.caption {
    7.37 +    font-weight: bold;
    7.38 +}
    7.39 +
    7.40 +.row > div {
    7.41 +    display: table-cell;
    7.42 +}

     8.1 --- a/src/main/webapp/projects.css	Sat Aug 29 11:06:31 2020 +0200
     8.2 +++ b/src/main/webapp/projects.css	Sat Aug 29 11:49:53 2020 +0200
     8.3 @@ -27,27 +27,11 @@
     8.4   *
     8.5   */
     8.6  
     8.7 -.project-attributes, .issue-summary {
     8.8 -    display: table;
     8.9 -}
    8.10 -
    8.11  .project-attributes {
    8.12      margin-bottom: 2em;
    8.13  }
    8.14  
    8.15 -.row {
    8.16 -    display: table-row;
    8.17 -}
    8.18 -
    8.19 -.caption {
    8.20 -    font-weight: bold;
    8.21 -}
    8.22 -
    8.23 -.row > div {
    8.24 -    display: table-cell;
    8.25 -}
    8.26 -
    8.27 -.row > div + div {
    8.28 +.project-attributes .row > div + div {
    8.29      padding-left: 2em;
    8.30  }
    8.31  
    8.32 @@ -56,10 +40,13 @@
    8.33  }
    8.34  
    8.35  .issue-progress-bar {
    8.36 +    box-sizing: border-box;
    8.37 +    width: 100%;
    8.38 +    height: 0.5em;
    8.39      display: flex;
    8.40      position: relative;
    8.41 -    border-style: inset;
    8.42 -    border-width: 2pt;
    8.43 +    border-style: solid;
    8.44 +    border-width: 1pt;
    8.45      border-color: #6060cc;
    8.46  }
    8.47  
    8.48 @@ -79,15 +66,16 @@
    8.49  }
    8.50  
    8.51  .issue-tag {
    8.52 -    width: auto;
    8.53      padding: .1em 2ex .1em 2ex;
    8.54      display: inline-block;
    8.55 +    box-sizing: border-box;
    8.56      border-style: outset;
    8.57      border-width: 2pt;
    8.58      border-color: silver;
    8.59      border-radius: 6pt;
    8.60      background: lightgray;
    8.61      text-transform: uppercase;
    8.62 +    text-align: center;
    8.63      font-weight: bolder;
    8.64      font-size: smaller;
    8.65      color: whitesmoke;