changeset
proper file extensions for JSP fragments
Fri, 09 Oct 2020 11:41:35 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Fri, 09 Oct 2020 11:41:35 +0200
- changeset 115
- c27638a50c92
- parent 114
- dbd5c60c29e6
- child 116
- d24354f21df5
proper file extensions for JSP fragments
1.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 09 11:41:01 2020 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 09 11:41:35 2020 +0200 1.3 @@ -130,7 +130,7 @@ 1.4 <c:set var="fieldname" value="affected"/> 1.5 <c:set var="selectionList" value="${viewmodel.versionsRecent}"/> 1.6 <c:set var="data" value="${issue.affectedVersions}" /> 1.7 - <%@include file="../jspf/version-list.jsp"%> 1.8 + <%@include file="../jspf/version-list.jspf"%> 1.9 </td> 1.10 </tr> 1.11 <tr> 1.12 @@ -139,7 +139,7 @@ 1.13 <c:set var="fieldname" value="resolved"/> 1.14 <c:set var="selectionList" value="${viewmodel.versionsUpcoming}"/> 1.15 <c:set var="data" value="${issue.resolvedVersions}" /> 1.16 - <%@include file="../jspf/version-list.jsp"%> 1.17 + <%@include file="../jspf/version-list.jspf"%> 1.18 </td> 1.19 </tr> 1.20 </c:if>
2.1 --- a/src/main/webapp/WEB-INF/jsp/issues.jsp Fri Oct 09 11:41:01 2020 +0200 2.2 +++ b/src/main/webapp/WEB-INF/jsp/issues.jsp Fri Oct 09 11:41:35 2020 +0200 2.3 @@ -31,7 +31,7 @@ 2.4 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.IssuesView" scope="request"/> 2.5 <c:set var="project" scope="page" value="${viewmodel.project}"/> 2.6 <c:set var="version" scope="page" value="${viewmodel.version}"/> 2.7 -<%@include file="../jspf/project-header.jsp"%> 2.8 +<%@include file="../jspf/project-header.jspf"%> 2.9 2.10 <c:if test="${not empty version}"> 2.11 <h2> 2.12 @@ -50,4 +50,4 @@ 2.13 </div> 2.14 2.15 <c:set var="issues" value="${viewmodel.issues}"/> 2.16 -<%@include file="../jspf/issue-list.jsp"%> 2.17 \ No newline at end of file 2.18 +<%@include file="../jspf/issue-list.jspf"%> 2.19 \ No newline at end of file
3.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp Fri Oct 09 11:41:01 2020 +0200 3.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp Fri Oct 09 11:41:35 2020 +0200 3.3 @@ -31,7 +31,7 @@ 3.4 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetailsView" scope="request" /> 3.5 3.6 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/> 3.7 -<%@include file="../jspf/project-header.jsp"%> 3.8 +<%@include file="../jspf/project-header.jspf"%> 3.9 3.10 <div id="tool-area"> 3.11 <c:if test="${not empty viewmodel.versionFilter}"> 3.12 @@ -44,7 +44,7 @@ 3.13 <h2><fmt:message key="progress" /></h2> 3.14 3.15 <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" /> 3.16 -<%@include file="../jspf/issue-summary.jsp"%> 3.17 +<%@include file="../jspf/issue-summary.jspf"%> 3.18 3.19 <c:if test="${not empty viewmodel.versionFilter}"> 3.20 <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/> 3.21 @@ -54,18 +54,18 @@ 3.22 3.23 <h3><fmt:message key="issues.resolved"/> </h3> 3.24 <c:set var="summary" value="${versionInfo.resolvedTotal}"/> 3.25 - <%@include file="../jspf/issue-summary.jsp"%> 3.26 + <%@include file="../jspf/issue-summary.jspf"%> 3.27 <c:set var="issues" value="${versionInfo.resolved}"/> 3.28 <c:if test="${not empty issues}"> 3.29 - <%@include file="../jspf/issue-list.jsp"%> 3.30 + <%@include file="../jspf/issue-list.jspf"%> 3.31 </c:if> 3.32 3.33 <c:set var="issues" value="${versionInfo.reported}"/> 3.34 <c:if test="${not empty issues}"> 3.35 <h3><fmt:message key="issues.reported"/> </h3> 3.36 <c:set var="summary" value="${versionInfo.reportedTotal}"/> 3.37 - <%@include file="../jspf/issue-summary.jsp"%> 3.38 - <%@include file="../jspf/issue-list.jsp"%> 3.39 + <%@include file="../jspf/issue-summary.jspf"%> 3.40 + <%@include file="../jspf/issue-list.jspf"%> 3.41 </c:if> 3.42 </c:if> 3.43 <c:if test="${empty viewmodel.versionFilter}"> 3.44 @@ -74,8 +74,8 @@ 3.45 </h2> 3.46 <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/> 3.47 <c:set var="issues" value="${viewmodel.projectDetails.issues}"/> 3.48 - <%@include file="../jspf/issue-summary.jsp"%> 3.49 + <%@include file="../jspf/issue-summary.jspf"%> 3.50 <c:if test="${not empty issues}"> 3.51 - <%@include file="../jspf/issue-list.jsp"%> 3.52 + <%@include file="../jspf/issue-list.jspf"%> 3.53 </c:if> 3.54 </c:if>
4.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Fri Oct 09 11:41:01 2020 +0200 4.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Fri Oct 09 11:41:35 2020 +0200 4.3 @@ -80,7 +80,7 @@ 4.4 <body> 4.5 <div id="mainMenu"> 4.6 <c:forEach var="menu" items="${mainMenu}"> 4.7 - <%@include file="../jspf/menu-entry.jsp" %> 4.8 + <%@include file="../jspf/menu-entry.jspf" %> 4.9 </c:forEach> 4.10 </div> 4.11 <div>
5.1 --- a/src/main/webapp/WEB-INF/jsp/versions.jsp Fri Oct 09 11:41:01 2020 +0200 5.2 +++ b/src/main/webapp/WEB-INF/jsp/versions.jsp Fri Oct 09 11:41:35 2020 +0200 5.3 @@ -31,7 +31,7 @@ 5.4 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionsView" scope="request" /> 5.5 5.6 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/> 5.7 -<%@include file="../jspf/project-header.jsp"%> 5.8 +<%@include file="../jspf/project-header.jspf"%> 5.9 5.10 <div id="tool-area"> 5.11 <a href="./projects/versions/edit?vid=-1" class="button"><fmt:message key="button.version.create"/></a> 5.12 @@ -41,7 +41,7 @@ 5.13 <h2><fmt:message key="progress" /></h2> 5.14 5.15 <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" /> 5.16 -<%@include file="../jspf/issue-summary.jsp"%> 5.17 +<%@include file="../jspf/issue-summary.jspf"%> 5.18 5.19 <table id="version-list" class="datatable medskip fullwidth"> 5.20 <colgroup>
6.1 --- a/src/main/webapp/WEB-INF/jspf/issue-list.jsp Fri Oct 09 11:41:01 2020 +0200 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,39 +0,0 @@ 6.4 -<%-- 6.5 -issues: List<Issue> 6.6 ---%> 6.7 - 6.8 -<table class="fullwidth datatable medskip"> 6.9 - <colgroup> 6.10 - <col width="auto" /> 6.11 - <col width="10%" /> 6.12 - </colgroup> 6.13 - <thead> 6.14 - <tr> 6.15 - <th><fmt:message key="issue.subject"/></th> 6.16 - <th><fmt:message key="issue.eta"/></th> 6.17 - </tr> 6.18 - </thead> 6.19 - <tbody> 6.20 - <c:forEach var="issue" items="${issues}"> 6.21 - <tr> 6.22 - <td> 6.23 - <span class="phase-${issue.status.phase}"> 6.24 - <a href="./projects/issues/edit?issue=${issue.id}"> 6.25 - #${issue.id} - <c:out value="${issue.subject}" /> 6.26 - </a> 6.27 - </span> 6.28 - <div style="display: inline-block; width: .25em"></div> 6.29 - <div class="issue-tag ${issue.category}"> 6.30 - <fmt:message key="issue.category.${issue.category}" /> 6.31 - </div> 6.32 - <div class="issue-tag phase-${issue.status.phase}"> 6.33 - <fmt:message key="issue.status.${issue.status}" /> 6.34 - </div> 6.35 - </td> 6.36 - <td> 6.37 - <fmt:formatDate value="${issue.eta}" /> 6.38 - </td> 6.39 - </tr> 6.40 - </c:forEach> 6.41 - </tbody> 6.42 -</table>
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/src/main/webapp/WEB-INF/jspf/issue-list.jspf Fri Oct 09 11:41:35 2020 +0200 7.3 @@ -0,0 +1,39 @@ 7.4 +<%-- 7.5 +issues: List<Issue> 7.6 +--%> 7.7 + 7.8 +<table class="fullwidth datatable medskip"> 7.9 + <colgroup> 7.10 + <col width="auto" /> 7.11 + <col width="10%" /> 7.12 + </colgroup> 7.13 + <thead> 7.14 + <tr> 7.15 + <th><fmt:message key="issue.subject"/></th> 7.16 + <th><fmt:message key="issue.eta"/></th> 7.17 + </tr> 7.18 + </thead> 7.19 + <tbody> 7.20 + <c:forEach var="issue" items="${issues}"> 7.21 + <tr> 7.22 + <td> 7.23 + <span class="phase-${issue.status.phase}"> 7.24 + <a href="./projects/issues/edit?issue=${issue.id}"> 7.25 + #${issue.id} - <c:out value="${issue.subject}" /> 7.26 + </a> 7.27 + </span> 7.28 + <div style="display: inline-block; width: .25em"></div> 7.29 + <div class="issue-tag ${issue.category}"> 7.30 + <fmt:message key="issue.category.${issue.category}" /> 7.31 + </div> 7.32 + <div class="issue-tag phase-${issue.status.phase}"> 7.33 + <fmt:message key="issue.status.${issue.status}" /> 7.34 + </div> 7.35 + </td> 7.36 + <td> 7.37 + <fmt:formatDate value="${issue.eta}" /> 7.38 + </td> 7.39 + </tr> 7.40 + </c:forEach> 7.41 + </tbody> 7.42 +</table>
8.1 --- a/src/main/webapp/WEB-INF/jspf/issue-summary.jsp Fri Oct 09 11:41:01 2020 +0200 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,15 +0,0 @@ 8.4 -<%-- 8.5 -summary: IssueSummary 8.6 ---%> 8.7 - 8.8 -<%@include file="issue-progress.jspf"%> 8.9 -<div class="table issue-summary"> 8.10 - <div class="row"> 8.11 - <div class="caption"><fmt:message key="issues.open"/>:</div> 8.12 - <div><c:out value="${summary.open}"/></div> 8.13 - <div class="caption"><fmt:message key="issues.active"/>:</div> 8.14 - <div><c:out value="${summary.active}"/></div> 8.15 - <div class="caption"><fmt:message key="issues.done"/>:</div> 8.16 - <div><c:out value="${summary.done}"/></div> 8.17 - </div> 8.18 -</div> 8.19 \ No newline at end of file
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/src/main/webapp/WEB-INF/jspf/issue-summary.jspf Fri Oct 09 11:41:35 2020 +0200 9.3 @@ -0,0 +1,15 @@ 9.4 +<%-- 9.5 +summary: IssueSummary 9.6 +--%> 9.7 + 9.8 +<%@include file="issue-progress.jspf"%> 9.9 +<div class="table issue-summary"> 9.10 + <div class="row"> 9.11 + <div class="caption"><fmt:message key="issues.open"/>:</div> 9.12 + <div><c:out value="${summary.open}"/></div> 9.13 + <div class="caption"><fmt:message key="issues.active"/>:</div> 9.14 + <div><c:out value="${summary.active}"/></div> 9.15 + <div class="caption"><fmt:message key="issues.done"/>:</div> 9.16 + <div><c:out value="${summary.done}"/></div> 9.17 + </div> 9.18 +</div> 9.19 \ No newline at end of file
10.1 --- a/src/main/webapp/WEB-INF/jspf/menu-entry.jsp Fri Oct 09 11:41:01 2020 +0200 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,13 +0,0 @@ 10.4 -<div class="menuEntry" 10.5 - <c:if test="${menu.active}">data-active</c:if> > 10.6 - <a href="${menu.pathName}"> 10.7 - <c:if test="${empty menu.resourceKey}"> 10.8 - <c:out value="${menu.text}"/> 10.9 - </c:if> 10.10 - <c:if test="${not empty menu.resourceKey}"> 10.11 - <fmt:bundle basename="${menu.resourceKey.bundle}"> 10.12 - <fmt:message key="${menu.resourceKey.key}"/> 10.13 - </fmt:bundle> 10.14 - </c:if> 10.15 - </a> 10.16 -</div> 10.17 \ No newline at end of file
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/src/main/webapp/WEB-INF/jspf/menu-entry.jspf Fri Oct 09 11:41:35 2020 +0200 11.3 @@ -0,0 +1,13 @@ 11.4 +<div class="menuEntry" 11.5 + <c:if test="${menu.active}">data-active</c:if> > 11.6 + <a href="${menu.pathName}"> 11.7 + <c:if test="${empty menu.resourceKey}"> 11.8 + <c:out value="${menu.text}"/> 11.9 + </c:if> 11.10 + <c:if test="${not empty menu.resourceKey}"> 11.11 + <fmt:bundle basename="${menu.resourceKey.bundle}"> 11.12 + <fmt:message key="${menu.resourceKey.key}"/> 11.13 + </fmt:bundle> 11.14 + </c:if> 11.15 + </a> 11.16 +</div> 11.17 \ No newline at end of file
12.1 --- a/src/main/webapp/WEB-INF/jspf/project-header.jsp Fri Oct 09 11:41:01 2020 +0200 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,24 +0,0 @@ 12.4 -<%-- 12.5 -project: Project 12.6 ---%> 12.7 -<div class="table project-attributes"> 12.8 - <div class="row"> 12.9 - <div class="caption"><fmt:message key="name"/>:</div> 12.10 - <div><c:out value="${project.name}"/></div> 12.11 - <div class="caption"><fmt:message key="description"/>:</div> 12.12 - <div><c:out value="${project.description}"/></div> 12.13 - </div> 12.14 - <div class="row"> 12.15 - <div class="caption"><fmt:message key="owner"/>:</div> 12.16 - <div> 12.17 - <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if> 12.18 - </div> 12.19 - <div class="caption"><fmt:message key="repoUrl"/>:</div> 12.20 - <div> 12.21 - <c:if test="${not empty project.repoUrl}"> 12.22 - <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out 12.23 - value="${project.repoUrl}"/></a> 12.24 - </c:if> 12.25 - </div> 12.26 - </div> 12.27 -</div>
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/src/main/webapp/WEB-INF/jspf/project-header.jspf Fri Oct 09 11:41:35 2020 +0200 13.3 @@ -0,0 +1,24 @@ 13.4 +<%-- 13.5 +project: Project 13.6 +--%> 13.7 +<div class="table project-attributes"> 13.8 + <div class="row"> 13.9 + <div class="caption"><fmt:message key="name"/>:</div> 13.10 + <div><c:out value="${project.name}"/></div> 13.11 + <div class="caption"><fmt:message key="description"/>:</div> 13.12 + <div><c:out value="${project.description}"/></div> 13.13 + </div> 13.14 + <div class="row"> 13.15 + <div class="caption"><fmt:message key="owner"/>:</div> 13.16 + <div> 13.17 + <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if> 13.18 + </div> 13.19 + <div class="caption"><fmt:message key="repoUrl"/>:</div> 13.20 + <div> 13.21 + <c:if test="${not empty project.repoUrl}"> 13.22 + <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out 13.23 + value="${project.repoUrl}"/></a> 13.24 + </c:if> 13.25 + </div> 13.26 + </div> 13.27 +</div>
14.1 --- a/src/main/webapp/WEB-INF/jspf/version-list.jsp Fri Oct 09 11:41:01 2020 +0200 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,13 +0,0 @@ 14.4 -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> 14.5 - 14.6 -<select name="${fieldname}" multiple> 14.7 - <c:forEach var="vselitem" items="${selectionList}"> 14.8 - <option value="${vselitem.id}" 14.9 - <c:forEach var="v" items="${data}"> 14.10 - <c:if test="${v eq vselitem}">selected</c:if> 14.11 - </c:forEach> 14.12 - > 14.13 - <c:out value="${vselitem.name}" /> 14.14 - </option> 14.15 - </c:forEach> 14.16 -</select>
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/src/main/webapp/WEB-INF/jspf/version-list.jspf Fri Oct 09 11:41:35 2020 +0200 15.3 @@ -0,0 +1,13 @@ 15.4 +<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> 15.5 + 15.6 +<select name="${fieldname}" multiple> 15.7 + <c:forEach var="vselitem" items="${selectionList}"> 15.8 + <option value="${vselitem.id}" 15.9 + <c:forEach var="v" items="${data}"> 15.10 + <c:if test="${v eq vselitem}">selected</c:if> 15.11 + </c:forEach> 15.12 + > 15.13 + <c:out value="${vselitem.name}" /> 15.14 + </option> 15.15 + </c:forEach> 15.16 +</select>
