diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java index ade2be2e1..444b6f9d6 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java @@ -348,9 +348,6 @@ public interface FessHtmlPath { /** The path of the HTML: /error/error.jsp */ HtmlNext path_Error_ErrorJsp = new HtmlNext("/error/error.jsp"); - /** The path of the HTML: /error/header.jsp */ - HtmlNext path_Error_HeaderJsp = new HtmlNext("/error/header.jsp"); - /** The path of the HTML: /error/notFound.jsp */ HtmlNext path_Error_NotFoundJsp = new HtmlNext("/error/notFound.jsp"); diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index 39bc4cc4a..af83eac14 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -1502,9 +1502,6 @@ public class FessLabels extends UserMessages { /** The key of the message: Cache Page */ public static final String LABELS_design_file_cache = "{labels.design_file_cache}"; - /** The key of the message: Error Page (Header) */ - public static final String LABELS_design_file_errorHeader = "{labels.design_file_errorHeader}"; - /** The key of the message: Error Page (Not Found) */ public static final String LABELS_design_file_errorNotFound = "{labels.design_file_errorNotFound}"; diff --git a/src/main/resources/fess.xml b/src/main/resources/fess.xml index 4699addb8..2124a4ee5 100644 --- a/src/main/resources/fess.xml +++ b/src/main/resources/fess.xml @@ -63,10 +63,6 @@ "error" "error/error.jsp" - - "errorHeader" - "error/header.jsp" - "errorNotFound" "error/notFound.jsp" diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index c340107be..b4ea3dd08 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -491,7 +491,6 @@ labels.design_file_help=Help Page (Content) labels.design_file_header=Header labels.design_file_error=Search Error Page labels.design_file_cache=Cache Page -labels.design_file_errorHeader=Error Page (Header) labels.design_file_errorNotFound=Error Page (Not Found) labels.design_file_errorSystem=Error Page (System Error) labels.design_file_errorRedirect=Error Page (Redirect) diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties index 08cba014b..2bacea359 100644 --- a/src/main/resources/fess_label_en.properties +++ b/src/main/resources/fess_label_en.properties @@ -491,7 +491,6 @@ labels.design_file_help=Help Page (Content) labels.design_file_header=Header labels.design_file_error=Search Error Page labels.design_file_cache=Cache Page -labels.design_file_errorHeader=Error Page (Header) labels.design_file_errorNotFound=Error Page (Not Found) labels.design_file_errorSystem=Error Page (System Error) labels.design_file_errorRedirect=Error Page (Redirect) diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties index 25c9e884c..29ae63264 100644 --- a/src/main/resources/fess_label_ja.properties +++ b/src/main/resources/fess_label_ja.properties @@ -484,7 +484,6 @@ labels.design_file_help=\u30d8\u30eb\u30d7\u30da\u30fc\u30b8 (\u30b3\u30f3\u30c6 labels.design_file_header=\u30d8\u30c3\u30c0\u30fc labels.design_file_error=\u691c\u7d22\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 labels.design_file_cache=\u30ad\u30e3\u30c3\u30b7\u30e5\u30da\u30fc\u30b8 -labels.design_file_errorHeader=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30d8\u30c3\u30c0\u30fc) labels.design_file_errorNotFound=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u898b\u3064\u304b\u308a\u307e\u305b\u3093) labels.design_file_errorSystem=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc) labels.design_file_errorRedirect=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30ea\u30c0\u30a4\u30ec\u30af\u30c8) diff --git a/src/main/resources/fess_label_ko.properties b/src/main/resources/fess_label_ko.properties index 5194bacb9..010295b04 100644 --- a/src/main/resources/fess_label_ko.properties +++ b/src/main/resources/fess_label_ko.properties @@ -483,7 +483,6 @@ labels.design_file_help = \ub3c4\uc6c0\ub9d0 \ud398\uc774\uc9c0 (\ucee8\ud150\uc labels.design_file_header = \ud5e4\ub354 labels.design_file_error = \uac80\uc0c9 \uc5d0\ub7ec \ud398\uc774\uc9c0 labels.design_file_cache = \uce90\uc2dc \ud398\uc774\uc9c0 -labels.design_file_errorHeader = \uc5d0\ub7ec \ud398\uc774\uc9c0 (Header) labels.design_file_errorNotFound = \uc5d0\ub7ec \ud398\uc774\uc9c0 (Not Found) labels.design_file_errorSystem = \uc5d0\ub7ec \ud398\uc774\uc9c0 (\uc2dc\uc2a4\ud15c \uc624\ub958) labels.design_file_errorRedirect = \uc5d0\ub7ec \ud398\uc774\uc9c0 (Redirect) diff --git a/src/main/resources/fess_label_ru.properties b/src/main/resources/fess_label_ru.properties index da5a0c07b..ab470f27f 100644 --- a/src/main/resources/fess_label_ru.properties +++ b/src/main/resources/fess_label_ru.properties @@ -484,7 +484,6 @@ labels.design_file_help=Help Page (Content) labels.design_file_header=Header labels.design_file_error=Search Error Page labels.design_file_cache=Cache Page -labels.design_file_errorHeader=Error Page (Header) labels.design_file_errorNotFound=Error Page (Not Found) labels.design_file_errorSystem=Error Page (System Error) labels.design_file_errorRedirect=Error Page (Redirect) diff --git a/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp index 9664bb658..41efdcde3 100644 --- a/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp @@ -15,7 +15,7 @@ rel="stylesheet" type="text/css" /> - +
diff --git a/src/main/webapp/WEB-INF/orig/view/error/error.jsp b/src/main/webapp/WEB-INF/orig/view/error/error.jsp index f23e18454..e062c68c2 100644 --- a/src/main/webapp/WEB-INF/orig/view/error/error.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/error.jsp @@ -14,7 +14,7 @@ rel="stylesheet" type="text/css" /> - +
diff --git a/src/main/webapp/WEB-INF/orig/view/error/header.jsp b/src/main/webapp/WEB-INF/orig/view/error/header.jsp deleted file mode 100755 index e4769467d..000000000 --- a/src/main/webapp/WEB-INF/orig/view/error/header.jsp +++ /dev/null @@ -1,94 +0,0 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - - ${fe:facetForm()}${fe:geoForm()} - -
-
- -
- - - -
-
-
-
diff --git a/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp b/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp index 1802dcb61..6eec58a85 100644 --- a/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/notFound.jsp @@ -14,7 +14,7 @@ rel="stylesheet" type="text/css" /> - +
diff --git a/src/main/webapp/WEB-INF/orig/view/error/system.jsp b/src/main/webapp/WEB-INF/orig/view/error/system.jsp index 5880f990d..3bbf50c1d 100644 --- a/src/main/webapp/WEB-INF/orig/view/error/system.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/system.jsp @@ -15,7 +15,7 @@ rel="stylesheet" type="text/css" /> - +
diff --git a/src/main/webapp/WEB-INF/orig/view/header.jsp b/src/main/webapp/WEB-INF/orig/view/header.jsp index 12ef3cf4d..6b1520b30 100755 --- a/src/main/webapp/WEB-INF/orig/view/header.jsp +++ b/src/main/webapp/WEB-INF/orig/view/header.jsp @@ -1,8 +1,8 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> -${fe:facetForm()}${fe:geoForm()} - -
-
- -
- - - -
-
-
-
diff --git a/src/main/webapp/WEB-INF/view/error/notFound.jsp b/src/main/webapp/WEB-INF/view/error/notFound.jsp index 1802dcb61..6eec58a85 100644 --- a/src/main/webapp/WEB-INF/view/error/notFound.jsp +++ b/src/main/webapp/WEB-INF/view/error/notFound.jsp @@ -14,7 +14,7 @@ rel="stylesheet" type="text/css" /> - +
diff --git a/src/main/webapp/WEB-INF/view/error/system.jsp b/src/main/webapp/WEB-INF/view/error/system.jsp index 5880f990d..3bbf50c1d 100644 --- a/src/main/webapp/WEB-INF/view/error/system.jsp +++ b/src/main/webapp/WEB-INF/view/error/system.jsp @@ -15,7 +15,7 @@ rel="stylesheet" type="text/css" /> - +
diff --git a/src/main/webapp/WEB-INF/view/header.jsp b/src/main/webapp/WEB-INF/view/header.jsp index 12ef3cf4d..6b1520b30 100755 --- a/src/main/webapp/WEB-INF/view/header.jsp +++ b/src/main/webapp/WEB-INF/view/header.jsp @@ -1,8 +1,8 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> -${fe:facetForm()}${fe:geoForm()} -