Browse Source

update orig jsp files

Shinsuke Sugaya 9 years ago
parent
commit
e18480b664

+ 1 - 1
src/main/resources/fess.xml

@@ -66,7 +66,7 @@
 		</postConstruct>
 		<postConstruct name="addDesignJspFileName">
 			<arg>"error"</arg>
-			<arg>"error.jsp"</arg>
+			<arg>"error/error.jsp"</arg>
 		</postConstruct>
 		<postConstruct name="addDesignJspFileName">
 			<arg>"errorHeader"</arg>

+ 12 - 7
src/main/webapp/WEB-INF/orig/view/error.jsp → src/main/webapp/WEB-INF/orig/view/error/error.jsp

@@ -1,12 +1,11 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <!DOCTYPE html>
 <html>
-<head>
+<head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-script-type" content="text/javascript" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title><la:message key="labels.error_title" /></title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="x-ua-compatible" content="ie=edge">
+<title><la:message key="labels.system_error_title" /></title>
 <link href="${f:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
 <link href="${f:url('/css/style.css')}" rel="stylesheet"
@@ -17,16 +16,22 @@
 	<div class="container">
 		<div class="content">
 			<div class="center row">
-				<div class="span10">
+				<div class="col-md-12">
 					<h2>
 						<la:message key="labels.error_title" />
 					</h2>
-					<div class="errormessage">${errorMessage}</div>
+					<div>
+						<la:info id="msg" message="true">
+							<div class="alert alert-info">${msg}</div>
+						</la:info>
+						<la:errors styleClass="list-unstyled"/>
+					</div>
 				</div>
 			</div>
 		</div>
 		<jsp:include page="footer.jsp" />
 	</div>
+	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-2.1.4.min.js')}"></script>
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>

+ 3 - 3
src/main/webapp/WEB-INF/orig/view/error/redirect.jsp

@@ -7,7 +7,7 @@ StringBuilder redirectPage = new StringBuilder();
 redirectPage.append(((javax.servlet.http.HttpServletRequest)request).getContextPath());
 if("systemError".equals(type)) {
 	if(requestUri != null && !requestUri.endsWith("systemError")) {
-		redirectPage.append("/error/systemError");
+		redirectPage.append("/error/systemerror");
 		response.sendRedirect(redirectPage.toString());
 	} else {
 		response.sendError(statusCode);
@@ -16,10 +16,10 @@ if("systemError".equals(type)) {
 	redirectPage.append("/login/index?type=logout");
 	response.sendRedirect(redirectPage.toString());
 } else if("badRequest".equals(type)) {
-	redirectPage.append("/error/badRequest");
+	redirectPage.append("/error/badrequest");
 	response.sendRedirect(redirectPage.toString());
 } else {
-	redirectPage.append("/error/notFound?url=");
+	redirectPage.append("/error/notfound?url=");
 	redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8"));
 	response.sendRedirect(redirectPage.toString());
 }

+ 2 - 0
src/main/webapp/WEB-INF/orig/view/searchResults.jsp

@@ -36,8 +36,10 @@
 						<div class="site ellipsis">
 							<cite>${f:h(doc.sitePath)}</cite>
 							<c:if test="${doc.has_cache=='true'}">
+								<small>
 								<la:link href="/cache/?docId=${doc.doc_id}${appendHighlightParams}" class="cache"><la:message
 										key="labels.search_result_cache" /></la:link>
+								</small>
 							</c:if>
 						</div>
 						<div class="more hidden-md-up">