Mercurial > hg > LightPIT / changeset

--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Fri Oct 09 11:41:35 2020 +0200
@@ -130,7 +130,7 @@
                 <c:set var="fieldname" value="affected"/>
                 <c:set var="selectionList" value="${viewmodel.versionsRecent}"/>
                 <c:set var="data" value="${issue.affectedVersions}" />
-                <%@include file="../jspf/version-list.jsp"%>
+                <%@include file="../jspf/version-list.jspf"%>
             </td>
         </tr>
         <tr>
@@ -139,7 +139,7 @@
                 <c:set var="fieldname" value="resolved"/>
                 <c:set var="selectionList" value="${viewmodel.versionsUpcoming}"/>
                 <c:set var="data" value="${issue.resolvedVersions}" />
-                <%@include file="../jspf/version-list.jsp"%>
+                <%@include file="../jspf/version-list.jspf"%>
             </td>
         </tr>
         </c:if>

--- a/src/main/webapp/WEB-INF/jsp/issues.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issues.jsp	Fri Oct 09 11:41:35 2020 +0200
@@ -31,7 +31,7 @@
 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.IssuesView" scope="request"/>
 <c:set var="project" scope="page" value="${viewmodel.project}"/>
 <c:set var="version" scope="page" value="${viewmodel.version}"/>
-<%@include file="../jspf/project-header.jsp"%>
+<%@include file="../jspf/project-header.jspf"%>
 
 <c:if test="${not empty version}">
     <h2>
@@ -50,4 +50,4 @@
 </div>
 
 <c:set var="issues" value="${viewmodel.issues}"/>
-<%@include file="../jspf/issue-list.jsp"%>
\ No newline at end of file
+<%@include file="../jspf/issue-list.jspf"%>
\ No newline at end of file

--- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Fri Oct 09 11:41:35 2020 +0200
@@ -31,7 +31,7 @@
 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetailsView" scope="request" />
 
 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
-<%@include file="../jspf/project-header.jsp"%>
+<%@include file="../jspf/project-header.jspf"%>
 
 <div id="tool-area">
     <c:if test="${not empty viewmodel.versionFilter}">
@@ -44,7 +44,7 @@
 <h2><fmt:message key="progress" /></h2>
 
 <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
-<%@include file="../jspf/issue-summary.jsp"%>
+<%@include file="../jspf/issue-summary.jspf"%>
 
 <c:if test="${not empty viewmodel.versionFilter}">
     <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/>
@@ -54,18 +54,18 @@
 
     <h3><fmt:message key="issues.resolved"/> </h3>
     <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
-    <%@include file="../jspf/issue-summary.jsp"%>
+    <%@include file="../jspf/issue-summary.jspf"%>
     <c:set var="issues" value="${versionInfo.resolved}"/>
     <c:if test="${not empty issues}">
-        <%@include file="../jspf/issue-list.jsp"%>
+        <%@include file="../jspf/issue-list.jspf"%>
     </c:if>
 
     <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"%>
+        <%@include file="../jspf/issue-summary.jspf"%>
+        <%@include file="../jspf/issue-list.jspf"%>
     </c:if>
 </c:if>
 <c:if test="${empty viewmodel.versionFilter}">
@@ -74,8 +74,8 @@
     </h2>
     <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/>
     <c:set var="issues" value="${viewmodel.projectDetails.issues}"/>
-    <%@include file="../jspf/issue-summary.jsp"%>
+    <%@include file="../jspf/issue-summary.jspf"%>
     <c:if test="${not empty issues}">
-        <%@include file="../jspf/issue-list.jsp"%>
+        <%@include file="../jspf/issue-list.jspf"%>
     </c:if>
 </c:if>

--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Fri Oct 09 11:41:35 2020 +0200
@@ -80,7 +80,7 @@
 <body>
 <div id="mainMenu">
     <c:forEach var="menu" items="${mainMenu}">
-        <%@include file="../jspf/menu-entry.jsp" %>
+        <%@include file="../jspf/menu-entry.jspf" %>
     </c:forEach>
 </div>
 <div>

--- a/src/main/webapp/WEB-INF/jsp/versions.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/versions.jsp	Fri Oct 09 11:41:35 2020 +0200
@@ -31,7 +31,7 @@
 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionsView" scope="request" />
 
 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
-<%@include file="../jspf/project-header.jsp"%>
+<%@include file="../jspf/project-header.jspf"%>
 
 <div id="tool-area">
     <a href="./projects/versions/edit?vid=-1" class="button"><fmt:message key="button.version.create"/></a>
@@ -41,7 +41,7 @@
 <h2><fmt:message key="progress" /></h2>
 
 <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
-<%@include file="../jspf/issue-summary.jsp"%>
+<%@include file="../jspf/issue-summary.jspf"%>
 
 <table id="version-list" class="datatable medskip fullwidth">
     <colgroup>

--- a/src/main/webapp/WEB-INF/jspf/issue-list.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<%--
-issues: List<Issue>
---%>
-
-<table class="fullwidth datatable medskip">
-    <colgroup>
-        <col width="auto" />
-        <col width="10%" />
-    </colgroup>
-    <thead>
-        <tr>
-            <th><fmt:message key="issue.subject"/></th>
-            <th><fmt:message key="issue.eta"/></th>
-        </tr>
-    </thead>
-    <tbody>
-    <c:forEach var="issue" items="${issues}">
-        <tr>
-            <td>
-                <span class="phase-${issue.status.phase}">
-                    <a href="./projects/issues/edit?issue=${issue.id}">
-                        #${issue.id}&nbsp;-&nbsp;<c:out value="${issue.subject}" />
-                    </a>
-                </span>
-                <div style="display: inline-block; width: .25em"></div>
-                <div class="issue-tag ${issue.category}">
-                    <fmt:message key="issue.category.${issue.category}" />
-                </div>
-                <div class="issue-tag phase-${issue.status.phase}">
-                    <fmt:message key="issue.status.${issue.status}" />
-                </div>
-            </td>
-            <td>
-                <fmt:formatDate value="${issue.eta}" />
-            </td>
-        </tr>
-    </c:forEach>
-    </tbody>
-</table>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/webapp/WEB-INF/jspf/issue-list.jspf	Fri Oct 09 11:41:35 2020 +0200
@@ -0,0 +1,39 @@
+<%--
+issues: List<Issue>
+--%>
+
+<table class="fullwidth datatable medskip">
+    <colgroup>
+        <col width="auto" />
+        <col width="10%" />
+    </colgroup>
+    <thead>
+        <tr>
+            <th><fmt:message key="issue.subject"/></th>
+            <th><fmt:message key="issue.eta"/></th>
+        </tr>
+    </thead>
+    <tbody>
+    <c:forEach var="issue" items="${issues}">
+        <tr>
+            <td>
+                <span class="phase-${issue.status.phase}">
+                    <a href="./projects/issues/edit?issue=${issue.id}">
+                        #${issue.id}&nbsp;-&nbsp;<c:out value="${issue.subject}" />
+                    </a>
+                </span>
+                <div style="display: inline-block; width: .25em"></div>
+                <div class="issue-tag ${issue.category}">
+                    <fmt:message key="issue.category.${issue.category}" />
+                </div>
+                <div class="issue-tag phase-${issue.status.phase}">
+                    <fmt:message key="issue.status.${issue.status}" />
+                </div>
+            </td>
+            <td>
+                <fmt:formatDate value="${issue.eta}" />
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>

--- a/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<%--
-summary: IssueSummary
---%>
-
-<%@include file="issue-progress.jspf"%>
-<div class="table issue-summary">
-    <div class="row">
-        <div class="caption"><fmt:message key="issues.open"/>:</div>
-        <div><c:out value="${summary.open}"/></div>
-        <div class="caption"><fmt:message key="issues.active"/>:</div>
-        <div><c:out value="${summary.active}"/></div>
-        <div class="caption"><fmt:message key="issues.done"/>:</div>
-        <div><c:out value="${summary.done}"/></div>
-    </div>
-</div>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/webapp/WEB-INF/jspf/issue-summary.jspf	Fri Oct 09 11:41:35 2020 +0200
@@ -0,0 +1,15 @@
+<%--
+summary: IssueSummary
+--%>
+
+<%@include file="issue-progress.jspf"%>
+<div class="table issue-summary">
+    <div class="row">
+        <div class="caption"><fmt:message key="issues.open"/>:</div>
+        <div><c:out value="${summary.open}"/></div>
+        <div class="caption"><fmt:message key="issues.active"/>:</div>
+        <div><c:out value="${summary.active}"/></div>
+        <div class="caption"><fmt:message key="issues.done"/>:</div>
+        <div><c:out value="${summary.done}"/></div>
+    </div>
+</div>
\ No newline at end of file

--- a/src/main/webapp/WEB-INF/jspf/menu-entry.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<div class="menuEntry"
-     <c:if test="${menu.active}">data-active</c:if> >
-    <a href="${menu.pathName}">
-        <c:if test="${empty menu.resourceKey}">
-            <c:out value="${menu.text}"/>
-        </c:if>
-        <c:if test="${not empty menu.resourceKey}">
-            <fmt:bundle basename="${menu.resourceKey.bundle}">
-                <fmt:message key="${menu.resourceKey.key}"/>
-            </fmt:bundle>
-        </c:if>
-    </a>
-</div>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/webapp/WEB-INF/jspf/menu-entry.jspf	Fri Oct 09 11:41:35 2020 +0200
@@ -0,0 +1,13 @@
+<div class="menuEntry"
+     <c:if test="${menu.active}">data-active</c:if> >
+    <a href="${menu.pathName}">
+        <c:if test="${empty menu.resourceKey}">
+            <c:out value="${menu.text}"/>
+        </c:if>
+        <c:if test="${not empty menu.resourceKey}">
+            <fmt:bundle basename="${menu.resourceKey.bundle}">
+                <fmt:message key="${menu.resourceKey.key}"/>
+            </fmt:bundle>
+        </c:if>
+    </a>
+</div>
\ No newline at end of file

--- a/src/main/webapp/WEB-INF/jspf/project-header.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<%--
-project: Project
---%>
-<div class="table project-attributes">
-    <div class="row">
-        <div class="caption"><fmt:message key="name"/>:</div>
-        <div><c:out value="${project.name}"/></div>
-        <div class="caption"><fmt:message key="description"/>:</div>
-        <div><c:out value="${project.description}"/></div>
-    </div>
-    <div class="row">
-        <div class="caption"><fmt:message key="owner"/>:</div>
-        <div>
-            <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if>
-        </div>
-        <div class="caption"><fmt:message key="repoUrl"/>:</div>
-        <div>
-            <c:if test="${not empty project.repoUrl}">
-                <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out
-                        value="${project.repoUrl}"/></a>
-            </c:if>
-        </div>
-    </div>
-</div>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/webapp/WEB-INF/jspf/project-header.jspf	Fri Oct 09 11:41:35 2020 +0200
@@ -0,0 +1,24 @@
+<%--
+project: Project
+--%>
+<div class="table project-attributes">
+    <div class="row">
+        <div class="caption"><fmt:message key="name"/>:</div>
+        <div><c:out value="${project.name}"/></div>
+        <div class="caption"><fmt:message key="description"/>:</div>
+        <div><c:out value="${project.description}"/></div>
+    </div>
+    <div class="row">
+        <div class="caption"><fmt:message key="owner"/>:</div>
+        <div>
+            <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if>
+        </div>
+        <div class="caption"><fmt:message key="repoUrl"/>:</div>
+        <div>
+            <c:if test="${not empty project.repoUrl}">
+                <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out
+                        value="${project.repoUrl}"/></a>
+            </c:if>
+        </div>
+    </div>
+</div>

--- a/src/main/webapp/WEB-INF/jspf/version-list.jsp	Fri Oct 09 11:41:01 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
-<select name="${fieldname}" multiple>
-    <c:forEach var="vselitem" items="${selectionList}">
-        <option value="${vselitem.id}"
-                <c:forEach var="v" items="${data}">
-                    <c:if test="${v eq vselitem}">selected</c:if>
-                </c:forEach>
-        >
-            <c:out value="${vselitem.name}" />
-        </option>
-    </c:forEach>
-</select>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/webapp/WEB-INF/jspf/version-list.jspf	Fri Oct 09 11:41:35 2020 +0200
@@ -0,0 +1,13 @@
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+<select name="${fieldname}" multiple>
+    <c:forEach var="vselitem" items="${selectionList}">
+        <option value="${vselitem.id}"
+                <c:forEach var="v" items="${data}">
+                    <c:if test="${v eq vselitem}">selected</c:if>
+                </c:forEach>
+        >
+            <c:out value="${vselitem.name}" />
+        </option>
+    </c:forEach>
+</select>