diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f688514c0..192408459 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -995,6 +995,7 @@ labels.design_file_errorFooter=Error Page (Footer) labels.design_file_errorNotFound=Error Page (Not Found) labels.design_file_errorSystem=Error Page (System Error) labels.design_file_errorRedirect=Error Page (Redirect) +labels.design_file_errorBadRequest=Error Page (BadRequest) labels.design_delete_confirmation=Do you want to delete it? # view/admin/design/edit.jsp diff --git a/src/main/resources/application_ja.properties b/src/main/resources/application_ja.properties index 89361871b..c244d035d 100644 --- a/src/main/resources/application_ja.properties +++ b/src/main/resources/application_ja.properties @@ -994,6 +994,7 @@ labels.design_file_errorFooter=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30d5\u30c labels.design_file_errorNotFound=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30da\u30fc\u30b8\u304c\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) +labels.design_file_errorBadRequest=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u4e0d\u6b63\u306a\u30ea\u30af\u30a8\u30b9\u30c8) labels.design_delete_confirmation=\u524a\u9664\u3057\u307e\u3059\u304b? # view/admin/design/edit.jsp diff --git a/src/main/resources/fess.dicon b/src/main/resources/fess.dicon index 458500259..0bb97d2ae 100644 --- a/src/main/resources/fess.dicon +++ b/src/main/resources/fess.dicon @@ -80,6 +80,10 @@ "searchNoResult" "searchNoResult.jsp" + + "help" + "help.jsp" + "error" "error.jsp" @@ -145,8 +149,8 @@ "error/redirect.jsp" - "help" - "help.jsp" + "errorBadRequest" + "error/badRequest.jsp" diff --git a/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp new file mode 100644 index 000000000..7d853ace5 --- /dev/null +++ b/src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp @@ -0,0 +1,35 @@ +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + +<% try{ %> + + + + + +<bean:message key="labels.system_error_title" /> + + + + + +
+
+
+
+

+ +

+
+
+
+
+ +
+ + + + +<% }catch(Exception e){ session.invalidate();}%> diff --git a/src/main/webapp/WEB-INF/orig/view/error/header.jsp b/src/main/webapp/WEB-INF/orig/view/error/header.jsp index f06f62111..2534cc343 100755 --- a/src/main/webapp/WEB-INF/orig/view/error/header.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/header.jsp @@ -59,11 +59,11 @@ - - + + - - + + diff --git a/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp b/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp index 6117d0134..8555fc7e3 100644 --- a/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp @@ -15,6 +15,9 @@ if("systemError".equals(type)) { } else if("logOut".equals(type)) { redirectPage.append("/login/index?type=logout"); response.sendRedirect(redirectPage.toString()); +} else if("badRequest".equals(type)) { + redirectPage.append("/error/badRequest"); + response.sendRedirect(redirectPage.toString()); } else { redirectPage.append("/error/notFound?url="); redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8")); diff --git a/src/main/webapp/WEB-INF/orig/view/header.jsp b/src/main/webapp/WEB-INF/orig/view/header.jsp index 07c5ea7a8..748f32e31 100755 --- a/src/main/webapp/WEB-INF/orig/view/header.jsp +++ b/src/main/webapp/WEB-INF/orig/view/header.jsp @@ -9,7 +9,7 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()} alt="" />
- +
diff --git a/src/main/webapp/WEB-INF/orig/view/help.jsp b/src/main/webapp/WEB-INF/orig/view/help.jsp index 4b3914249..bcabffdc0 100644 --- a/src/main/webapp/WEB-INF/orig/view/help.jsp +++ b/src/main/webapp/WEB-INF/orig/view/help.jsp @@ -26,9 +26,11 @@

+ - + + diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp index bc485e674..746e956a6 100644 --- a/src/main/webapp/WEB-INF/orig/view/index.jsp +++ b/src/main/webapp/WEB-INF/orig/view/index.jsp @@ -52,7 +52,7 @@
+ maxlength="1000" styleId="contentQuery" autocomplete="off" />
@@ -115,11 +115,11 @@ - - + + - - + + + + + + + + + + + + + + + + + @@ -174,9 +193,11 @@ + - + + diff --git a/src/main/webapp/WEB-INF/orig/view/search.jsp b/src/main/webapp/WEB-INF/orig/view/search.jsp index 615c93efd..614c15a5c 100644 --- a/src/main/webapp/WEB-INF/orig/view/search.jsp +++ b/src/main/webapp/WEB-INF/orig/view/search.jsp @@ -45,9 +45,11 @@ + - + + diff --git a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp index fe1cd1a46..0b498639f 100644 --- a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp +++ b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp @@ -22,16 +22,14 @@
- +

  1. - - ${f:h(doc.contentTitle)} + ${f:h(doc.contentTitle)}

    ${doc.contentDescription}
    @@ -42,30 +40,32 @@
    - - - - - - + + + + + - - - - - + - - - - + + + - + - + - + (${f:h(doc.favoriteCount_l_x_dv)}) + key="labels.search_result_favorited"/> (${f:h(doc.favoriteCount_l_x_dv)})
@@ -82,10 +82,10 @@
    - +
    • - +
  • ${f:h(fe:label(countEntry.key))} (${f:h(countEntry.value)})
    • diff --git a/src/main/webapp/WEB-INF/view/admin/design/index.jsp b/src/main/webapp/WEB-INF/view/admin/design/index.jsp index fb27a16b3..5ae0115dd 100644 --- a/src/main/webapp/WEB-INF/view/admin/design/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/design/index.jsp @@ -101,12 +101,12 @@ - - + + <%-- Mobile --%> @@ -126,6 +126,7 @@ +