We use cookies to ensure you get the best experience on our website
首页 发现 帮助
注册 登录
0ct0pu5
/
fess
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

update orig jsp files

Shinsuke Sugaya 9 年之前
父节点
bdf62f2970
当前提交
e18480b664
共有 4 个文件被更改，包括 18 次插入 和 11 次删除
合并视图 显示文件统计
  1. 1 1
      src/main/resources/fess.xml
  2. 12 7
      src/main/webapp/WEB-INF/orig/view/error/error.jsp
  3. 3 3
      src/main/webapp/WEB-INF/orig/view/error/redirect.jsp
  4. 2 0
      src/main/webapp/WEB-INF/orig/view/searchResults.jsp

+ 1 - 1
src/main/resources/fess.xml
查看文件 

@@ -66,7 +66,7 @@
 
 		</postConstruct>
 
 		</postConstruct>
 
 		<postConstruct name="addDesignJspFileName">
 
 		<postConstruct name="addDesignJspFileName">
 
 			<arg>"error"</arg>
 
 			<arg>"error"</arg>
 
-			<arg>"error.jsp"</arg>
 
+			<arg>"error/error.jsp"</arg>
 
 		</postConstruct>
 
 		</postConstruct>
 
 		<postConstruct name="addDesignJspFileName">
 
 		<postConstruct name="addDesignJspFileName">
 
 			<arg>"errorHeader"</arg>
 
 			<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"%>
 
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
-<head>
 
+<head profile="http://a9.com/-/spec/opensearch/1.1/">
 
 <meta charset="utf-8">
 
 <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"
 
 <link href="${f:url('/css/style-base.css')}" rel="stylesheet"
 
 	type="text/css" />
 
 	type="text/css" />
 
 <link href="${f:url('/css/style.css')}" rel="stylesheet"
 
 <link href="${f:url('/css/style.css')}" rel="stylesheet"
 
@@ -17,16 +16,22 @@
 
 	<div class="container">
 
 	<div class="container">
 
 		<div class="content">
 
 		<div class="content">
 
 			<div class="center row">
 
 			<div class="center row">
 
-				<div class="span10">
 
+				<div class="col-md-12">
 
 					<h2>
 
 					<h2>
 
 						<la:message key="labels.error_title" />
 
 						<la:message key="labels.error_title" />
 
 					</h2>
 
 					</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>
 
 			</div>
 
 		</div>
 
 		</div>
 
 		<jsp:include page="footer.jsp" />
 
 		<jsp:include page="footer.jsp" />
 
 	</div>
 
 	</div>
 
+	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 
 	<script type="text/javascript"
 
 	<script type="text/javascript"
 
 		src="${f:url('/js/jquery-2.1.4.min.js')}"></script>
 
 		src="${f:url('/js/jquery-2.1.4.min.js')}"></script>
 
 	<script type="text/javascript" src="${f:url('/js/bootstrap.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());
 
 redirectPage.append(((javax.servlet.http.HttpServletRequest)request).getContextPath());
 
 if("systemError".equals(type)) {
 
 if("systemError".equals(type)) {
 
 	if(requestUri != null && !requestUri.endsWith("systemError")) {
 
 	if(requestUri != null && !requestUri.endsWith("systemError")) {
 
-		redirectPage.append("/error/systemError");
 
+		redirectPage.append("/error/systemerror");
 
 		response.sendRedirect(redirectPage.toString());
 
 		response.sendRedirect(redirectPage.toString());
 
 	} else {
 
 	} else {
 
 		response.sendError(statusCode);
 
 		response.sendError(statusCode);
 
@@ -16,10 +16,10 @@ if("systemError".equals(type)) {
 
 	redirectPage.append("/login/index?type=logout");
 
 	redirectPage.append("/login/index?type=logout");
 
 	response.sendRedirect(redirectPage.toString());
 
 	response.sendRedirect(redirectPage.toString());
 
 } else if("badRequest".equals(type)) {
 
 } else if("badRequest".equals(type)) {
 
-	redirectPage.append("/error/badRequest");
 
+	redirectPage.append("/error/badrequest");
 
 	response.sendRedirect(redirectPage.toString());
 
 	response.sendRedirect(redirectPage.toString());
 
 } else {
 
 } else {
 
-	redirectPage.append("/error/notFound?url=");
 
+	redirectPage.append("/error/notfound?url=");
 
 	redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8"));
 
 	redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8"));
 
 	response.sendRedirect(redirectPage.toString());
 
 	response.sendRedirect(redirectPage.toString());
 
 }
 
 }

+ 2 - 0
src/main/webapp/WEB-INF/orig/view/searchResults.jsp
查看文件 

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

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5