fix #113
This commit is contained in:
Shinsuke Sugaya
parent
d40d52210d
commit
476dc98f1c
11 changed files with 222 additions and 111 deletions
|
|
@ -11,7 +11,7 @@
|
|||
type="text/css" />
|
||||
<link href="${f:url('/css/style.css')}" rel="stylesheet"
|
||||
type="text/css" />
|
||||
<script type="text/javascript" src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
<script type="text/javascript" src="${f:url('/js/jquery-1.11.0.min.js')}"></script>
|
||||
</head>
|
||||
<body>
|
||||
<jsp:include page="/WEB-INF/view/header.jsp" />
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<jsp:include page="footer.jsp" />
|
||||
</div>
|
||||
<script type="text/javascript"
|
||||
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
src="${f:url('/js/jquery-1.11.0.min.js')}"></script>
|
||||
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<jsp:include page="footer.jsp" />
|
||||
</div>
|
||||
<script type="text/javascript"
|
||||
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
src="${f:url('/js/jquery-1.11.0.min.js')}"></script>
|
||||
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -30,26 +30,24 @@
|
|||
</div>
|
||||
<div class="modal-body">
|
||||
<fieldset>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="clearfix">
|
||||
<label for="contentLabelType"><bean:message
|
||||
key="labels.index_label" /></label>
|
||||
<div class="input">
|
||||
<html:select property="fields.label" styleId="contentLabelType"
|
||||
multiple="true" styleClass="span4">
|
||||
<c:forEach var="item" items="${labelTypeItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
<span id="contentLabelTypeNoneSelectedText" class="hide"><bean:message
|
||||
key="labels.search_result_noneselect_label" /></span> <span
|
||||
id="contentLabelTypeSelectedText" class="hide"><bean:message
|
||||
key="labels.search_result_select_label" /></span>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentNum"><bean:message
|
||||
key="labels.index_num" /></label>
|
||||
<div class="input">
|
||||
<html:select property="num" styleId="contentNum"
|
||||
styleClass="span4" style="display:block;">
|
||||
<option value="">
|
||||
<bean: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>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentSort"><bean:message
|
||||
key="labels.index_sort" /></label>
|
||||
|
|
@ -81,23 +79,36 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentNum"><bean:message
|
||||
key="labels.index_num" /></label>
|
||||
<label for="contentLang"><bean:message
|
||||
key="labels.index_lang" /></label>
|
||||
<div class="input">
|
||||
<html:select property="num" styleId="contentNum"
|
||||
styleClass="span4" style="display:block;">
|
||||
<option value="">
|
||||
<bean: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 property="lang"
|
||||
styleId="langSearchOption" multiple="true"
|
||||
styleClass="span4">
|
||||
<c:forEach var="item" items="${langItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="clearfix">
|
||||
<label for="contentLabelType"><bean:message
|
||||
key="labels.index_label" /></label>
|
||||
<div class="input">
|
||||
<html:select property="fields.label" styleId="contentLabelType"
|
||||
multiple="true" styleClass="span4">
|
||||
<c:forEach var="item" items="${labelTypeItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
<jsp:include page="footer.jsp" />
|
||||
</div>
|
||||
<script type="text/javascript"
|
||||
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
src="${f:url('/js/jquery-1.11.0.min.js')}"></script>
|
||||
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<jsp:include page="footer.jsp" />
|
||||
</div>
|
||||
<script type="text/javascript"
|
||||
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
src="${f:url('/js/jquery-1.11.0.min.js')}"></script>
|
||||
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
|
||||
<s:form action="search" method="get" styleId="searchForm">
|
||||
<s:form action="search" method="get" styleId="searchForm" styleClass="searchResultForm">
|
||||
${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
|
|
@ -33,27 +33,24 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
|
|||
</div>
|
||||
<div class="modal-body">
|
||||
<fieldset>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="clearfix">
|
||||
<label for="contentLabelType"><bean:message
|
||||
key="labels.index_label" /></label>
|
||||
<div class="input">
|
||||
<html:select property="fields.label"
|
||||
styleId="labelTypeSearchOption" multiple="true"
|
||||
styleClass="span4">
|
||||
<c:forEach var="item" items="${labelTypeItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
<span id="contentLabelTypeNoneSelectedText" class="hide"><bean:message
|
||||
key="labels.search_result_noneselect_label" /></span> <span
|
||||
id="contentLabelTypeSelectedText" class="hide"><bean:message
|
||||
key="labels.search_result_select_label" /></span>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentNum"><bean:message
|
||||
key="labels.index_num" /></label>
|
||||
<div class="input">
|
||||
<html:select property="num" styleId="numSearchOption"
|
||||
styleClass="span4" style="display:block;">
|
||||
<option value="">
|
||||
<bean: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>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentSort"><bean:message
|
||||
key="labels.index_sort" /></label>
|
||||
|
|
@ -102,23 +99,37 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
|
|||
</div>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentNum"><bean:message
|
||||
key="labels.index_num" /></label>
|
||||
<label for="contentLang"><bean:message
|
||||
key="labels.index_lang" /></label>
|
||||
<div class="input">
|
||||
<html:select property="num" styleId="numSearchOption"
|
||||
styleClass="span4" style="display:block;">
|
||||
<option value="">
|
||||
<bean: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 property="lang"
|
||||
styleId="langSearchOption" multiple="true"
|
||||
styleClass="span4">
|
||||
<c:forEach var="item" items="${langItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="clearfix">
|
||||
<label for="contentLabelType"><bean:message
|
||||
key="labels.index_label" /></label>
|
||||
<div class="input">
|
||||
<html:select property="fields.label"
|
||||
styleId="labelTypeSearchOption" multiple="true"
|
||||
styleClass="span4">
|
||||
<c:forEach var="item" items="${labelTypeItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
|
@ -128,6 +139,9 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
|
|||
<button class="btn" data-dismiss="modal" aria-hidden="true">
|
||||
<bean:message key="labels.search_options_close" />
|
||||
</button>
|
||||
<button class="btn btn-primary" type="submit">
|
||||
<bean:message key="labels.search" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</s:form>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
</div>
|
||||
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
|
||||
<script type="text/javascript"
|
||||
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
src="${f:url('/js/jquery-1.11.0.min.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>
|
||||
|
|
|
|||
|
|
@ -85,27 +85,24 @@
|
|||
</div>
|
||||
<div class="modal-body">
|
||||
<fieldset>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="clearfix">
|
||||
<label for="contentLabelType"><bean:message
|
||||
key="labels.index_label" /></label>
|
||||
<div class="input">
|
||||
<html:select property="fields.label"
|
||||
styleId="labelTypeSearchOption" multiple="true"
|
||||
styleClass="span4">
|
||||
<c:forEach var="item" items="${labelTypeItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
<span id="contentLabelTypeNoneSelectedText" class="hide"><bean:message
|
||||
key="labels.search_result_noneselect_label" /></span> <span
|
||||
id="contentLabelTypeSelectedText" class="hide"><bean:message
|
||||
key="labels.search_result_select_label" /></span>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentNum"><bean:message
|
||||
key="labels.index_num" /></label>
|
||||
<div class="input">
|
||||
<html:select property="num" styleId="numSearchOption"
|
||||
styleClass="span4" style="display:block;">
|
||||
<option value="">
|
||||
<bean: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>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentSort"><bean:message
|
||||
key="labels.index_sort" /></label>
|
||||
|
|
@ -160,23 +157,37 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<label for="contentNum"><bean:message
|
||||
key="labels.index_num" /></label>
|
||||
<label for="contentLang"><bean:message
|
||||
key="labels.index_lang" /></label>
|
||||
<div class="input">
|
||||
<html:select property="num" styleId="numSearchOption"
|
||||
styleClass="span4" style="display:block;">
|
||||
<option value="">
|
||||
<bean: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 property="lang"
|
||||
styleId="langSearchOption" multiple="true"
|
||||
styleClass="span4">
|
||||
<c:forEach var="item" items="${langItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="clearfix">
|
||||
<label for="contentLabelType"><bean:message
|
||||
key="labels.index_label" /></label>
|
||||
<div class="input">
|
||||
<html:select property="fields.label"
|
||||
styleId="labelTypeSearchOption" multiple="true"
|
||||
styleClass="span4">
|
||||
<c:forEach var="item" items="${labelTypeItems}">
|
||||
<html:option value="${f:u(item.value)}">
|
||||
${f:h(item.label)}
|
||||
</html:option>
|
||||
</c:forEach>
|
||||
</html:select>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
|
@ -195,7 +206,7 @@
|
|||
</div>
|
||||
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
|
||||
<script type="text/javascript"
|
||||
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
src="${f:url('/js/jquery-1.11.0.min.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>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,70 @@
|
|||
<jsp:include page="header.jsp" />
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<c:if test="${fe:hswsize(null) != 0}">
|
||||
<div class="span9">
|
||||
<p id="searchOptionMenu">
|
||||
<span>
|
||||
<bean:message key="labels.searchoptions_menu_sort" />
|
||||
<a href="#searchOptions" data-toggle="modal">
|
||||
<c:if test="${empty sort}"><bean:message key="labels.searchoptions_score" /></c:if>
|
||||
<c:if test="${sort=='created.asc'}"><bean:message key="labels.search_result_sort_created_asc" /></c:if>
|
||||
<c:if test="${sort=='created.desc'}"><bean:message key="labels.search_result_sort_created_desc" /></c:if>
|
||||
<c:if test="${sort=='contentLength.asc'}"><bean:message key="labels.search_result_sort_contentLength_asc" /></c:if>
|
||||
<c:if test="${sort=='contentLength.desc'}"><bean:message key="labels.search_result_sort_contentLength_desc" /></c:if>
|
||||
<c:if test="${sort=='lastModified.asc'}"><bean:message key="labels.search_result_sort_lastModified_asc" /></c:if>
|
||||
<c:if test="${sort=='lastModified.desc'}"><bean:message key="labels.search_result_sort_lastModified_desc" /></c:if>
|
||||
<c:if test="${sort=='clickCount_l_x_dv.asc'}"><bean:message key="labels.search_result_sort_clickCount_asc" /></c:if>
|
||||
<c:if test="${sort=='clickCount_l_x_dv.desc'}"><bean:message key="labels.search_result_sort_clickCount_desc" /></c:if>
|
||||
<c:if test="${sort=='favoriteCount_l_x_dv.asc'}"><bean:message key="labels.search_result_sort_favoriteCount_asc" /></c:if>
|
||||
<c:if test="${sort=='favoriteCount_l_x_dv.desc'}"><bean:message key="labels.search_result_sort_favoriteCount_desc" /></c:if>
|
||||
</a>
|
||||
</span>
|
||||
<span>
|
||||
<bean:message key="labels.searchoptions_menu_num" />
|
||||
<a href="#searchOptions" data-toggle="modal">
|
||||
<bean:message key="labels.searchoptions_num" arg0="${f:h(num)}" />
|
||||
</a>
|
||||
</span>
|
||||
<span>
|
||||
<bean:message key="labels.searchoptions_menu_lang" />
|
||||
<a href="#searchOptions" data-toggle="modal">
|
||||
<c:if test="${empty lang}"><bean:message key="labels.searchoptions_all" /></c:if>
|
||||
<c:if test="${!empty lang}">
|
||||
<c:forEach var="sLang" items="${lang}">
|
||||
<c:forEach var="item" items="${langItems}">
|
||||
<c:if test="${item.value==sLang}">${f:h(item.label)}</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
</a>
|
||||
</span>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<span>
|
||||
<bean:message key="labels.searchoptions_menu_labels" />
|
||||
<a href="#searchOptions" data-toggle="modal">
|
||||
<c:if test="${empty fields.label}"><bean:message key="labels.searchoptions_all" /></c:if>
|
||||
<c:if test="${!empty fields.label}">
|
||||
<c:forEach var="sLabel" items="${fields.label}">
|
||||
<c:forEach var="item" items="${labelTypeItems}">
|
||||
<c:if test="${item.value==sLabel}">${f:h(item.label)}</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
</a>
|
||||
</span>
|
||||
</c:if>
|
||||
</p>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<c:if test="${!empty username}">
|
||||
<p class="username">
|
||||
<bean:message key="labels.searchheader_username" arg0="${f:h(username)}" />
|
||||
</p>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${fe:hswsize(null) != 0}">
|
||||
<div class="row">
|
||||
<div class="span12">
|
||||
<p class="hotSearchWordBody ellipsis">
|
||||
<bean:message key="labels.search_hot_search_word" />
|
||||
|
|
@ -30,8 +93,8 @@
|
|||
</c:forEach>
|
||||
</p>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<c:choose>
|
||||
<c:when test="${f:h(allRecordCount) != 0}">
|
||||
<jsp:include page="searchResults.jsp" />
|
||||
|
|
@ -47,7 +110,7 @@
|
|||
</div>
|
||||
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
|
||||
<script type="text/javascript"
|
||||
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
|
||||
src="${f:url('/js/jquery-1.11.0.min.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>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@
|
|||
<div class="description">${doc.contentDescription}</div>
|
||||
<div class="site ellipsis">
|
||||
<cite>${f:h(doc.site)}</cite>
|
||||
<c:if test="${doc.hasCache_s_s=='true'}">
|
||||
<a href="cache?docId=${doc.docId}${appendHighlightQueries}" class="cache"><bean:message
|
||||
key="labels.search_result_cache" /></a>
|
||||
</c:if>
|
||||
</div>
|
||||
<div class="more visible-phone">
|
||||
<a href="#result${s.index}"><bean:message key="labels.search_result_more" /></a>
|
||||
|
|
@ -73,7 +77,7 @@
|
|||
</c:forEach>
|
||||
</ol>
|
||||
</div>
|
||||
<div class="span4 visible-desktop">
|
||||
<div class="span4 visible-desktop visible-tablet">
|
||||
<%-- Side Content --%>
|
||||
<c:if test="${screenShotSupport}">
|
||||
<div id="screenshot"></div>
|
||||
|
|
@ -104,6 +108,14 @@
|
|||
</c:forEach>
|
||||
</c:forEach>
|
||||
</ul>
|
||||
<c:if test="${!empty additional}">
|
||||
<ul class="nav nav-list">
|
||||
<li class="reset">
|
||||
<s:link
|
||||
href="search?query=${f:u(query)}"><bean:message key="label.facet_label_reset" /></s:link>
|
||||
</li>
|
||||
</ul>
|
||||
</c:if>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue