fix #911 add search options page to editable page items

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -1484,6 +1484,9 @@ public class FessLabels extends UserMessages {
     /** The key of the message: Results Page (No Result) */
     public static final String LABELS_design_file_searchNoResult = "{labels.design_file_searchNoResult}";
 
+    /** The key of the message: Search Options Page */
+    public static final String LABELS_design_file_searchOptions = "{labels.design_file_searchOptions}";
+
     /** The key of the message: Help Page (Content) */
     public static final String LABELS_design_file_help = "{labels.design_file_help}";
 

src/main/resources/fess.xml

@@ -51,6 +51,10 @@
 			<arg>"searchNoResult"</arg>
 			<arg>"searchNoResult.jsp"</arg>
 		</postConstruct>
+		<postConstruct name="addDesignJspFileName">
+			<arg>"searchOptions"</arg>
+			<arg>"searchOptions.jsp"</arg>
+		</postConstruct>
 		<postConstruct name="addDesignJspFileName">
 			<arg>"help"</arg>
 			<arg>"help.jsp"</arg>

src/main/resources/fess_label.properties

@@ -485,6 +485,7 @@ labels.design_file_footer=Footer
 labels.design_file_search=Results Page (Frame)
 labels.design_file_searchResults=Results Page (Content)
 labels.design_file_searchNoResult=Results Page (No Result)
+labels.design_file_searchOptions=Search Options Page
 labels.design_file_help=Help Page (Content)
 labels.design_file_header=Header
 labels.design_file_error=Search Error Page

src/main/resources/fess_label_en.properties

@@ -485,6 +485,7 @@ labels.design_file_footer=Footer
 labels.design_file_search=Results Page (Frame)
 labels.design_file_searchResults=Results Page (Content)
 labels.design_file_searchNoResult=Results Page (No Result)
+labels.design_file_searchOptions=Search Options Page
 labels.design_file_help=Help Page (Content)
 labels.design_file_header=Header
 labels.design_file_error=Search Error Page

src/main/resources/fess_label_ja.properties

@@ -478,6 +478,7 @@ labels.design_file_footer=\u30d5\u30c3\u30bf\u30fc
 labels.design_file_search=\u691c\u7d22\u7d50\u679c\u30da\u30fc\u30b8 (\u30d5\u30ec\u30fc\u30e0) 
 labels.design_file_searchResults=\u691c\u7d22\u7d50\u679c\u30da\u30fc\u30b8 (\u30b3\u30f3\u30c6\u30f3\u30c4) 
 labels.design_file_searchNoResult=\u691c\u7d22\u7d50\u679c\u30da\u30fc\u30b8 (\u7d50\u679c\u306a\u3057) 
+labels.design_file_searchOptions=\u691c\u7d22\u30aa\u30d7\u30b7\u30e7\u30f3\u30da\u30fc\u30b8
 labels.design_file_help=\u30d8\u30eb\u30d7\u30da\u30fc\u30b8 (\u30b3\u30f3\u30c6\u30f3\u30c4) 
 labels.design_file_header=\u30d8\u30c3\u30c0\u30fc
 labels.design_file_error=\u691c\u7d22\u30a8\u30e9\u30fc\u30da\u30fc\u30b8

src/main/webapp/WEB-INF/orig/view/error/header.jsp

@@ -73,7 +73,7 @@
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
-			<jsp:include page="../common/searchOptions.jsp" />
+			<jsp:include page="../searchOptions.jsp" />
 			<div>
 				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />

src/main/webapp/WEB-INF/orig/view/header.jsp

@@ -73,7 +73,7 @@ ${fe:facetForm()}${fe:geoForm()}
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
-			<jsp:include page="common/searchOptions.jsp" />
+			<jsp:include page="searchOptions.jsp" />
 			<div>
 				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />

src/main/webapp/WEB-INF/orig/view/index.jsp

@@ -128,7 +128,7 @@
 		</div>
 		<div id="searchOptions" class="control-options">
 			<div class="container">
-				<jsp:include page="common/searchOptions.jsp" />
+				<jsp:include page="searchOptions.jsp" />
 				<div>
 					<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 						<la:message key="labels.search_options_clear" />

src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp

@@ -127,6 +127,9 @@
 											<la:option value="searchNoResult">
 												<la:message key="labels.design_file_searchNoResult" />
 											</la:option>
+											<la:option value="searchOptions">
+												<la:message key="labels.design_file_searchOptions" />
+											</la:option>
 											<la:option value="help">
 												<la:message key="labels.design_file_help" />
 											</la:option>

src/main/webapp/WEB-INF/view/error/header.jsp

@@ -73,7 +73,7 @@
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
-			<jsp:include page="../common/searchOptions.jsp" />
+			<jsp:include page="../searchOptions.jsp" />
 			<div>
 				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />

src/main/webapp/WEB-INF/view/header.jsp

@@ -73,7 +73,7 @@ ${fe:facetForm()}${fe:geoForm()}
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
-			<jsp:include page="common/searchOptions.jsp" />
+			<jsp:include page="searchOptions.jsp" />
 			<div>
 				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />

src/main/webapp/WEB-INF/view/index.jsp

@@ -128,7 +128,7 @@
 		</div>
 		<div id="searchOptions" class="control-options">
 			<div class="container">
-				<jsp:include page="common/searchOptions.jsp" />
+				<jsp:include page="searchOptions.jsp" />
 				<div>
 					<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 						<la:message key="labels.search_options_clear" />

src/main/webapp/WEB-INF/view/searchOptions.jsp

@@ -0,0 +1,94 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
+<h3 id="searchOptionsLabel">
+	<la:message key="labels.search_options" />
+</h3>
+<div>
+	<fieldset class="form-group">
+		<label for="contentNum"><la:message key="labels.index_num" /></label>
+		<la:select property="num" styleId="numSearchOption"
+			styleClass="form-control">
+			<option value="">
+				<la:message key="labels.search_result_select_num" />
+			</option>
+			<la:option value="10">10</la:option>
+			<la:option value="20">20</la:option>
+			<la:option value="30">30</la:option>
+			<la:option value="40">40</la:option>
+			<la:option value="50">50</la:option>
+			<la:option value="100">100</la:option>
+		</la:select>
+	</fieldset>
+	<fieldset class="form-group">
+		<label for="contentSort"><la:message key="labels.index_sort" /></label>
+		<la:select property="sort" styleId="sortSearchOption"
+			styleClass="form-control">
+			<option value="">
+				<la:message key="labels.search_result_select_sort" />
+			</option>
+			<la:option value="score.desc">
+				<la:message key="labels.search_result_sort_score_desc" />
+			</la:option>
+			<la:option value="filename.asc">
+				<la:message key="labels.search_result_sort_filename_asc" />
+			</la:option>
+			<la:option value="filename.desc">
+				<la:message key="labels.search_result_sort_filename_desc" />
+			</la:option>
+			<la:option value="created.asc">
+				<la:message key="labels.search_result_sort_created_asc" />
+			</la:option>
+			<la:option value="created.desc">
+				<la:message key="labels.search_result_sort_created_desc" />
+			</la:option>
+			<la:option value="content_length.asc">
+				<la:message key="labels.search_result_sort_content_length_asc" />
+			</la:option>
+			<la:option value="content_length.desc">
+				<la:message key="labels.search_result_sort_content_length_desc" />
+			</la:option>
+			<la:option value="last_modified.asc">
+				<la:message key="labels.search_result_sort_last_modified_asc" />
+			</la:option>
+			<la:option value="last_modified.desc">
+				<la:message key="labels.search_result_sort_last_modified_desc" />
+			</la:option>
+			<c:if test="${searchLogSupport}">
+				<la:option value="click_count.asc">
+					<la:message key="labels.search_result_sort_click_count_asc" />
+				</la:option>
+				<la:option value="click_count.desc">
+					<la:message key="labels.search_result_sort_click_count_desc" />
+				</la:option>
+			</c:if>
+			<c:if test="${favoriteSupport}">
+				<la:option value="favorite_count.asc">
+					<la:message key="labels.search_result_sort_favorite_count_asc" />
+				</la:option>
+				<la:option value="favorite_count.desc">
+					<la:message key="labels.search_result_sort_favorite_count_desc" />
+				</la:option>
+			</c:if>
+		</la:select>
+	</fieldset>
+	<fieldset class="form-group">
+		<label for="contentLang"><la:message key="labels.index_lang" /></label>
+		<la:select property="lang" styleId="langSearchOption" multiple="true"
+			styleClass="form-control">
+			<c:forEach var="item" items="${langItems}">
+				<la:option value="${f:u(item.value)}">${f:h(item.label)}</la:option>
+			</c:forEach>
+		</la:select>
+	</fieldset>
+	<c:if test="${displayLabelTypeItems}">
+		<fieldset class="form-group">
+			<label for="contentLabelType"><la:message
+					key="labels.index_label" /></label>
+			<la:select property="fields.label" styleId="labelTypeSearchOption"
+				multiple="true" styleClass="form-control">
+				<c:forEach var="item" items="${labelTypeItems}">
+					<la:option value="${f:u(item.value)}">${f:h(item.label)}</la:option>
+				</c:forEach>
+			</la:select>
+		</fieldset>
+	</c:if>
+</div>