#1535 add sort, size, language, label
This commit is contained in:
Shinsuke Sugaya
parent
7336f53679
commit
66fa5776cf
4 changed files with 189 additions and 73 deletions
|
|
@ -885,7 +885,7 @@ labels.doc_score=Score:
|
|||
labels.development_mode_warning=Running as Development mode. For production use, please install a standalone elasticsearch server.
|
||||
labels.advance=Advance
|
||||
labels.advance_search_title=Advanced Search
|
||||
labels.advance_search_must_queries=All these words:
|
||||
labels.advance_search_phrase_query=This exact word or phrase:
|
||||
labels.advance_search_should_queries=Any of these words:
|
||||
labels.advance_search_not_queries=None of these words:
|
||||
labels.advance_search_must_queries=All these words
|
||||
labels.advance_search_phrase_query=This exact word or phrase
|
||||
labels.advance_search_should_queries=Any of these words
|
||||
labels.advance_search_not_queries=None of these words
|
||||
|
|
|
|||
|
|
@ -885,7 +885,7 @@ labels.doc_score=Score:
|
|||
labels.development_mode_warning=Running as Development mode. For production use, please install a standalone elasticsearch server.
|
||||
labels.advance=Advance
|
||||
labels.advance_search_title=Advanced Search
|
||||
labels.advance_search_must_queries=All these words:
|
||||
labels.advance_search_phrase_query=This exact word or phrase:
|
||||
labels.advance_search_should_queries=Any of these words:
|
||||
labels.advance_search_not_queries=None of these words:
|
||||
labels.advance_search_must_queries=All these words
|
||||
labels.advance_search_phrase_query=This exact word or phrase
|
||||
labels.advance_search_should_queries=Any of these words
|
||||
labels.advance_search_not_queries=None of these words
|
||||
|
|
|
|||
|
|
@ -887,7 +887,7 @@ labels.doc_score=\u30b9\u30b3\u30a2:
|
|||
labels.development_mode_warning=\u958b\u767a\u30e2\u30fc\u30c9\u3067\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059\u3002\u672c\u904b\u7528\u74b0\u5883\u3067\u306fElasticsearch\u3092\u5225\u9014\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u304f\u3060\u3055\u3044\u3002
|
||||
labels.advance=\u8a73\u7d30\u691c\u7d22
|
||||
labels.advance_search_title=\u8a73\u7d30\u691c\u7d22
|
||||
labels.advance_search_must_queries=\u3059\u3079\u3066\u306e\u5358\u8a9e\u3092\u542b\u3080:
|
||||
labels.advance_search_phrase_query=\u30d5\u30ec\u30fc\u30ba\u3092\u542b\u3080:
|
||||
labels.advance_search_should_queries=\u3044\u305a\u308c\u304b\u306e\u5358\u8a9e\u3092\u542b\u3080:
|
||||
labels.advance_search_not_queries=\u5358\u8a9e\u3092\u542b\u3081\u306a\u3044:
|
||||
labels.advance_search_must_queries=\u3059\u3079\u3066\u306e\u5358\u8a9e\u3092\u542b\u3080
|
||||
labels.advance_search_phrase_query=\u8a9e\u9806\u3082\u542b\u3081\u305f\u5b8c\u5168\u4e00\u81f4
|
||||
labels.advance_search_should_queries=\u3044\u305a\u308c\u304b\u306e\u5358\u8a9e\u3092\u542b\u3080
|
||||
labels.advance_search_not_queries=\u542b\u3081\u306a\u3044\u5358\u8a9e
|
||||
|
|
|
|||
|
|
@ -7,19 +7,16 @@
|
|||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title><la:message key="labels.search_title" /></title>
|
||||
<c:if test="${osddLink}">
|
||||
<link rel="search" type="application/opensearchdescription+xml"
|
||||
href="${fe:url('/osdd')}"
|
||||
title="<la:message key="labels.index_osdd_title" />" />
|
||||
<link rel="search" type="application/opensearchdescription+xml" href="${fe:url('/osdd')}"
|
||||
title="<la:message key="labels.index_osdd_title" />"
|
||||
/>
|
||||
</c:if>
|
||||
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet"
|
||||
type="text/css" />
|
||||
<link href="${fe:url('/css/style-base.css')}" rel="stylesheet" type="text/css" />
|
||||
<link href="${fe:url('/css/style.css')}" rel="stylesheet" type="text/css" />
|
||||
<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet"
|
||||
type="text/css" />
|
||||
<link href="${fe:url('/css/font-awesome.min.css')}" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<la:form styleClass="form-stacked" action="/search/" method="get"
|
||||
styleId="searchForm">
|
||||
<la:form styleClass="form-stacked" action="/search/" method="get" styleId="searchForm">
|
||||
${fe:facetForm()}${fe:geoForm()}
|
||||
<nav class="navbar navbar-dark bg-inverse navbar-static-top pos-f-t">
|
||||
<div id="content" class="container">
|
||||
|
|
@ -28,9 +25,9 @@
|
|||
<c:when test="${!empty username && username != 'guest'}">
|
||||
<li class="nav-item">
|
||||
<div class="dropdown">
|
||||
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
|
||||
href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"> <i class="fa fa-user"></i>${username}
|
||||
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"
|
||||
> <i class="fa fa-user"></i>${username}
|
||||
</a>
|
||||
<div class="dropdown-menu" aria-labelledby="userMenu">
|
||||
<c:if test="${editableUser == true}">
|
||||
|
|
@ -51,16 +48,15 @@
|
|||
</li>
|
||||
</c:when>
|
||||
<c:when test="${ pageLoginLink }">
|
||||
<li class="nav-item username"><la:link href="/login"
|
||||
styleClass="nav-link" role="button" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<li class="nav-item username"><la:link href="/login" styleClass="nav-link" role="button"
|
||||
aria-haspopup="true" aria-expanded="false"
|
||||
>
|
||||
<i class="fa fa-sign-in"></i>
|
||||
<la:message key="labels.login" />
|
||||
</la:link></li>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
<li class="nav-item"><la:link href="/help"
|
||||
styleClass="nav-link help-link">
|
||||
<li class="nav-item"><la:link href="/help" styleClass="nav-link help-link">
|
||||
<i class="fa fa-question-circle"></i>
|
||||
<la:message key="labels.index_help" />
|
||||
</la:link></li>
|
||||
|
|
@ -69,7 +65,7 @@
|
|||
</nav>
|
||||
<div class="container">
|
||||
<div class="row content">
|
||||
<div class="center-block center">
|
||||
<div class="center-block">
|
||||
<h2>
|
||||
<la:message key="labels.advance_search_title" />
|
||||
</h2>
|
||||
|
|
@ -78,50 +74,171 @@
|
|||
<la:info id="msg" message="true">
|
||||
<div class="alert alert-info">${msg}</div>
|
||||
</la:info>
|
||||
<la:errors header="errors.front_header"
|
||||
footer="errors.front_footer" prefix="errors.front_prefix"
|
||||
suffix="errors.front_suffix" />
|
||||
<la:errors header="errors.front_header" footer="errors.front_footer" prefix="errors.front_prefix"
|
||||
suffix="errors.front_suffix"
|
||||
/>
|
||||
</div>
|
||||
<div class="centered col-lg-7 col-md-8 col-sm-8 col-xs-12">
|
||||
<div class="form-group row">
|
||||
<label for="as_q" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_must_queries"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_q" name="as.q" value="${f:h(fe:join(as.q))}">
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="as_epq" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_phrase_query"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_epq" name="as.epq" value="${f:h(fe:join(as.epq))}">
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="as_oq" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_should_queries"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_oq" name="as.oq" value="${f:h(fe:join(as.oq))}">
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="as_nq" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_not_queries"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_nq" name="as.nq" value="${f:h(fe:join(as.nq))}">
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="contentNum" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.index_num"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="contentSort" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.index_sort"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="contentLang" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.index_lang"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="form-group row">
|
||||
<label for="as_q" class="col-lg-4 col-md-6 col-sm-6 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_must_queries"
|
||||
<label for="contentLabelType" class="col-lg-3 col-md-4 col-sm-5 col-xs-6 col-form-label"><la:message
|
||||
key="labels.index_label"
|
||||
/></label>
|
||||
<div class="col-lg-8 col-md-6 col-sm-6 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_q" name="as.q" value="${f:h(fe:join(as.q))}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="as_epq" class="col-lg-4 col-md-6 col-sm-6 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_phrase_query"
|
||||
/></label>
|
||||
<div class="col-lg-8 col-md-6 col-sm-6 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_epq" name="as.epq" value="${f:h(fe:join(as.epq))}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="as_oq" class="col-lg-4 col-md-6 col-sm-6 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_should_queries"
|
||||
/></label>
|
||||
<div class="col-lg-8 col-md-6 col-sm-6 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_oq" name="as.oq" value="${f:h(fe:join(as.oq))}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="as_nq" class="col-lg-4 col-md-6 col-sm-6 col-xs-6 col-form-label"><la:message
|
||||
key="labels.advance_search_not_queries"
|
||||
/></label>
|
||||
<div class="col-lg-8 col-md-6 col-sm-6 col-xs-6">
|
||||
<input class="form-control" type="text" id="as_nq" name="as.nq" value="${f:h(fe:join(as.nq))}">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-lg-4 hidden-md-down">
|
||||
<!-- TODO -->
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<div class="clearfix searchButtonBox btn-group">
|
||||
<button type="submit" name="search" id="searchButton" class="btn btn-primary">
|
||||
<i class="fa fa-search"></i>
|
||||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
</div>
|
||||
<div class="center">
|
||||
<button type="submit" name="search" id="searchButton" class="btn btn-primary">
|
||||
<i class="fa fa-search"></i>
|
||||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -134,9 +251,9 @@
|
|||
<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
|
||||
<la:message key="labels.search_options_clear" />
|
||||
</button>
|
||||
<button type="button" class="btn btn-secondary pull-right"
|
||||
data-toggle="control-options" data-target="#searchOptions"
|
||||
id="searchOptionsCloseButton">
|
||||
<button type="button" class="btn btn-secondary pull-right" data-toggle="control-options"
|
||||
data-target="#searchOptions" id="searchOptionsCloseButton"
|
||||
>
|
||||
<i class="fa fa-times-circle"></i>
|
||||
<la:message key="labels.search_options_close" />
|
||||
</button>
|
||||
|
|
@ -145,8 +262,7 @@
|
|||
</div>
|
||||
</la:form>
|
||||
<input type="hidden" id="contextPath" value="${contextPath}" />
|
||||
<script type="text/javascript"
|
||||
src="${fe:url('/js/jquery-3.2.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/jquery-3.2.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/bootstrap.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue