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 fe768d0fe35ce0a2e80422c0f57bd0a868d30969..01674e32e1efa0cd72c72b95d351a0df43db0335 100755 --- a/src/main/webapp/WEB-INF/orig/view/error/header.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/header.jsp @@ -1,32 +1,73 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> -${fe:facetForm()}${fe:geoForm()} + role="search"> + ${fe:facetForm()}${fe:geoForm()}
@@ -37,7 +78,7 @@ ${fe:facetForm()}${fe:geoForm()}
+ styleClass="form-control"> @@ -53,7 +94,7 @@ ${fe:facetForm()}${fe:geoForm()} + styleClass="form-control"> @@ -100,11 +141,11 @@ ${fe:facetForm()}${fe:geoForm()} + multiple="true" styleClass="form-control"> - ${f:h(item.label)} - + ${f:h(item.label)} +
@@ -113,11 +154,11 @@ ${fe:facetForm()}${fe:geoForm()} + multiple="true" styleClass="form-control"> - ${f:h(item.label)} - + ${f:h(item.label)} + @@ -132,8 +173,8 @@ ${fe:facetForm()}${fe:geoForm()} 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 b1e720f10d0719b880d19e5dbbdf28432b88a2f4..72e86cc4f1354fda804b3f9b9c9d9db86b32b9c5 100644 --- a/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp @@ -13,15 +13,14 @@ if("systemError".equals(type)) { response.sendError(statusCode); } } else if("logOut".equals(type)) { - redirectPage.append("/login/index?type=logout"); + redirectPage.append("/login/?type=logout&code=" + statusCode); response.sendRedirect(redirectPage.toString()); } else if("badRequest".equals(type)) { redirectPage.append("/error/badrequest"); response.sendRedirect(redirectPage.toString()); -} else { +} else if(!"badAuth".equals(type)) { redirectPage.append("/error/notfound?url="); redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8")); response.sendRedirect(redirectPage.toString()); } - %> - + %>Bad Authentication. \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp index 0c157a1edbb3fa6714f4e64390c79adbea2991ad..4c794540c6d22ab486de3048c656b046d178eae2 100644 --- a/src/main/webapp/WEB-INF/orig/view/index.jsp +++ b/src/main/webapp/WEB-INF/orig/view/index.jsp @@ -4,7 +4,7 @@ - + <la:message key="labels.search_title" />
  • +
  • ${f:h(facetResponse.queryCountMap[queryEntry.value])}
  • +
    + +
  • +
    diff --git a/src/main/webapp/WEB-INF/view/common/admin/head.jsp b/src/main/webapp/WEB-INF/view/common/admin/head.jsp index 03deb52fd67552293688abd7e4a31197990e898f..04d8c61a956462fc10d6efb042dcc125281b5aa5 100644 --- a/src/main/webapp/WEB-INF/view/common/admin/head.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin/head.jsp @@ -1,6 +1,6 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - + diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp index 0c157a1edbb3fa6714f4e64390c79adbea2991ad..4c794540c6d22ab486de3048c656b046d178eae2 100644 --- a/src/main/webapp/WEB-INF/view/index.jsp +++ b/src/main/webapp/WEB-INF/view/index.jsp @@ -4,7 +4,7 @@ - + <la:message key="labels.search_title" />