We use cookies to ensure you get the best experience on our website
Trang chủ Khám phá Trợ giúp
Đăng ký Đăng nhập
0ct0pu5
/
fess
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu kéo về 0 Wiki
Browse Source

fix #33

Shinsuke Sugaya 11 năm trước cách đây
mục cha
82715dfecb
commit
1b88a10e07
12 tập tin đã thay đổi với 127 bổ sung và 40 xóa
View chưa được định nghĩa Hiển thị tình trạng sai khác
  1. 1 0
      src/main/resources/application.properties
  2. 1 0
      src/main/resources/application_ja.properties
  3. 6 2
      src/main/resources/fess.dicon
  4. 35 0
      src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp
  5. 4 4
      src/main/webapp/WEB-INF/orig/view/error/header.jsp
  6. 3 0
      src/main/webapp/WEB-INF/orig/view/error/redirect.jsp
  7. 22 5
      src/main/webapp/WEB-INF/orig/view/header.jsp
  8. 3 1
      src/main/webapp/WEB-INF/orig/view/help.jsp
  9. 27 6
      src/main/webapp/WEB-INF/orig/view/index.jsp
  10. 3 1
      src/main/webapp/WEB-INF/orig/view/search.jsp
  11. 19 19
      src/main/webapp/WEB-INF/orig/view/searchResults.jsp
  12. 3 2
      src/main/webapp/WEB-INF/view/admin/design/index.jsp

+ 1 - 0
src/main/resources/application.properties
Xem Tập Tin 

@@ -995,6 +995,7 @@ labels.design_file_errorFooter=Error Page (Footer)
 
 labels.design_file_errorNotFound=Error Page (Not Found)
 
 labels.design_file_errorNotFound=Error Page (Not Found)
 
 labels.design_file_errorSystem=Error Page (System Error)
 
 labels.design_file_errorSystem=Error Page (System Error)
 
 labels.design_file_errorRedirect=Error Page (Redirect)
 
 labels.design_file_errorRedirect=Error Page (Redirect)
 
+labels.design_file_errorBadRequest=Error Page (BadRequest)
 
 labels.design_delete_confirmation=Do you want to delete it?
 
 labels.design_delete_confirmation=Do you want to delete it?
 
 
 
 # view/admin/design/edit.jsp
 
 # view/admin/design/edit.jsp

+ 1 - 0
src/main/resources/application_ja.properties
Xem Tập Tin 

@@ -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_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_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_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?
 
 labels.design_delete_confirmation=\u524a\u9664\u3057\u307e\u3059\u304b?
 
 
 
 # view/admin/design/edit.jsp
 
 # view/admin/design/edit.jsp

+ 6 - 2
src/main/resources/fess.dicon
Xem Tập Tin 

@@ -80,6 +80,10 @@
 
 			<arg>"searchNoResult"</arg>
 
 			<arg>"searchNoResult"</arg>
 
 			<arg>"searchNoResult.jsp"</arg>
 
 			<arg>"searchNoResult.jsp"</arg>
 
 		</initMethod>
 
 		</initMethod>
 
+		<initMethod name="addDesignJspFileName">
 
+			<arg>"help"</arg>
 
+			<arg>"help.jsp"</arg>
 
+		</initMethod>
 
 		<initMethod name="addDesignJspFileName">
 
 		<initMethod name="addDesignJspFileName">
 
 			<arg>"error"</arg>
 
 			<arg>"error"</arg>
 
 			<arg>"error.jsp"</arg>
 
 			<arg>"error.jsp"</arg>
 
@@ -145,8 +149,8 @@
 
 			<arg>"error/redirect.jsp"</arg>
 
 			<arg>"error/redirect.jsp"</arg>
 
 		</initMethod>
 
 		</initMethod>
 
 		<initMethod name="addDesignJspFileName">
 
 		<initMethod name="addDesignJspFileName">
 
-			<arg>"help"</arg>
 
-			<arg>"help.jsp"</arg>
 
+			<arg>"errorBadRequest"</arg>
 
+			<arg>"error/badRequest.jsp"</arg>
 
 		</initMethod>
 
 		</initMethod>
 
 	</component>
 
 	</component>
 
 	<component name="crawlingSessionHelper" class="jp.sf.fess.helper.CrawlingSessionHelper">
 
 	<component name="crawlingSessionHelper" class="jp.sf.fess.helper.CrawlingSessionHelper">

+ 35 - 0
src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp
Xem Tập Tin 

@@ -0,0 +1,35 @@
 
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 
+<!DOCTYPE html>
 
+<% try{ %>
 
+<html>
 
+<head>
 
+<meta charset="utf-8">
 
+<meta http-equiv="content-style-type" content="text/css" />
 
+<meta http-equiv="content-script-type" content="text/javascript" />
 
+<title><bean: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"
 
+	type="text/css" />
 
+</head>
 
+<body>
 
+	<jsp:include page="header.jsp" />
 
+	<div class="container">
 
+		<div class="content">
 
+			<div class="center row">
 
+				<div class="span10">
 
+					<h2>
 
+						<bean:message key="labels.request_error_title" />
 
+					</h2>
 
+					<div class="errormessage"><bean:message key="labels.bad_request" /></div>
 
+				</div>
 
+			</div>
 
+		</div>
 
+		<jsp:include page="footer.jsp" />
 
+	</div>
 
+	<script type="text/javascript"
 
+		src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
 
+	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
 
+</body>
 
+</html>
 
+<% }catch(Exception e){ session.invalidate();}%>

+ 4 - 4
src/main/webapp/WEB-INF/orig/view/error/header.jsp
Xem Tập Tin 

@@ -59,11 +59,11 @@
 
 							<option value="">
 
 							<option value="">
 
 								<bean:message key="labels.search_result_select_sort" />
 
 								<bean:message key="labels.search_result_select_sort" />
 
 							</option>
 
 							</option>
 
-							<html:option value="tstamp.asc">
 
-								<bean:message key="labels.search_result_sort_tstamp_asc" />
 
+							<html:option value="created.asc">
 
+								<bean:message key="labels.search_result_sort_created_asc" />
 
 							</html:option>
 
 							</html:option>
 
-							<html:option value="tstamp.desc">
 
-								<bean:message key="labels.search_result_sort_tstamp_desc" />
 
+							<html:option value="created.desc">
 
+								<bean:message key="labels.search_result_sort_created_desc" />
 
 							</html:option>
 
 							</html:option>
 
 							<html:option value="contentLength.asc">
 
 							<html:option value="contentLength.asc">
 
 								<bean:message key="labels.search_result_sort_contentLength_asc" />
 
 								<bean:message key="labels.search_result_sort_contentLength_asc" />

+ 3 - 0
src/main/webapp/WEB-INF/orig/view/error/redirect.jsp
Xem Tập Tin 

@@ -15,6 +15,9 @@ if("systemError".equals(type)) {
 
 } else if("logOut".equals(type)) {
 
 } else if("logOut".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)) {
 
+	redirectPage.append("/error/badRequest");
 
+	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"));

+ 22 - 5
src/main/webapp/WEB-INF/orig/view/header.jsp
Xem Tập Tin 

@@ -9,7 +9,7 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
 
 						alt="<bean:message key="labels.header_brand_name" />" />
 
 						alt="<bean:message key="labels.header_brand_name" />" />
 
 				</s:link>
 
 				</s:link>
 
 				<div class="navbar-form pull-right">
 
 				<div class="navbar-form pull-right">
 
-					<html:text property="query" maxlength="1000" styleId="query" />
 
+					<html:text property="query" maxlength="1000" styleId="query" autocomplete="off"/>
 
 					<button class="btn medium btn-primary" type="submit" name="search"
 
 					<button class="btn medium btn-primary" type="submit" name="search"
 
 						id="searchButton">
 
 						id="searchButton">
 
 						<i class="icon-search icon-white"></i><span class="hidden-phone"><bean:message
 
 						<i class="icon-search icon-white"></i><span class="hidden-phone"><bean:message
 
@@ -63,11 +63,11 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
 
 							<option value="">
 
 							<option value="">
 
 								<bean:message key="labels.search_result_select_sort" />
 
 								<bean:message key="labels.search_result_select_sort" />
 
 							</option>
 
 							</option>
 
-							<html:option value="tstamp.asc">
 
-								<bean:message key="labels.search_result_sort_tstamp_asc" />
 
+							<html:option value="created.asc">
 
+								<bean:message key="labels.search_result_sort_created_asc" />
 
 							</html:option>
 
 							</html:option>
 
-							<html:option value="tstamp.desc">
 
-								<bean:message key="labels.search_result_sort_tstamp_desc" />
 
+							<html:option value="created.desc">
 
+								<bean:message key="labels.search_result_sort_created_desc" />
 
 							</html:option>
 
 							</html:option>
 
 							<html:option value="contentLength.asc">
 
 							<html:option value="contentLength.asc">
 
 								<bean:message key="labels.search_result_sort_contentLength_asc" />
 
 								<bean:message key="labels.search_result_sort_contentLength_asc" />
 
@@ -81,6 +81,23 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
 
 							<html:option value="lastModified.desc">
 
 							<html:option value="lastModified.desc">
 
 								<bean:message key="labels.search_result_sort_lastModified_desc" />
 
 								<bean:message key="labels.search_result_sort_lastModified_desc" />
 
 							</html:option>
 
 							</html:option>
 
+							<c:if test="${searchLogSupport}">
 
+							<html:option value="clickCount_l_x_dv.asc">
 
+								<bean:message key="labels.search_result_sort_clickCount_asc" />
 
+							</html:option>
 
+							<html:option value="clickCount_l_x_dv.desc">
 
+								<bean:message key="labels.search_result_sort_clickCount_desc" />
 
+							</html:option>
 
+							</c:if>
 
+							<c:if test="${favoriteSupport}">
 
+							<html:option value="favoriteCount_l_x_dv.asc">
 
+								<bean:message key="labels.search_result_sort_favoriteCount_asc" />
 
+							</html:option>
 
+							<html:option value="favoriteCount_l_x_dv.desc">
 
+								<bean:message
 
+									key="labels.search_result_sort_favoriteCount_desc" />
 
+							</html:option>
 
+							</c:if>
 
 						</html:select>
 
 						</html:select>
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>

+ 3 - 1
src/main/webapp/WEB-INF/orig/view/help.jsp
Xem Tập Tin 

@@ -26,9 +26,11 @@
 
 		</p>
 
 		</p>
 
 		<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-1.8.3.min.js')}"></script>
 
 		src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
 
-	<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
 
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
 
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
 
+	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
 
+	<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 27 - 6
src/main/webapp/WEB-INF/orig/view/index.jsp
Xem Tập Tin 

@@ -52,7 +52,7 @@
 
 						<div class="clearfix">
 
 						<div class="clearfix">
 
 							<div class="input">
 
 							<div class="input">
 
 								<html:text styleClass="query" property="query" size="50"
 
 								<html:text styleClass="query" property="query" size="50"
 
-									maxlength="1000" styleId="contentQuery" />
 
+									maxlength="1000" styleId="contentQuery" autocomplete="off" />
 
 							</div>
 
 							</div>
 
 						</div>
 
 						</div>
 
 						<c:if test="${fe:hswsize(null) != 0}">
 
 						<c:if test="${fe:hswsize(null) != 0}">
 
@@ -115,11 +115,11 @@
 
 											<option value="">
 
 											<option value="">
 
 												<bean:message key="labels.search_result_select_sort" />
 
 												<bean:message key="labels.search_result_select_sort" />
 
 											</option>
 
 											</option>
 
-											<html:option value="tstamp.asc">
 
-												<bean:message key="labels.search_result_sort_tstamp_asc" />
 
+											<html:option value="created.asc">
 
+												<bean:message key="labels.search_result_sort_created_asc" />
 
 											</html:option>
 
 											</html:option>
 
-											<html:option value="tstamp.desc">
 
-												<bean:message key="labels.search_result_sort_tstamp_desc" />
 
+											<html:option value="created.desc">
 
+												<bean:message key="labels.search_result_sort_created_desc" />
 
 											</html:option>
 
 											</html:option>
 
 											<html:option value="contentLength.asc">
 
 											<html:option value="contentLength.asc">
 
 												<bean:message
 
 												<bean:message
 
@@ -137,6 +137,25 @@
 
 												<bean:message
 
 												<bean:message
 
 													key="labels.search_result_sort_lastModified_desc" />
 
 													key="labels.search_result_sort_lastModified_desc" />
 
 											</html:option>
 
 											</html:option>
 
+											<c:if test="${searchLogSupport}">
 
+											<html:option value="clickCount_l_x_dv.asc">
 
+												<bean:message
 
+													key="labels.search_result_sort_clickCount_asc" />
 
+											</html:option>
 
+											<html:option value="clickCount_l_x_dv.desc">
 
+												<bean:message
 
+													key="labels.search_result_sort_clickCount_desc" />
 
+											</html:option>
 
+											</c:if><c:if test="${favoriteSupport}">
 
+											<html:option value="favoriteCount_l_x_dv.asc">
 
+												<bean:message
 
+													key="labels.search_result_sort_favoriteCount_asc" />
 
+											</html:option>
 
+											<html:option value="favoriteCount_l_x_dv.desc">
 
+												<bean:message
 
+													key="labels.search_result_sort_favoriteCount_desc" />
 
+											</html:option>
 
+											</c:if>
 
 										</html:select>
 
 										</html:select>
 
 									</div>
 
 									</div>
 
 								</div>
 
 								</div>
 
@@ -174,9 +193,11 @@
 
 		</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-1.8.3.min.js')}"></script>
 
 		src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
 
-	<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
 
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
 
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
 
+	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
 
+	<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 3 - 1
src/main/webapp/WEB-INF/orig/view/search.jsp
Xem Tập Tin 

@@ -45,9 +45,11 @@
 
 		</c:choose>
 
 		</c:choose>
 
 		<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-1.8.3.min.js')}"></script>
 
 		src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
 
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
 
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
 
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
 
+	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
 
+	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 19 - 19
src/main/webapp/WEB-INF/orig/view/searchResults.jsp
Xem Tập Tin 

@@ -22,16 +22,14 @@
 
 	</div>
 
 	</div>
 
 </c:if>
 
 </c:if>
 
 <div id="result" class="row content">
 
 <div id="result" class="row content">
 
-	<input type="hidden" id="queryId" value="${f:u(queryId)}" /> <input
 
-		type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 
+	<input type="hidden" id="queryId" value="${f:u(queryId)}" />
 
 	<input type="hidden" id="rt" value="${f:u(rt)}" />
 
 	<input type="hidden" id="rt" value="${f:u(rt)}" />
 
 	<div class="span8">
 
 	<div class="span8">
 
 		<ol>
 
 		<ol>
 
 			<c:forEach var="doc" varStatus="s" items="${documentItems}">
 
 			<c:forEach var="doc" varStatus="s" items="${documentItems}">
 
 				<li id="result${s.index}">
 
 				<li id="result${s.index}">
 
 					<h3 class="title">
 
 					<h3 class="title">
 
-						<a href="${doc.urlLink}" class="link">
 
-							${f:h(doc.contentTitle)} </a>
 
+						<a class="link" href="${doc.urlLink}" data-uri="${doc.urlLink}" data-id="${doc.docId}">${f:h(doc.contentTitle)}</a>
 
 					</h3>
 
 					</h3>
 
 					<div class="body">
 
 					<div class="body">
 
 						<div class="description">${doc.contentDescription}</div>
 
 						<div class="description">${doc.contentDescription}</div>
 
@@ -42,30 +40,32 @@
 
 							<a href="#result${s.index}"><bean:message key="labels.search_result_more" /></a>
 
 							<a href="#result${s.index}"><bean:message key="labels.search_result_more" /></a>
 
 						</div>
 
 						</div>
 
 						<div class="info">
 
 						<div class="info">
 
-							<c:if test="${doc.tstamp!=null && doc.tstamp!=''}">
 
-								<bean:message key="labels.search_result_tstamp" />
 
-								<fmt:formatDate value="${fe:parseDate(doc.tstamp)}" type="BOTH" />
 
-								<span class="br-phone"></span>
 
-								<span class="hidden-phone">-</span>
 
+							<c:if test="${doc.created!=null && doc.created!=''}">
 
+								<c:set var="hasInfo" value="true"/>
 
+								<bean:message key="labels.search_result_created" />
 
+								<fmt:formatDate value="${fe:parseDate(doc.created)}" type="BOTH" />
 
 							</c:if>
 
 							</c:if>
 
 							<c:if test="${doc.lastModified!=null && doc.lastModified!=''}">
 
 							<c:if test="${doc.lastModified!=null && doc.lastModified!=''}">
 
+								<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
 
 								<bean:message key="labels.search_result_lastModified" />
 
 								<bean:message key="labels.search_result_lastModified" />
 
 								<fmt:formatDate value="${fe:parseDate(doc.lastModified)}" type="BOTH" />
 
 								<fmt:formatDate value="${fe:parseDate(doc.lastModified)}" type="BOTH" />
 
-								<span class="br-phone"></span>
 
-								<span class="br-tablet"></span>
 
-								<span class="hidden-phone hidden-tablet">-</span>
 
 							</c:if>
 
 							</c:if>
 
 							<c:if test="${doc.contentLength!=null && doc.contentLength!=''}">
 
 							<c:if test="${doc.contentLength!=null && doc.contentLength!=''}">
 
+								<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
 
 								<bean:message key="labels.search_result_size"
 
 								<bean:message key="labels.search_result_size"
 
 									arg0="${f:h(doc.contentLength)}" />
 
 									arg0="${f:h(doc.contentLength)}" />
 
-								<span class="br-phone"></span>
 
-								<span class="hidden-phone">-</span>
 
+							</c:if>
 
+							<c:if test="${searchLogSupport}">
 
+								<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
 
+								<bean:message key="labels.search_click_count"
 
+									arg0="${f:h(doc.clickCount_l_x_dv)}" />
 
 							</c:if>
 
 							</c:if>
 
 							<c:if test="${favoriteSupport}">
 
 							<c:if test="${favoriteSupport}">
 
-								<a href="#${doc.url}" class="favorite"><bean:message
 
-										key="labels.search_result_favorite" /></a>
 
+								<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
 
+								<a href="#${doc.docId}" class="favorite"><bean:message
 
+										key="labels.search_result_favorite" /> (${f:h(doc.favoriteCount_l_x_dv)})</a>
 
 								<span class="favorited"><bean:message
 
 								<span class="favorited"><bean:message
 
-										key="labels.search_result_favorited" /></span>
 
+										key="labels.search_result_favorited"/> <span class="favorited-count">(${f:h(doc.favoriteCount_l_x_dv)})</span></span>
 
 							</c:if>
 
 							</c:if>
 
 						</div>
 
 						</div>
 
 					</div>
 
 					</div>
 
@@ -82,10 +82,10 @@
 
 			<div class="well span3">
 
 			<div class="well span3">
 
 				<ul class="nav nav-list">
 
 				<ul class="nav nav-list">
 
 					<c:forEach var="fieldData" items="${facetResponse.fieldList}">
 
 					<c:forEach var="fieldData" items="${facetResponse.fieldList}">
 
-						<c:if test="${fieldData.name == 'label'}">
 
+						<c:if test="${fieldData.name == 'label' && fieldData.valueCountMap.size() > 0}">
 
 					<li class="nav-header"><bean:message key="label.facet_label_title" /></li>
 
 					<li class="nav-header"><bean:message key="label.facet_label_title" /></li>
 
 							<c:forEach var="countEntry" items="${fieldData.valueCountMap}">
 
 							<c:forEach var="countEntry" items="${fieldData.valueCountMap}">
 
-								<c:if test="${countEntry.value != 0}">
 
+								<c:if test="${countEntry.value != 0 && fe:labelexists(countEntry.key)}">
 
 					<li><s:link
 
 					<li><s:link
 
 							href="search?query=${f:u(query)}&additional=label:${f:u(countEntry.key)}${pagingQuery}${fe:facetQuery()}${fe:mltQuery()}${fe:geoQuery()}">
 
 							href="search?query=${f:u(query)}&additional=label:${f:u(countEntry.key)}${pagingQuery}${fe:facetQuery()}${fe:mltQuery()}${fe:geoQuery()}">
 
 							${f:h(fe:label(countEntry.key))} (${f:h(countEntry.value)})</s:link></li>
 
 							${f:h(fe:label(countEntry.key))} (${f:h(countEntry.value)})</s:link></li>

+ 3 - 2
src/main/webapp/WEB-INF/view/admin/design/index.jsp
Xem Tập Tin 

@@ -101,12 +101,12 @@
 
 								<th>
 
 								<th>
 
 								<html:select property="fileName" style="width:300px;">
 
 								<html:select property="fileName" style="width:300px;">
 
 									<html:option value="index"><bean:message key="labels.design_file_index" /></html:option>
 
 									<html:option value="index"><bean:message key="labels.design_file_index" /></html:option>
 
-									<html:option value="footer"><bean:message key="labels.design_file_footer" /></html:option>
 
-									<html:option value="help"><bean:message key="labels.design_file_help" /></html:option>
 
 									<html:option value="header"><bean:message key="labels.design_file_header" /></html:option>
 
 									<html:option value="header"><bean:message key="labels.design_file_header" /></html:option>
 
+									<html:option value="footer"><bean:message key="labels.design_file_footer" /></html:option>
 
 									<html:option value="search"><bean:message key="labels.design_file_search" /></html:option>
 
 									<html:option value="search"><bean:message key="labels.design_file_search" /></html:option>
 
 									<html:option value="searchResults"><bean:message key="labels.design_file_searchResults" /></html:option>
 
 									<html:option value="searchResults"><bean:message key="labels.design_file_searchResults" /></html:option>
 
 									<html:option value="searchNoResult"><bean:message key="labels.design_file_searchNoResult" /></html:option>
 
 									<html:option value="searchNoResult"><bean:message key="labels.design_file_searchNoResult" /></html:option>
 
+									<html:option value="help"><bean:message key="labels.design_file_help" /></html:option>
 
 									<html:option value="error"><bean:message key="labels.design_file_error" /></html:option>
 
 									<html:option value="error"><bean:message key="labels.design_file_error" /></html:option>
 
 									<%-- Mobile --%>
 
 									<%-- Mobile --%>
 
 									<html:option value="mobileIndex"><bean:message key="labels.design_file_mobileIndex" /></html:option>
 
 									<html:option value="mobileIndex"><bean:message key="labels.design_file_mobileIndex" /></html:option>
 
@@ -126,6 +126,7 @@
 
 									<html:option value="errorNotFound"><bean:message key="labels.design_file_errorNotFound" /></html:option>
 
 									<html:option value="errorNotFound"><bean:message key="labels.design_file_errorNotFound" /></html:option>
 
 									<html:option value="errorSystem"><bean:message key="labels.design_file_errorSystem" /></html:option>
 
 									<html:option value="errorSystem"><bean:message key="labels.design_file_errorSystem" /></html:option>
 
 									<html:option value="errorRedirect"><bean:message key="labels.design_file_errorRedirect" /></html:option>
 
 									<html:option value="errorRedirect"><bean:message key="labels.design_file_errorRedirect" /></html:option>
 
+									<html:option value="errorBadRequest"><bean:message key="labels.design_file_errorBadRequest" /></html:option>
 
 								</html:select>
 
 								</html:select>
 
 								</th>
 
 								</th>
 
 								<td style="text-align: center;">
 
 								<td style="text-align: center;">

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