Shinsuke Sugaya 9 gadi atpakaļ
vecāks
revīzija
491c7293be

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

@@ -37,80 +37,80 @@ ${fe:facetForm()}${fe:geoForm()}
 					<label for="contentNum"><la:message
 							key="labels.index_num" /></label>
 					<div class="input">
-						<html:select property="num" styleId="numSearchOption"
+						<la:select property="num" styleId="numSearchOption"
 							styleClass="span4" style="display:block;">
 							<option value="">
 								<la:message key="labels.search_result_select_num" />
 							</option>
-							<html:option value="10">10</html:option>
-							<html:option value="20">20</html:option>
-							<html:option value="30">30</html:option>
-							<html:option value="40">40</html:option>
-							<html:option value="50">50</html:option>
-							<html:option value="100">100</html:option>
-						</html:select>
+							<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>
 					</div>
 				</div>
 				<div class="clearfix">
 					<label for="contentSort"><la:message
 							key="labels.index_sort" /></label>
 					<div class="input">
-						<html:select property="sort" styleId="sortSearchOption"
+						<la:select property="sort" styleId="sortSearchOption"
 							styleClass="span4" style="display:block;">
 							<option value="">
 								<la:message key="labels.search_result_select_sort" />
 							</option>
-							<html:option value="created.asc">
+							<la:option value="created.asc">
 								<la:message key="labels.search_result_sort_created_asc" />
-							</html:option>
-							<html:option value="created.desc">
+							</la:option>
+							<la:option value="created.desc">
 								<la:message key="labels.search_result_sort_created_desc" />
-							</html:option>
-							<html:option value="contentLength.asc">
+							</la:option>
+							<la:option value="contentLength.asc">
 								<la:message key="labels.search_result_sort_contentLength_asc" />
-							</html:option>
-							<html:option value="contentLength.desc">
+							</la:option>
+							<la:option value="contentLength.desc">
 								<la:message key="labels.search_result_sort_contentLength_desc" />
-							</html:option>
-							<html:option value="lastModified.asc">
+							</la:option>
+							<la:option value="lastModified.asc">
 								<la:message key="labels.search_result_sort_lastModified_asc" />
-							</html:option>
-							<html:option value="lastModified.desc">
+							</la:option>
+							<la:option value="lastModified.desc">
 								<la:message key="labels.search_result_sort_lastModified_desc" />
-							</html:option>
+							</la:option>
 							<c:if test="${searchLogSupport}">
-							<html:option value="clickCount_l_x_dv.asc">
+							<la:option value="clickCount_l_x_dv.asc">
 								<la:message key="labels.search_result_sort_clickCount_asc" />
-							</html:option>
-							<html:option value="clickCount_l_x_dv.desc">
+							</la:option>
+							<la:option value="clickCount_l_x_dv.desc">
 								<la:message key="labels.search_result_sort_clickCount_desc" />
-							</html:option>
+							</la:option>
 							</c:if>
 							<c:if test="${favoriteSupport}">
-							<html:option value="favoriteCount_l_x_dv.asc">
+							<la:option value="favoriteCount_l_x_dv.asc">
 								<la:message key="labels.search_result_sort_favoriteCount_asc" />
-							</html:option>
-							<html:option value="favoriteCount_l_x_dv.desc">
+							</la:option>
+							<la:option value="favoriteCount_l_x_dv.desc">
 								<la:message
 									key="labels.search_result_sort_favoriteCount_desc" />
-							</html:option>
+							</la:option>
 							</c:if>
-						</html:select>
+						</la:select>
 					</div>
 				</div>
 				<div class="clearfix">
 					<label for="contentLang"><la:message
 							key="labels.index_lang" /></label>
 					<div class="input">
-						<html:select property="lang"
+						<la:select property="lang"
 							styleId="langSearchOption" multiple="true"
 							styleClass="span4">
 							<c:forEach var="item" items="${langItems}">
-								<html:option value="${f:u(item.value)}">
+								<la:option value="${f:u(item.value)}">
 													${f:h(item.label)}
-												</html:option>
+												</la:option>
 							</c:forEach>
-						</html:select>
+						</la:select>
 					</div>
 				</div>
 				<c:if test="${displayLabelTypeItems}">
@@ -118,15 +118,15 @@ ${fe:facetForm()}${fe:geoForm()}
 						<label for="contentLabelType"><la:message
 								key="labels.index_label" /></label>
 						<div class="input">
-							<html:select property="fields.label"
+							<la:select property="fields.label"
 								styleId="labelTypeSearchOption" multiple="true"
 								styleClass="span4">
 								<c:forEach var="item" items="${labelTypeItems}">
-									<html:option value="${f:u(item.value)}">
+									<la:option value="${f:u(item.value)}">
 														${f:h(item.label)}
-													</html:option>
+													</la:option>
 								</c:forEach>
-							</html:select>
+							</la:select>
 						</div>
 					</div>
 				</c:if>

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

@@ -65,7 +65,7 @@
 								<p class="hotSearchWordBody ellipsis">
 									<la:message key="labels.search_hot_search_word" />
 									<c:forEach var="item" items="${fe:hsw(null, 5)}">
-										<la:link href="search?query=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+										<la:link href="/search/search?query=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 									</c:forEach>
 								</p>
 							</div>

+ 1 - 1
src/main/webapp/WEB-INF/view/search.jsp

@@ -93,7 +93,7 @@
 					<p class="hotSearchWordBody ellipsis">
 						<la:message key="labels.search_hot_search_word" />
 						<c:forEach var="item" items="${fe:hsw(null, 5)}">
-							<html:link href="search?query=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</html:link>
+							<la:link href="/search/search?query=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 						</c:forEach>
 					</p>
 				</div>

+ 6 - 6
src/main/webapp/WEB-INF/view/searchResults.jsp

@@ -91,7 +91,7 @@
 							<c:forEach var="countEntry" items="${fieldData.valueCountMap}">
 								<c:if test="${countEntry.value != 0 && fe:labelexists(countEntry.key)}">
 					<li><la:link
-							href="search?query=${f:u(query)}&additional=label:${f:u(countEntry.key)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
+							href="/search/search?query=${f:u(query)}&additional=label:${f:u(countEntry.key)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
 							${f:h(fe:label(countEntry.key))} (${f:h(countEntry.value)})</la:link></li>
 								</c:if>
 							</c:forEach>
@@ -102,7 +102,7 @@
 						<c:forEach var="queryEntry" items="${facetQueryView.queryMap}">
 								<c:if test="${facetResponse.queryCountMap[queryEntry.value] != 0}">
 					<li><la:link
-							href="search?query=${f:u(query)}&additional=${f:u(queryEntry.value)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
+							href="/search/search?query=${f:u(query)}&additional=${f:u(queryEntry.value)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
 							<la:message key="${queryEntry.key}" /> (${f:h(facetResponse.queryCountMap[queryEntry.value])})</la:link></li>
 								</c:if>
 						</c:forEach>
@@ -112,7 +112,7 @@
 				<ul class="nav nav-list">
 					<li class="reset">
 						<la:link
-							href="search?query=${f:u(query)}"><la:message key="label.facet_label_reset" /></la:link>
+							href="/search/search?query=${f:u(query)}"><la:message key="label.facet_label_reset" /></la:link>
 					</li>
 				</ul>
 				</c:if>
@@ -125,7 +125,7 @@
 		<ul>
 			<c:if test="${existPrevPage}">
 				<li class="prev"><la:link
-						href="prev?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
+						href="/search/prev?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
 						<la:message key="labels.prev_page" />
 					</la:link></li>
 			</c:if>
@@ -139,12 +139,12 @@
 					<c:if test="${pageNumber == currentPageNumber && pageNumber >= currentPageNumber - 2 && pageNumber <= currentPageNumber + 2}">class="active"</c:if>
 					>
 					<la:link
-						href="move?query=${f:u(query)}&pn=${f:u(pageNumber)}&num=${f:u(pageSize)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">${f:h(pageNumber)}</la:link>
+						href="/search/move?query=${f:u(query)}&pn=${f:u(pageNumber)}&num=${f:u(pageSize)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">${f:h(pageNumber)}</la:link>
 				</li>
 			</c:forEach>
 			<c:if test="${existNextPage}">
 				<li class="next"><la:link
-						href="next?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
+						href="/search/next?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}${pagingQuery}${fe:facetQuery()}${fe:geoQuery()}">
 						<la:message key="labels.next_page" />
 					</la:link></li>
 			</c:if>