diff --git a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java index f69388005..e224952fd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java @@ -69,7 +69,7 @@ public class AdminEsreqAction extends FessAdminAction { @Secured({ ROLE }) public ActionResponse upload(final UploadForm form) { validate(form, messages -> {}, () -> asListHtml(null)); - verifyToken(() -> asListHtml(() -> saveToken())); + verifyTokenKeep(() -> asListHtml(() -> saveToken())); String header = null; final StringBuilder buf = new StringBuilder(1000); diff --git a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp index 0134d5a48..fe63854a7 100644 --- a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp +++ b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp @@ -1,81 +1,71 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - - <la:message key="labels.admin_brand_title"/> | <la:message - key="labels.esreq_configuration"/> - + + + <la:message key="labels.admin_brand_title" /> | <la:message + key="labels.esreq_configuration" /> + -
- - - - - -
-
-
-
-
-

- -

-
-
- -
-
-
-
-
-
-
-
-
-

- -

-
-
- <%-- Message --%> -
- -
${msg}
- - -
- <%-- List --%> -
-
-
- - -
- - -
- - -
-
-
-
-
-
-
-
-
- -
- +
+ + + + + +
+
+
+
+
+

+ +

+
+
+
+
+
+ +
+ +
${msg}
+ + +
+
+
+
+

+ +

+
+
+
+ +
+ +
+
+
+
+ + + +
+
+
+ +
+
+ +
+ diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp index 6697092b5..98d1e2f4a 100644 --- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp +++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp @@ -1,90 +1,88 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - <la:message key="labels.admin_brand_title"/> | <la:message - key="labels.upgrade_title_configuration"/> - + + <la:message key="labels.admin_brand_title" /> | <la:message + key="labels.upgrade_title_configuration" /> + -
- - - - - -
-
-
-
-
-

- -

-
-
-
-
-
-
- - <%-- Message: BEGIN --%> -
- -
${msg}
- - -
- <%-- Message: END --%> -
-
-
-

- -

-
-
-
- -
- - - 12.0 - 12.1 - 12.2 - 12.3 - 12.4 - 12.5 - 12.6 - 12.7 - 13.0 - 13.1 - 13.2 - 13.3 - 13.4 - 13.5 - -
-
-
-
- -
-
-
- -
-
-
- -
- +
+ + + + + +
+
+
+
+
+

+ +

+
+
+
+
+
+ + <%-- Message: BEGIN --%> +
+ +
${msg}
+ + +
+ <%-- Message: END --%> +
+
+
+

+ +

+
+
+
+ +
+ + + 12.0 + 12.1 + 12.2 + 12.3 + 12.4 + 12.5 + 12.6 + 12.7 + 13.0 + 13.1 + 13.2 + 13.3 + 13.4 + 13.5 + +
+
+
+
+ +
+
+
+ +
+
+ +
+