changeset
some reformatting
Fri, 22 May 2020 16:21:59 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Fri, 22 May 2020 16:21:59 +0200
- changeset 72
- 0646c14e36fb
- parent 71
- dca186d3911f
- child 73
- 672b5003cafe
some reformatting
1.1 --- a/src/main/java/de/uapcore/lightpit/ModuleManager.java Fri May 22 16:21:31 2020 +0200 1.2 +++ b/src/main/java/de/uapcore/lightpit/ModuleManager.java Fri May 22 16:21:59 2020 +0200 1.3 @@ -155,7 +155,7 @@ 1.4 new ResourceKey( 1.5 mod.bundleBaseName(), 1.6 mod.menuKey()), 1.7 - mod.modulePath()+"/", 1.8 + mod.modulePath() + "/", 1.9 mod.defaultPriority())) 1.10 .sorted() 1.11 .forEachOrdered(mainMenu::add);
2.1 --- a/src/main/java/de/uapcore/lightpit/dao/DataAccessObjects.java Fri May 22 16:21:31 2020 +0200 2.2 +++ b/src/main/java/de/uapcore/lightpit/dao/DataAccessObjects.java Fri May 22 16:21:59 2020 +0200 2.3 @@ -30,7 +30,10 @@ 2.4 2.5 public interface DataAccessObjects { 2.6 UserDao getUserDao(); 2.7 + 2.8 ProjectDao getProjectDao(); 2.9 + 2.10 VersionDao getVersionDao(); 2.11 + 2.12 IssueDao getIssueDao(); 2.13 }
3.1 --- a/src/main/java/de/uapcore/lightpit/dao/IssueDao.java Fri May 22 16:21:31 2020 +0200 3.2 +++ b/src/main/java/de/uapcore/lightpit/dao/IssueDao.java Fri May 22 16:21:59 2020 +0200 3.3 @@ -38,6 +38,7 @@ 3.4 3.5 /** 3.6 * Lists all issues for the specified project. 3.7 + * 3.8 * @param project the project 3.9 * @return a list of issues 3.10 * @throws SQLException on any kind of SQL error
4.1 --- a/src/main/java/de/uapcore/lightpit/dao/VersionDao.java Fri May 22 16:21:31 2020 +0200 4.2 +++ b/src/main/java/de/uapcore/lightpit/dao/VersionDao.java Fri May 22 16:21:59 2020 +0200 4.3 @@ -38,6 +38,7 @@ 4.4 4.5 /** 4.6 * Lists all versions for the specified project. 4.7 + * 4.8 * @param project the project 4.9 * @return a list of versions 4.10 * @throws SQLException on any kind of SQL error
5.1 --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Fri May 22 16:21:31 2020 +0200 5.2 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Fri May 22 16:21:59 2020 +0200 5.3 @@ -75,10 +75,10 @@ 5.4 } 5.5 5.6 private Version obtainVersion(ResultSet result, Project project, String prefix) throws SQLException { 5.7 - final int vplan = result.getInt(prefix+"id"); 5.8 + final int vplan = result.getInt(prefix + "id"); 5.9 if (vplan > 0) { 5.10 final var ver = new Version(vplan, project); 5.11 - ver.setName(result.getString(prefix+"name")); 5.12 + ver.setName(result.getString(prefix + "name")); 5.13 return ver; 5.14 } else { 5.15 return null;
6.1 --- a/src/main/java/de/uapcore/lightpit/entities/User.java Fri May 22 16:21:31 2020 +0200 6.2 +++ b/src/main/java/de/uapcore/lightpit/entities/User.java Fri May 22 16:21:59 2020 +0200 6.3 @@ -89,7 +89,7 @@ 6.4 dn.append(lastname); 6.5 dn.append(' '); 6.6 if (mail != null && !mail.isBlank()) { 6.7 - dn.append("<"+mail+">"); 6.8 + dn.append("<" + mail + ">"); 6.9 } 6.10 final var str = dn.toString().trim(); 6.11 return str.isBlank() ? username : str;
7.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/commit-successful.jsp Fri May 22 16:21:31 2020 +0200 7.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/commit-successful.jsp Fri May 22 16:21:59 2020 +0200 7.3 @@ -30,5 +30,5 @@ 7.4 7.5 <c:set scope="page" var="redirectLocation" value="${requestScope[Constants.REQ_ATTR_REDIRECT_LOCATION]}"/> 7.6 7.7 -<fmt:message bundle="${lightpit_bundle}" key="commit.success" /> 7.8 -<fmt:message bundle="${lightpit_bundle}" key="commit.redirect-link" /> 7.9 +<fmt:message bundle="${lightpit_bundle}" key="commit.success"/> 7.10 +<fmt:message bundle="${lightpit_bundle}" key="commit.redirect-link"/>
8.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/error.jsp Fri May 22 16:21:31 2020 +0200 8.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/error.jsp Fri May 22 16:21:59 2020 +0200 8.3 @@ -31,7 +31,7 @@ 8.4 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> 8.5 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> 8.6 8.7 -<c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}" /> 8.8 +<c:set scope="page" var="baseHref" value="${requestScope[Constants.REQ_ATTR_BASE_HREF]}"/> 8.9 <c:set scope="page" var="errorCode" value="${requestScope['javax.servlet.error.status_code']}"/> 8.10 <c:set scope="page" var="returnLink" value="${requestScope[ErrorModule.REQ_ATTR_RETURN_LINK]}"/> 8.11 8.12 @@ -40,28 +40,28 @@ 8.13 <table> 8.14 <tr> 8.15 <th><fmt:message key="errorCode"/>:</th> 8.16 - <td>${errorCode} - <fmt:message key="code.${errorCode}" /></td> 8.17 + <td>${errorCode} - <fmt:message key="code.${errorCode}"/></td> 8.18 </tr> 8.19 <tr> 8.20 - <th><fmt:message key="errorMessage" />:</th> 8.21 + <th><fmt:message key="errorMessage"/>:</th> 8.22 <td><c:out value="${requestScope['javax.servlet.error.message']}"/></td> 8.23 </tr> 8.24 <tr> 8.25 - <th><fmt:message key="errorTimestamp" />:</th> 8.26 + <th><fmt:message key="errorTimestamp"/>:</th> 8.27 <td><fmt:formatDate type="both" value="<%= new java.util.Date()%>"/></td> 8.28 </tr> 8.29 <%--@elvariable id="exception" type="java.lang.Exception"--%> 8.30 <c:if test="${not empty exception}"> 8.31 - <tr> 8.32 - <th><fmt:message key="errorExceptionText" />:</th> 8.33 - <td>${exception['class'].name} - ${exception.message}</td> 8.34 - </tr> 8.35 + <tr> 8.36 + <th><fmt:message key="errorExceptionText"/>:</th> 8.37 + <td>${exception['class'].name} - ${exception.message}</td> 8.38 + </tr> 8.39 </c:if> 8.40 <c:if test="${fn:startsWith(returnLink, baseHref)}"> 8.41 - <tr> 8.42 - <th><fmt:message key="errorReturnLink" />:</th> 8.43 - <td><a href="${returnLink}">${returnLink}</a></td> 8.44 - </tr> 8.45 + <tr> 8.46 + <th><fmt:message key="errorReturnLink"/>:</th> 8.47 + <td><a href="${returnLink}">${returnLink}</a></td> 8.48 + </tr> 8.49 </c:if> 8.50 </table> 8.51 </div>
9.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/language.jsp Fri May 22 16:21:31 2020 +0200 9.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/language.jsp Fri May 22 16:21:59 2020 +0200 9.3 @@ -46,7 +46,7 @@ 9.4 </label> 9.5 </c:forEach> 9.6 <c:if test="${not browserLanguagePresent}"> 9.7 - <span class="blNA"><fmt:message key="browserLanguageNotAvailable" /></span> 9.8 + <span class="blNA"><fmt:message key="browserLanguageNotAvailable"/></span> 9.9 </c:if> 9.10 <input type="submit" value="<fmt:message key="submit" />"/> 9.11 </form>
10.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/project-details.jsp Fri May 22 16:21:31 2020 +0200 10.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/project-details.jsp Fri May 22 16:21:59 2020 +0200 10.3 @@ -37,41 +37,42 @@ 10.4 <jsp:useBean id="issues" type="java.util.List<de.uapcore.lightpit.entities.Issue>" scope="request"/> 10.5 10.6 <div id="tool-area"> 10.7 - <a href="./${moduleInfo.modulePath}/versions/edit" class="button"><fmt:message key="button.version.create" /></a> 10.8 - <a href="./${moduleInfo.modulePath}/issues/edit" class="button"><fmt:message key="button.issue.create" /></a> 10.9 + <a href="./${moduleInfo.modulePath}/versions/edit" class="button"><fmt:message key="button.version.create"/></a> 10.10 + <a href="./${moduleInfo.modulePath}/issues/edit" class="button"><fmt:message key="button.issue.create"/></a> 10.11 </div> 10.12 10.13 <c:if test="${not empty versions}"> 10.14 -<table id="version-list" class="datatable medskip"> 10.15 - <thead> 10.16 - <tr> 10.17 - <th></th> 10.18 - <th><fmt:message key="thead.version.name"/></th> 10.19 - <th><fmt:message key="thead.version.status"/></th> 10.20 - </tr> 10.21 - </thead> 10.22 - <tbody> 10.23 - <c:forEach var="version" items="${versions}"> 10.24 - <tr class="nowrap" > 10.25 - <td style="width: 2em;"><a href="./${moduleInfo.modulePath}/versions/edit?id=${version.id}">✎</a></td> 10.26 - <td><c:out value="${version.name}"/></td> 10.27 - <td><fmt:message key="version.status.${version.status}" /></td> 10.28 + <table id="version-list" class="datatable medskip"> 10.29 + <thead> 10.30 + <tr> 10.31 + <th></th> 10.32 + <th><fmt:message key="thead.version.name"/></th> 10.33 + <th><fmt:message key="thead.version.status"/></th> 10.34 </tr> 10.35 - </c:forEach> 10.36 - </tbody> 10.37 -</table> 10.38 + </thead> 10.39 + <tbody> 10.40 + <c:forEach var="version" items="${versions}"> 10.41 + <tr class="nowrap"> 10.42 + <td style="width: 2em;"><a href="./${moduleInfo.modulePath}/versions/edit?id=${version.id}">✎</a> 10.43 + </td> 10.44 + <td><c:out value="${version.name}"/></td> 10.45 + <td><fmt:message key="version.status.${version.status}"/></td> 10.46 + </tr> 10.47 + </c:forEach> 10.48 + </tbody> 10.49 + </table> 10.50 </c:if> 10.51 10.52 <table id="issue-list" class="datatable medskip"> 10.53 <thead> 10.54 <tr> 10.55 <th></th> 10.56 - <th><fmt:message key="thead.issue.subject" /></th> 10.57 - <th><fmt:message key="thead.issue.category" /></th> 10.58 - <th><fmt:message key="thead.issue.status" /></th> 10.59 - <th><fmt:message key="thead.issue.created" /></th> 10.60 - <th><fmt:message key="thead.issue.updated" /></th> 10.61 - <th><fmt:message key="thead.issue.eta" /></th> 10.62 + <th><fmt:message key="thead.issue.subject"/></th> 10.63 + <th><fmt:message key="thead.issue.category"/></th> 10.64 + <th><fmt:message key="thead.issue.status"/></th> 10.65 + <th><fmt:message key="thead.issue.created"/></th> 10.66 + <th><fmt:message key="thead.issue.updated"/></th> 10.67 + <th><fmt:message key="thead.issue.eta"/></th> 10.68 <!-- TODO: add other information --> 10.69 </tr> 10.70 </thead>
11.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/project-form.jsp Fri May 22 16:21:31 2020 +0200 11.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/project-form.jsp Fri May 22 16:21:59 2020 +0200 11.3 @@ -43,23 +43,25 @@ 11.4 <tbody> 11.5 <tr> 11.6 <th><fmt:message key="thead.name"/></th> 11.7 - <td><input name="name" type="text" maxlength="20" required value="${project.name}"/> </td> 11.8 + <td><input name="name" type="text" maxlength="20" required value="${project.name}"/></td> 11.9 </tr> 11.10 <tr> 11.11 <th class="vtop"><fmt:message key="thead.description"/></th> 11.12 - <td><input type="text" name="description" maxlength="200" value="${project.description}" /> </td> 11.13 + <td><input type="text" name="description" maxlength="200" value="${project.description}"/></td> 11.14 </tr> 11.15 <tr> 11.16 <th><fmt:message key="thead.repoUrl"/></th> 11.17 - <td><input name="repoUrl" type="url" maxlength="50" value="${project.repoUrl}" /> </td> 11.18 + <td><input name="repoUrl" type="url" maxlength="50" value="${project.repoUrl}"/></td> 11.19 </tr> 11.20 <tr> 11.21 <th><fmt:message key="thead.owner"/></th> 11.22 <td> 11.23 <select name="owner"> 11.24 - <option value="-1"><fmt:message key="placeholder.null-owner" /> </option> 11.25 + <option value="-1"><fmt:message key="placeholder.null-owner"/></option> 11.26 <c:forEach var="user" items="${users}"> 11.27 - <option <c:if test="${not empty project.owner and user.id eq project.owner.id}">selected</c:if> value="${user.id}"><c:out value="${user.displayname}"/></option> 11.28 + <option 11.29 + <c:if test="${not empty project.owner and user.id eq project.owner.id}">selected</c:if> 11.30 + value="${user.id}"><c:out value="${user.displayname}"/></option> 11.31 </c:forEach> 11.32 </select> 11.33 </td> 11.34 @@ -68,9 +70,10 @@ 11.35 <tfoot> 11.36 <tr> 11.37 <td colspan="2"> 11.38 - <input type="hidden" name="id" value="${project.id}" /> 11.39 - <a href="./${moduleInfo.modulePath}/" class="button"><fmt:message bundle="${lightpit_bundle}" key="button.cancel"/></a> 11.40 - <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay" /></button> 11.41 + <input type="hidden" name="id" value="${project.id}"/> 11.42 + <a href="./${moduleInfo.modulePath}/" class="button"><fmt:message bundle="${lightpit_bundle}" 11.43 + key="button.cancel"/></a> 11.44 + <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button> 11.45 </td> 11.46 </tr> 11.47 </tfoot>
12.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/projects.jsp Fri May 22 16:21:31 2020 +0200 12.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/projects.jsp Fri May 22 16:21:59 2020 +0200 12.3 @@ -37,49 +37,51 @@ 12.4 12.5 <c:if test="${empty projects}"> 12.6 <div class="info-box"> 12.7 - <fmt:message key="no-projects" /> 12.8 + <fmt:message key="no-projects"/> 12.9 </div> 12.10 </c:if> 12.11 12.12 <div id="tool-area"> 12.13 - <a href="./${moduleInfo.modulePath}/edit" class="button"><fmt:message key="button.create" /></a> 12.14 + <a href="./${moduleInfo.modulePath}/edit" class="button"><fmt:message key="button.create"/></a> 12.15 </div> 12.16 12.17 <c:if test="${not empty projects}"> 12.18 -<table id="project-list" class="datatable medskip fullwidth"> 12.19 - <colgroup> 12.20 - <col> 12.21 - <col style="width: 10%"> 12.22 - <col style="width: 35%"> 12.23 - <col style="width: 30%"> 12.24 - <col style="width: 25%"> 12.25 - </colgroup> 12.26 - <thead> 12.27 - <tr> 12.28 - <th></th> 12.29 - <th><fmt:message key="thead.name"/></th> 12.30 - <th><fmt:message key="thead.description"/></th> 12.31 - <th><fmt:message key="thead.repoUrl"/></th> 12.32 - <th><fmt:message key="thead.owner"/></th> 12.33 - </tr> 12.34 - </thead> 12.35 - <tbody> 12.36 - <c:forEach var="project" items="${projects}"> 12.37 - <tr class="nowrap"> 12.38 - <td style="width: 2em;"><a href="./${moduleInfo.modulePath}/edit?id=${project.id}">✎</a></td> 12.39 - <td><a href="./${moduleInfo.modulePath}/view?pid=${project.id}"><c:out value="${project.name}"/></a></td> 12.40 - <td><c:out value="${project.description}"/></td> 12.41 - <td> 12.42 - <c:if test="${not empty project.repoUrl}"> 12.43 - <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out value="${project.repoUrl}"/></a> 12.44 - </c:if> 12.45 - </td> 12.46 - <td> 12.47 - <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if> 12.48 - <c:if test="${empty project.owner}"><fmt:message key="placeholder.null-owner" /></c:if> 12.49 - </td> 12.50 + <table id="project-list" class="datatable medskip fullwidth"> 12.51 + <colgroup> 12.52 + <col> 12.53 + <col style="width: 10%"> 12.54 + <col style="width: 35%"> 12.55 + <col style="width: 30%"> 12.56 + <col style="width: 25%"> 12.57 + </colgroup> 12.58 + <thead> 12.59 + <tr> 12.60 + <th></th> 12.61 + <th><fmt:message key="thead.name"/></th> 12.62 + <th><fmt:message key="thead.description"/></th> 12.63 + <th><fmt:message key="thead.repoUrl"/></th> 12.64 + <th><fmt:message key="thead.owner"/></th> 12.65 </tr> 12.66 - </c:forEach> 12.67 - </tbody> 12.68 -</table> 12.69 + </thead> 12.70 + <tbody> 12.71 + <c:forEach var="project" items="${projects}"> 12.72 + <tr class="nowrap"> 12.73 + <td style="width: 2em;"><a href="./${moduleInfo.modulePath}/edit?id=${project.id}">✎</a></td> 12.74 + <td><a href="./${moduleInfo.modulePath}/view?pid=${project.id}"><c:out value="${project.name}"/></a> 12.75 + </td> 12.76 + <td><c:out value="${project.description}"/></td> 12.77 + <td> 12.78 + <c:if test="${not empty project.repoUrl}"> 12.79 + <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out 12.80 + value="${project.repoUrl}"/></a> 12.81 + </c:if> 12.82 + </td> 12.83 + <td> 12.84 + <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if> 12.85 + <c:if test="${empty project.owner}"><fmt:message key="placeholder.null-owner"/></c:if> 12.86 + </td> 12.87 + </tr> 12.88 + </c:forEach> 12.89 + </tbody> 12.90 + </table> 12.91 </c:if>
13.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/user-form.jsp Fri May 22 16:21:31 2020 +0200 13.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/user-form.jsp Fri May 22 16:21:59 2020 +0200 13.3 @@ -42,27 +42,29 @@ 13.4 <tbody> 13.5 <tr> 13.6 <th><fmt:message key="thead.username"/></th> 13.7 - <td><input name="username" type="text" maxlength="50" required value="${user.username}" <c:if test="${user.id ge 0}">readonly</c:if> /> </td> 13.8 + <td><input name="username" type="text" maxlength="50" required value="${user.username}" 13.9 + <c:if test="${user.id ge 0}">readonly</c:if> /></td> 13.10 </tr> 13.11 <tr> 13.12 <th><fmt:message key="thead.givenname"/></th> 13.13 - <td><input name="givenname" type="text" maxlength="50" value="${user.givenname}"/> </td> 13.14 + <td><input name="givenname" type="text" maxlength="50" value="${user.givenname}"/></td> 13.15 </tr> 13.16 <tr> 13.17 <th><fmt:message key="thead.lastname"/></th> 13.18 - <td><input name="lastname" type="text" maxlength="50" value="${user.lastname}"/> </td> 13.19 + <td><input name="lastname" type="text" maxlength="50" value="${user.lastname}"/></td> 13.20 </tr> 13.21 <tr> 13.22 <th><fmt:message key="thead.mail"/></th> 13.23 - <td><input name="mail" type="email" maxlength="50" value="${user.mail}"/> </td> 13.24 + <td><input name="mail" type="email" maxlength="50" value="${user.mail}"/></td> 13.25 </tr> 13.26 </tbody> 13.27 <tfoot> 13.28 <tr> 13.29 <td colspan="2"> 13.30 - <input type="hidden" name="userid" value="${user.id}" /> 13.31 - <a href="./${moduleInfo.modulePath}/" class="button"><fmt:message bundle="${lightpit_bundle}" key="button.cancel"/></a> 13.32 - <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay" /></button> 13.33 + <input type="hidden" name="userid" value="${user.id}"/> 13.34 + <a href="./${moduleInfo.modulePath}/" class="button"><fmt:message bundle="${lightpit_bundle}" 13.35 + key="button.cancel"/></a> 13.36 + <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button> 13.37 </td> 13.38 </tr> 13.39 </tfoot>
14.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/users.jsp Fri May 22 16:21:31 2020 +0200 14.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/users.jsp Fri May 22 16:21:59 2020 +0200 14.3 @@ -35,12 +35,12 @@ 14.4 14.5 <c:if test="${empty users}"> 14.6 <div class="info-box"> 14.7 - <fmt:message key="no-users" /> 14.8 + <fmt:message key="no-users"/> 14.9 </div> 14.10 </c:if> 14.11 14.12 <div id="tool-area"> 14.13 - <a href="./${moduleInfo.modulePath}/edit" class="button"><fmt:message key="button.create" /></a> 14.14 + <a href="./${moduleInfo.modulePath}/edit" class="button"><fmt:message key="button.create"/></a> 14.15 </div> 14.16 14.17 <c:if test="${not empty users}">
15.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/version-form.jsp Fri May 22 16:21:31 2020 +0200 15.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/version-form.jsp Fri May 22 16:21:59 2020 +0200 15.3 @@ -33,7 +33,7 @@ 15.4 <c:set scope="page" var="selectedProject" value="${sessionScope[ProjectsModule.SESSION_ATTR_SELECTED_PROJECT]}"/> 15.5 15.6 <jsp:useBean id="version" type="de.uapcore.lightpit.entities.Version" scope="request"/> 15.7 -<jsp:useBean id="versionStatusEnum" type="de.uapcore.lightpit.entities.VersionStatus[]" scope="request" /> 15.8 +<jsp:useBean id="versionStatusEnum" type="de.uapcore.lightpit.entities.VersionStatus[]" scope="request"/> 15.9 15.10 <form action="./${moduleInfo.modulePath}/versions/commit" method="post"> 15.11 <table class="formtable" style="width: 35ch"> 15.12 @@ -44,14 +44,16 @@ 15.13 <tbody> 15.14 <tr> 15.15 <th><fmt:message key="thead.version.name"/></th> 15.16 - <td><input name="name" type="text" maxlength="20" required value="${version.name}" /> </td> 15.17 + <td><input name="name" type="text" maxlength="20" required value="${version.name}"/></td> 15.18 </tr> 15.19 <tr> 15.20 <th><fmt:message key="thead.version.status"/></th> 15.21 <td> 15.22 <select name="status" required> 15.23 <c:forEach var="elem" items="${versionStatusEnum}"> 15.24 - <option <c:if test="${elem eq version.status}">selected</c:if> value="${elem}"><fmt:message key="version.status.${elem}" /> </option> 15.25 + <option 15.26 + <c:if test="${elem eq version.status}">selected</c:if> value="${elem}"><fmt:message 15.27 + key="version.status.${elem}"/></option> 15.28 </c:forEach> 15.29 </select> 15.30 </td> 15.31 @@ -59,16 +61,17 @@ 15.32 <tr title="<fmt:message key="tooltip.ordinal" />"> 15.33 <th><fmt:message key="thead.version.ordinal"/></th> 15.34 <td> 15.35 - <input name="ordinal" type="number" min="0" value="${version.ordinal}" /> 15.36 + <input name="ordinal" type="number" min="0" value="${version.ordinal}"/> 15.37 </td> 15.38 </tr> 15.39 </tbody> 15.40 <tfoot> 15.41 <tr> 15.42 <td colspan="2"> 15.43 - <input type="hidden" name="id" value="${version.id}" /> 15.44 - <a href="./${moduleInfo.modulePath}/versions/" class="button"><fmt:message bundle="${lightpit_bundle}" key="button.cancel"/></a> 15.45 - <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay" /></button> 15.46 + <input type="hidden" name="id" value="${version.id}"/> 15.47 + <a href="./${moduleInfo.modulePath}/versions/" class="button"><fmt:message bundle="${lightpit_bundle}" 15.48 + key="button.cancel"/></a> 15.49 + <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button> 15.50 </td> 15.51 </tr> 15.52 </tfoot>
16.1 --- a/src/main/webapp/WEB-INF/web.xml Fri May 22 16:21:31 2020 +0200 16.2 +++ b/src/main/webapp/WEB-INF/web.xml Fri May 22 16:21:59 2020 +0200 16.3 @@ -1,5 +1,6 @@ 16.4 <?xml version="1.0" encoding="UTF-8"?> 16.5 -<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"> 16.6 +<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 16.7 + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"> 16.8 <session-config> 16.9 <session-timeout> 16.10 30
