fix #2867 Upgrade to Bootstrap 5.3: Adjust classes and attributes in JSP files for compatibility.
This commit is contained in:
Shinsuke Sugaya
parent
162081c2e2
commit
cd478515f4
25 changed files with 223 additions and 266 deletions
|
|
@ -25,20 +25,20 @@
|
|||
alt="<la:message key="labels.header_brand_name" />"
|
||||
class="align-items-center" />
|
||||
</la:link>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar"
|
||||
aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="navbar">
|
||||
<div class="mr-auto"></div>
|
||||
<div class="me-auto"></div>
|
||||
<ul class="nav navbar-nav">
|
||||
<c:if test="${eoled}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle text-danger"></em></a>
|
||||
</li>
|
||||
</c:if>
|
||||
<c:if test="${developmentMode}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left"
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left"
|
||||
title="<la:message key="labels.development_mode_warning" />"
|
||||
><a class="nav-link active" href="${installationLink}" target="_olh"><em
|
||||
class="fa fa-exclamation-triangle text-warning"
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
<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"
|
||||
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"
|
||||
> <em class="fa fa-fw fa-user"></em>${username}
|
||||
</a>
|
||||
|
|
@ -102,51 +102,43 @@
|
|||
suffix="errors.front_suffix"
|
||||
/>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_q" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_epq" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_oq" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_nq" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentNum" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_num"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<la:select property="num" styleId="numSearchOption" styleClass="form-control">
|
||||
<option value="">
|
||||
<la:message key="labels.search_result_select_num" />
|
||||
|
|
@ -159,14 +151,12 @@
|
|||
<la:option value="100">100</la:option>
|
||||
</la:select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentSort" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_sort"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<la:select property="sort" styleId="sortSearchOption" styleClass="form-control">
|
||||
<option value="">
|
||||
<la:message key="labels.search_result_select_sort" />
|
||||
|
|
@ -216,44 +206,38 @@
|
|||
</c:if>
|
||||
</la:select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentLang" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_lang"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentLabelType" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_label"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_timestamp" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_timestamp"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<select id="as_timestamp" name="as.timestamp" class="form-control">
|
||||
<option value=""><la:message key="labels.advance_search_timestamp_default" /></option>
|
||||
<option value="[now-1d/d TO *]"
|
||||
|
|
@ -270,14 +254,12 @@
|
|||
><la:message key="labels.advance_search_timestamp_pastyear" /></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_filetype" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_filetype"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<select id="as_filetype" name="as.filetype" class="form-control">
|
||||
<option value=""><la:message key="labels.advance_search_filetype_default" /></option>
|
||||
<option value="html" <c:if test="${as.filetype.contains('html')}">selected</c:if>><la:message
|
||||
|
|
@ -297,14 +279,12 @@
|
|||
/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_occt" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_occt"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<select id="as_occt" name="as.occt" class="form-control">
|
||||
<option value=""><la:message key="labels.advance_search_occt_default" /></option>
|
||||
<option value="allintitle" <c:if test="${as.occt.contains('allintitle')}">selected</c:if>><la:message
|
||||
|
|
@ -315,25 +295,24 @@
|
|||
/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_sitesearch" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_sitesearch"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<input class="form-control" type="text" id="as_sitesearch" name="as.sitesearch" value="${f:h(fe:join(as.sitesearch))}">
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<button type="submit" name="search" id="searchButton" class="btn btn-primary mx-auto">
|
||||
<em class="fa fa-search"></em>
|
||||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-auto">
|
||||
<button type="submit" name="search" id="searchButton"
|
||||
class="btn btn-primary mx-auto">
|
||||
<em class="fa fa-search"></em>
|
||||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
<jsp:include page="footer.jsp" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
|
||||
<footer role="contentinfo">
|
||||
<div class="container text-center">
|
||||
<p class="textmuted">
|
||||
<p class="text-muted">
|
||||
<la:message key="labels.footer.copyright" />
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,33 +11,31 @@
|
|||
class="align-items-center" />
|
||||
</la:link>
|
||||
<div
|
||||
class="navbar-form col-md-6 col-sm-8 col-7 mr-auto p-0"
|
||||
class="d-flex col-md-6 col-sm-8 col-7 me-auto p-0"
|
||||
role="search">
|
||||
<div class="input-group">
|
||||
<la:text property="q" maxlength="1000" styleId="query"
|
||||
styleClass="form-control" autocomplete="off" />
|
||||
<span class="input-group-append">
|
||||
<button type="submit" name="search" id="searchButton"
|
||||
class="btn btn-primary">
|
||||
<em class="fa fa-search"></em>
|
||||
</button>
|
||||
<button type="button" class="btn btn-light"
|
||||
data-toggle="control-options" data-target="#searchOptions"
|
||||
id="searchOptionsButton">
|
||||
<em class="fa fa-cog"></em> <span class="sr-only"><la:message
|
||||
key="labels.header_form_option_btn" /></span>
|
||||
</button>
|
||||
</span>
|
||||
<button type="submit" name="search" id="searchButton"
|
||||
class="btn btn-primary">
|
||||
<em class="fa fa-search"></em>
|
||||
</button>
|
||||
<button type="button" class="btn btn-light"
|
||||
data-bs-toggle="collapse" data-bs-target="#searchOptions"
|
||||
id="searchOptionsButton">
|
||||
<em class="fa fa-cog"></em> <span class="visually-hidden"><la:message
|
||||
key="labels.header_form_option_btn" /></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="nav navbar-nav d-none d-md-flex">
|
||||
<c:if test="${eoled}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle text-danger"></em></a>
|
||||
</li>
|
||||
</c:if>
|
||||
<c:if test="${developmentMode}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left"
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left"
|
||||
title="<la:message key="labels.development_mode_warning" />"
|
||||
><a class="nav-link active" href="${installationLink}" target="_olh"><em
|
||||
class="fa fa-exclamation-triangle text-warning"
|
||||
|
|
@ -47,7 +45,7 @@
|
|||
<c:when test="${!empty username && username != 'guest'}">
|
||||
<li class="nav-item">
|
||||
<div class="dropdown">
|
||||
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
|
||||
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown"
|
||||
href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"> <em class="fa fa-fw fa-user"></em>
|
||||
<span>${username}</span>
|
||||
|
|
@ -88,7 +86,7 @@
|
|||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
<div id="searchOptions" class="control-options">
|
||||
<div id="searchOptions" class="collapse">
|
||||
<div class="container">
|
||||
<jsp:include page="/WEB-INF/view/searchOptions.jsp" />
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -21,15 +21,14 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<div class="text-end">
|
||||
<a href="#"><la:message key="labels.footer_back_to_top" /></a>
|
||||
</div>
|
||||
</main>
|
||||
<jsp:include page="footer.jsp" />
|
||||
<input type="hidden" id="contextPath" value="${contextPath}" />
|
||||
<script type="text/javascript"
|
||||
src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script src="${fe:url('/js/admin/popper.min.js')}" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/popper.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/bootstrap.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
|
||||
|
|
|
|||
|
|
@ -23,20 +23,20 @@
|
|||
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
|
||||
<div id="content" class="container">
|
||||
<div class="navbar-brand"></div>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar"
|
||||
aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="navbar">
|
||||
<div class="mr-auto"></div>
|
||||
<div class="me-auto"></div>
|
||||
<ul class="nav navbar-nav">
|
||||
<c:if test="${eoled}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle text-danger"></em></a>
|
||||
</li>
|
||||
</c:if>
|
||||
<c:if test="${developmentMode}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left"
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left"
|
||||
title="<la:message key="labels.development_mode_warning" />"
|
||||
><a class="nav-link active" href="${installationLink}" target="_olh"><em
|
||||
class="fa fa-exclamation-triangle text-warning"
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<c:when test="${!empty username && username != 'guest'}">
|
||||
<li class="nav-item">
|
||||
<div class="dropdown">
|
||||
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
|
||||
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown"
|
||||
href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"> <em class="fa fa-fw fa-user"></em>${username}
|
||||
</a>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
<div id="searchOptions" class="control-options">
|
||||
<div id="searchOptions" class="collapse">
|
||||
<div class="container">
|
||||
<jsp:include page="searchOptions.jsp" />
|
||||
<div>
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
<legend><la:message key="labels.search" /></legend>
|
||||
<div class="clearfix">
|
||||
<div class="mx-auto col-10 col-sm-8 col-md-8 col-lg-6">
|
||||
<la:text styleClass="query form-control center-block"
|
||||
<la:text styleClass="query form-control"
|
||||
property="q" size="50" maxlength="1000" styleId="contentQuery"
|
||||
autocomplete="off" />
|
||||
</div>
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
<c:if test="${3 <= s.index}">
|
||||
<la:link styleClass="d-none d-sm-inline"
|
||||
<la:link styleClass="d-none d-sm-inline-block"
|
||||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
<button type="button" class="btn btn-outline-secondary"
|
||||
data-toggle="control-options" data-target="#searchOptions"
|
||||
data-bs-toggle="collapse" data-bs-target="#searchOptions"
|
||||
id="searchOptionsButton">
|
||||
<em class="fa fa-cog"></em>
|
||||
<la:message key="labels.index_form_option_btn" />
|
||||
|
|
@ -167,8 +167,8 @@
|
|||
<jsp:include page="footer.jsp" />
|
||||
</la:form>
|
||||
<input type="hidden" id="contextPath" value="${contextPath}" />
|
||||
<script type="text/javascript"
|
||||
src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/popper.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/bootstrap.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
<main id="content" class="container">
|
||||
<ul class="list-inline">
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_sort" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <c:if test="${empty sort}">
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <c:if test="${empty sort}">
|
||||
<la:message key="labels.searchoptions_score" />
|
||||
</c:if> <c:if test="${sort=='score.desc'}">
|
||||
<la:message key="labels.searchoptions_score" />
|
||||
|
|
@ -57,13 +57,13 @@
|
|||
</c:if>
|
||||
</a></li>
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_num" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <la:message
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <la:message
|
||||
key="labels.searchoptions_num" arg0="${f:h(num)}" />
|
||||
</a></li>
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_lang" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <c:if test="${empty lang}">
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <c:if test="${empty lang}">
|
||||
<la:message key="labels.searchoptions_all" />
|
||||
</c:if> <c:if test="${!empty lang}">
|
||||
<c:forEach var="sLang" items="${lang}">
|
||||
|
|
@ -75,8 +75,8 @@
|
|||
</a></li>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_labels" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <c:if
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <c:if
|
||||
test="${empty fields.label}">
|
||||
<la:message key="labels.searchoptions_all" />
|
||||
</c:if> <c:if test="${!empty fields.label}">
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
<c:if test="${3 <= s.index}">
|
||||
<la:link styleClass="d-none d-sm-inline"
|
||||
<la:link styleClass="d-none d-sm-inline-block"
|
||||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
<c:if test="${3 <= s.index}">
|
||||
<la:link styleClass="d-none d-sm-inline"
|
||||
<la:link styleClass="d-none d-sm-inline-block"
|
||||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
<c:choose>
|
||||
<c:when test="${f:h(allRecordCount) != 0}">
|
||||
<jsp:include page="searchResults.jsp" />
|
||||
<div class="text-right">
|
||||
<div class="text-end">
|
||||
<a href="#"><la:message key="labels.footer_back_to_top" /></a>
|
||||
</div>
|
||||
</c:when>
|
||||
|
|
@ -148,9 +148,9 @@
|
|||
</main>
|
||||
<jsp:include page="footer.jsp" />
|
||||
<input type="hidden" id="contextPath" value="${contextPath}" />
|
||||
<script type="text/javascript"
|
||||
src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/clipboard.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/popper.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/bootstrap.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
|
||||
<%-- query did not match any document --%>
|
||||
<div id="result" class="row">
|
||||
<div class="col-md-8 alert">
|
||||
<div class="col-md-8 alert alert-info">
|
||||
<la:message key="labels.did_not_match" arg0="${displayQuery}" />
|
||||
</div>
|
||||
<div class="col-md-4"><%-- Side Content --%></div>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<la:message key="labels.search_options" />
|
||||
</h3>
|
||||
<div>
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_num" /></legend>
|
||||
<label for="contentNum"><la:message key="labels.index_num" /></label>
|
||||
<la:select property="num" styleId="numSearchOption"
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
<la:option value="100">100</la:option>
|
||||
</la:select>
|
||||
</fieldset>
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_sort" /></legend>
|
||||
<label for="contentSort"><la:message key="labels.index_sort" /></label>
|
||||
<la:select property="sort" styleId="sortSearchOption"
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
</c:if>
|
||||
</la:select>
|
||||
</fieldset>
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_lang" /></legend>
|
||||
<label for="contentLang"><la:message key="labels.index_lang" /></label>
|
||||
<la:select property="lang" styleId="langSearchOption" multiple="true"
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
</la:select>
|
||||
</fieldset>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_label" /></legend>
|
||||
<label for="contentLabelType"><la:message
|
||||
key="labels.index_label" /></label>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
</h3>
|
||||
<div class="body">
|
||||
<c:if test="${thumbnailSupport && !empty doc.thumbnail}">
|
||||
<div class="mr-3">
|
||||
<div class="me-3">
|
||||
<a class="link d-none d-sm-flex" href="${doc.url_link}" data-uri="${doc.url_link}" data-id="${doc.doc_id}"
|
||||
data-order="${s.index}"
|
||||
> <img src="${fe:url('/images/blank.png')}" alt="thumbnail"
|
||||
|
|
@ -70,19 +70,19 @@
|
|||
</c:if>
|
||||
<c:if test="${doc.content_length!=null && doc.content_length!=''}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:message key="labels.search_result_size"
|
||||
arg0="${fe:formatFileSize(doc.content_length)}" />
|
||||
</c:if>
|
||||
<c:if test="${searchLogSupport && doc.click_count!=null && doc.click_count>0}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:message key="labels.search_click_views"
|
||||
arg0="${f:h(doc.click_count)}" />
|
||||
</c:if>
|
||||
<c:if test="${doc.has_cache=='true'}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:link href="/cache/?docId=${doc.doc_id}${appendHighlightParams}"
|
||||
class="cache">
|
||||
<la:message key="labels.search_result_cache" />
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
</c:if>
|
||||
<c:if test="${doc.similar_docs_count!=null&&doc.similar_docs_count>1}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:link href="/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}&sdh=${f:u(fe:sdh(doc.similar_docs_hash))}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<la:message key="labels.search_result_similar"
|
||||
arg0="${fe:formatFileSize(doc.similar_docs_count-1)}" />
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
</c:if>
|
||||
<c:if test="${favoriteSupport}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<a href="#${doc.doc_id}" class="favorite"><i class="far fa-star"></i></a>
|
||||
<span class="favorited"><i class="fas fa-star"></i></span>
|
||||
</c:if>
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
<li class="list-group-item"><la:link
|
||||
href="/search?q=${f:u(q)}&ex_q=label%3a${f:u(countEntry.key)}&sdh=${f:u(fe:sdh(sh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
${f:h(fe:label(countEntry.key))}
|
||||
<span class="badge badge-secondary badge-pill float-right">${f:h(countEntry.value)}</span>
|
||||
<span class="badge rounded-pill text-bg-secondary float-end">${f:h(countEntry.value)}</span>
|
||||
</la:link></li>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
href="/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(queryEntry.value)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<c:if test="${fn:startsWith(queryEntry.key, 'labels.')}"><la:message key="${queryEntry.key}" /></c:if>
|
||||
<c:if test="${not fn:startsWith(queryEntry.key, 'labels.')}">${f:h(queryEntry.key)}</c:if>
|
||||
<span class="badge badge-secondary badge-pill float-right">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
|
||||
<span class="badge rounded-pill text-bg-secondary float-end">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
|
||||
</la:link></li>
|
||||
<c:set var="facetFound" value="T"/>
|
||||
</c:if>
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
</ul>
|
||||
</c:forEach>
|
||||
<c:if test="${!empty ex_q}">
|
||||
<div class="float-right">
|
||||
<div class="d-flex justify-content-end">
|
||||
<la:link href="/search?q=${f:u(q)}"
|
||||
styleClass="btn btn-link btn-sm">
|
||||
<la:message key="labels.facet_label_reset" />
|
||||
|
|
@ -162,24 +162,24 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<nav id="subfooter" class="mx-auto">
|
||||
<ul class="pagination">
|
||||
<ul class="pagination justify-content-center">
|
||||
<c:if test="${existPrevPage}">
|
||||
<li class="page-item"><la:link styleClass="page-link" aria-label="Previous"
|
||||
href="/search/prev?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<span aria-hidden="true">«</span>
|
||||
<span class="sr-only"><la:message key="labels.prev_page" /></span>
|
||||
<span class="visually-hidden"><la:message key="labels.prev_page" /></span>
|
||||
</la:link></li>
|
||||
</c:if>
|
||||
<c:if test="${!existPrevPage}">
|
||||
<li class="page-item disabled" aria-label="Previous"><a class="page-link" href="#">
|
||||
<span aria-hidden="true">«</span> <span class="sr-only"><la:message
|
||||
<span aria-hidden="true">«</span> <span class="visually-hidden"><la:message
|
||||
key="labels.prev_page" /></span>
|
||||
</a></li>
|
||||
</c:if>
|
||||
<c:forEach var="pageNumber" varStatus="s" items="${pageNumberList}">
|
||||
<li
|
||||
<c:choose>
|
||||
<c:when test="${pageNumber < currentPageNumber - 2 || pageNumber > currentPageNumber + 2}">class="page-item d-none d-sm-inline"</c:when>
|
||||
<c:when test="${pageNumber < currentPageNumber - 2 || pageNumber > currentPageNumber + 2}">class="page-item d-none d-sm-inline-block"</c:when>
|
||||
<c:when test="${pageNumber == currentPageNumber && pageNumber >= currentPageNumber - 2 && pageNumber <= currentPageNumber + 2}">class="page-item active"</c:when>
|
||||
<c:otherwise>class="page-item"</c:otherwise>
|
||||
</c:choose>>
|
||||
|
|
@ -190,13 +190,13 @@
|
|||
<c:if test="${existNextPage}">
|
||||
<li class="page-item"><la:link styleClass="page-link" aria-label="Next"
|
||||
href="/search/next?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<span class="sr-only"><la:message key="labels.next_page" /></span>
|
||||
<span class="visually-hidden"><la:message key="labels.next_page" /></span>
|
||||
<span aria-hidden="true">»</span>
|
||||
</la:link></li>
|
||||
</c:if>
|
||||
<c:if test="${!existNextPage}">
|
||||
<li class="page-item disabled" aria-label="Next"><a class="page-link" href="#"> <span
|
||||
class="sr-only"><la:message key="labels.next_page" /></span> <span
|
||||
class="visually-hidden"><la:message key="labels.next_page" /></span> <span
|
||||
aria-hidden="true">»</span>
|
||||
</a></li>
|
||||
</c:if>
|
||||
|
|
|
|||
|
|
@ -25,20 +25,20 @@
|
|||
alt="<la:message key="labels.header_brand_name" />"
|
||||
class="align-items-center" />
|
||||
</la:link>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar"
|
||||
aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="navbar">
|
||||
<div class="mr-auto"></div>
|
||||
<div class="me-auto"></div>
|
||||
<ul class="nav navbar-nav">
|
||||
<c:if test="${eoled}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle text-danger"></em></a>
|
||||
</li>
|
||||
</c:if>
|
||||
<c:if test="${developmentMode}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left"
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left"
|
||||
title="<la:message key="labels.development_mode_warning" />"
|
||||
><a class="nav-link active" href="${installationLink}" target="_olh"><em
|
||||
class="fa fa-exclamation-triangle text-warning"
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
<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"
|
||||
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"
|
||||
> <em class="fa fa-fw fa-user"></em>${username}
|
||||
</a>
|
||||
|
|
@ -102,51 +102,43 @@
|
|||
suffix="errors.front_suffix"
|
||||
/>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_q" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_epq" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_oq" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_nq" class="col-lg-3 col-md-4 col-sm-5 col-12 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">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentNum" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_num"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<la:select property="num" styleId="numSearchOption" styleClass="form-control">
|
||||
<option value="">
|
||||
<la:message key="labels.search_result_select_num" />
|
||||
|
|
@ -159,14 +151,12 @@
|
|||
<la:option value="100">100</la:option>
|
||||
</la:select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentSort" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_sort"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<la:select property="sort" styleId="sortSearchOption" styleClass="form-control">
|
||||
<option value="">
|
||||
<la:message key="labels.search_result_select_sort" />
|
||||
|
|
@ -216,44 +206,38 @@
|
|||
</c:if>
|
||||
</la:select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentLang" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_lang"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="contentLabelType" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.index_label"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-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 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_timestamp" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_timestamp"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<select id="as_timestamp" name="as.timestamp" class="form-control">
|
||||
<option value=""><la:message key="labels.advance_search_timestamp_default" /></option>
|
||||
<option value="[now-1d/d TO *]"
|
||||
|
|
@ -270,14 +254,12 @@
|
|||
><la:message key="labels.advance_search_timestamp_pastyear" /></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_filetype" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_filetype"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<select id="as_filetype" name="as.filetype" class="form-control">
|
||||
<option value=""><la:message key="labels.advance_search_filetype_default" /></option>
|
||||
<option value="html" <c:if test="${as.filetype.contains('html')}">selected</c:if>><la:message
|
||||
|
|
@ -297,14 +279,12 @@
|
|||
/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_occt" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_occt"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<select id="as_occt" name="as.occt" class="form-control">
|
||||
<option value=""><la:message key="labels.advance_search_occt_default" /></option>
|
||||
<option value="allintitle" <c:if test="${as.occt.contains('allintitle')}">selected</c:if>><la:message
|
||||
|
|
@ -315,25 +295,24 @@
|
|||
/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="mb-3 row">
|
||||
<label for="as_sitesearch" class="col-lg-3 col-md-4 col-sm-5 col-12 col-form-label"><la:message
|
||||
key="labels.advance_search_sitesearch"
|
||||
/></label>
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-xs-6">
|
||||
<div class="col-lg-5 col-md-8 col-sm-7 col-6">
|
||||
<input class="form-control" type="text" id="as_sitesearch" name="as.sitesearch" value="${f:h(fe:join(as.sitesearch))}">
|
||||
</div>
|
||||
<div class="col-lg-4 d-none d-lg-flex align-items-center">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<button type="submit" name="search" id="searchButton" class="btn btn-primary mx-auto">
|
||||
<em class="fa fa-search"></em>
|
||||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-auto">
|
||||
<button type="submit" name="search" id="searchButton"
|
||||
class="btn btn-primary mx-auto">
|
||||
<em class="fa fa-search"></em>
|
||||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
<jsp:include page="footer.jsp" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
|
||||
<footer role="contentinfo">
|
||||
<div class="container text-center">
|
||||
<p class="textmuted">
|
||||
<p class="text-muted">
|
||||
<la:message key="labels.footer.copyright" />
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,33 +11,31 @@
|
|||
class="align-items-center" />
|
||||
</la:link>
|
||||
<div
|
||||
class="navbar-form col-md-6 col-sm-8 col-7 mr-auto p-0"
|
||||
class="d-flex col-md-6 col-sm-8 col-7 me-auto p-0"
|
||||
role="search">
|
||||
<div class="input-group">
|
||||
<la:text property="q" maxlength="1000" styleId="query"
|
||||
styleClass="form-control" autocomplete="off" />
|
||||
<span class="input-group-append">
|
||||
<button type="submit" name="search" id="searchButton"
|
||||
class="btn btn-primary">
|
||||
<em class="fa fa-search"></em>
|
||||
</button>
|
||||
<button type="button" class="btn btn-light"
|
||||
data-toggle="control-options" data-target="#searchOptions"
|
||||
id="searchOptionsButton">
|
||||
<em class="fa fa-cog"></em> <span class="sr-only"><la:message
|
||||
key="labels.header_form_option_btn" /></span>
|
||||
</button>
|
||||
</span>
|
||||
<button type="submit" name="search" id="searchButton"
|
||||
class="btn btn-primary">
|
||||
<em class="fa fa-search"></em>
|
||||
</button>
|
||||
<button type="button" class="btn btn-light"
|
||||
data-bs-toggle="collapse" data-bs-target="#searchOptions"
|
||||
id="searchOptionsButton">
|
||||
<em class="fa fa-cog"></em> <span class="visually-hidden"><la:message
|
||||
key="labels.header_form_option_btn" /></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="nav navbar-nav d-none d-md-flex">
|
||||
<c:if test="${eoled}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle text-danger"></em></a>
|
||||
</li>
|
||||
</c:if>
|
||||
<c:if test="${developmentMode}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left"
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left"
|
||||
title="<la:message key="labels.development_mode_warning" />"
|
||||
><a class="nav-link active" href="${installationLink}" target="_olh"><em
|
||||
class="fa fa-exclamation-triangle text-warning"
|
||||
|
|
@ -47,7 +45,7 @@
|
|||
<c:when test="${!empty username && username != 'guest'}">
|
||||
<li class="nav-item">
|
||||
<div class="dropdown">
|
||||
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
|
||||
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown"
|
||||
href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"> <em class="fa fa-fw fa-user"></em>
|
||||
<span>${username}</span>
|
||||
|
|
@ -88,7 +86,7 @@
|
|||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
<div id="searchOptions" class="control-options">
|
||||
<div id="searchOptions" class="collapse">
|
||||
<div class="container">
|
||||
<jsp:include page="/WEB-INF/view/searchOptions.jsp" />
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -21,15 +21,14 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<div class="text-end">
|
||||
<a href="#"><la:message key="labels.footer_back_to_top" /></a>
|
||||
</div>
|
||||
</main>
|
||||
<jsp:include page="footer.jsp" />
|
||||
<input type="hidden" id="contextPath" value="${contextPath}" />
|
||||
<script type="text/javascript"
|
||||
src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script src="${fe:url('/js/admin/popper.min.js')}" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/popper.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/bootstrap.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
|
||||
|
|
|
|||
|
|
@ -23,20 +23,20 @@
|
|||
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
|
||||
<div id="content" class="container">
|
||||
<div class="navbar-brand"></div>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar"
|
||||
aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="navbar">
|
||||
<div class="mr-auto"></div>
|
||||
<div class="me-auto"></div>
|
||||
<ul class="nav navbar-nav">
|
||||
<c:if test="${eoled}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left" title="<la:message key="labels.eol_error" />">
|
||||
<a class="nav-link active" href="${eolLink}" target="_olh"><em class="fas fa-times-circle text-danger"></em></a>
|
||||
</li>
|
||||
</c:if>
|
||||
<c:if test="${developmentMode}">
|
||||
<li class="nav-item" data-toggle="tooltip" data-placement="left"
|
||||
<li class="nav-item" data-bs-toggle="tooltip" data-placement="left"
|
||||
title="<la:message key="labels.development_mode_warning" />"
|
||||
><a class="nav-link active" href="${installationLink}" target="_olh"><em
|
||||
class="fa fa-exclamation-triangle text-warning"
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<c:when test="${!empty username && username != 'guest'}">
|
||||
<li class="nav-item">
|
||||
<div class="dropdown">
|
||||
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
|
||||
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown"
|
||||
href="#" role="button" aria-haspopup="true"
|
||||
aria-expanded="false"> <em class="fa fa-fw fa-user"></em>${username}
|
||||
</a>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
<div id="searchOptions" class="control-options">
|
||||
<div id="searchOptions" class="collapse">
|
||||
<div class="container">
|
||||
<jsp:include page="searchOptions.jsp" />
|
||||
<div>
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
<legend><la:message key="labels.search" /></legend>
|
||||
<div class="clearfix">
|
||||
<div class="mx-auto col-10 col-sm-8 col-md-8 col-lg-6">
|
||||
<la:text styleClass="query form-control center-block"
|
||||
<la:text styleClass="query form-control"
|
||||
property="q" size="50" maxlength="1000" styleId="contentQuery"
|
||||
autocomplete="off" />
|
||||
</div>
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
<c:if test="${3 <= s.index}">
|
||||
<la:link styleClass="d-none d-sm-inline"
|
||||
<la:link styleClass="d-none d-sm-inline-block"
|
||||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
<la:message key="labels.index_form_search_btn" />
|
||||
</button>
|
||||
<button type="button" class="btn btn-outline-secondary"
|
||||
data-toggle="control-options" data-target="#searchOptions"
|
||||
data-bs-toggle="collapse" data-bs-target="#searchOptions"
|
||||
id="searchOptionsButton">
|
||||
<em class="fa fa-cog"></em>
|
||||
<la:message key="labels.index_form_option_btn" />
|
||||
|
|
@ -167,8 +167,8 @@
|
|||
<jsp:include page="footer.jsp" />
|
||||
</la:form>
|
||||
<input type="hidden" id="contextPath" value="${contextPath}" />
|
||||
<script type="text/javascript"
|
||||
src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/popper.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/bootstrap.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/index.js')}"></script>
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
<main id="content" class="container">
|
||||
<ul class="list-inline">
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_sort" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <c:if test="${empty sort}">
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <c:if test="${empty sort}">
|
||||
<la:message key="labels.searchoptions_score" />
|
||||
</c:if> <c:if test="${sort=='score.desc'}">
|
||||
<la:message key="labels.searchoptions_score" />
|
||||
|
|
@ -57,13 +57,13 @@
|
|||
</c:if>
|
||||
</a></li>
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_num" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <la:message
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <la:message
|
||||
key="labels.searchoptions_num" arg0="${f:h(num)}" />
|
||||
</a></li>
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_lang" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <c:if test="${empty lang}">
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <c:if test="${empty lang}">
|
||||
<la:message key="labels.searchoptions_all" />
|
||||
</c:if> <c:if test="${!empty lang}">
|
||||
<c:forEach var="sLang" items="${lang}">
|
||||
|
|
@ -75,8 +75,8 @@
|
|||
</a></li>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<li class="list-inline-item"><la:message key="labels.searchoptions_menu_labels" /> <a
|
||||
href="#searchOptions" class="badge badge-primary"
|
||||
data-toggle="control-options"> <c:if
|
||||
href="#searchOptions" class="badge text-bg-primary text-decoration-none"
|
||||
data-bs-toggle="collapse"> <c:if
|
||||
test="${empty fields.label}">
|
||||
<la:message key="labels.searchoptions_all" />
|
||||
</c:if> <c:if test="${!empty fields.label}">
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
<c:if test="${3 <= s.index}">
|
||||
<la:link styleClass="d-none d-sm-inline"
|
||||
<la:link styleClass="d-none d-sm-inline-block"
|
||||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
<c:if test="${3 <= s.index}">
|
||||
<la:link styleClass="d-none d-sm-inline"
|
||||
<la:link styleClass="d-none d-sm-inline-block"
|
||||
href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
<c:choose>
|
||||
<c:when test="${f:h(allRecordCount) != 0}">
|
||||
<jsp:include page="searchResults.jsp" />
|
||||
<div class="text-right">
|
||||
<div class="text-end">
|
||||
<a href="#"><la:message key="labels.footer_back_to_top" /></a>
|
||||
</div>
|
||||
</c:when>
|
||||
|
|
@ -148,9 +148,9 @@
|
|||
</main>
|
||||
<jsp:include page="footer.jsp" />
|
||||
<input type="hidden" id="contextPath" value="${contextPath}" />
|
||||
<script type="text/javascript"
|
||||
src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/jquery-3.7.1.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/clipboard.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/popper.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/bootstrap.min.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
|
||||
<script type="text/javascript" src="${fe:url('/js/search.js')}"></script>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
|
||||
<%-- query did not match any document --%>
|
||||
<div id="result" class="row">
|
||||
<div class="col-md-8 alert">
|
||||
<div class="col-md-8 alert alert-info">
|
||||
<la:message key="labels.did_not_match" arg0="${displayQuery}" />
|
||||
</div>
|
||||
<div class="col-md-4"><%-- Side Content --%></div>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<la:message key="labels.search_options" />
|
||||
</h3>
|
||||
<div>
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_num" /></legend>
|
||||
<label for="contentNum"><la:message key="labels.index_num" /></label>
|
||||
<la:select property="num" styleId="numSearchOption"
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
<la:option value="100">100</la:option>
|
||||
</la:select>
|
||||
</fieldset>
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_sort" /></legend>
|
||||
<label for="contentSort"><la:message key="labels.index_sort" /></label>
|
||||
<la:select property="sort" styleId="sortSearchOption"
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
</c:if>
|
||||
</la:select>
|
||||
</fieldset>
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_lang" /></legend>
|
||||
<label for="contentLang"><la:message key="labels.index_lang" /></label>
|
||||
<la:select property="lang" styleId="langSearchOption" multiple="true"
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
</la:select>
|
||||
</fieldset>
|
||||
<c:if test="${displayLabelTypeItems}">
|
||||
<fieldset class="form-group">
|
||||
<fieldset class="mb-3">
|
||||
<legend><la:message key="labels.index_label" /></legend>
|
||||
<label for="contentLabelType"><la:message
|
||||
key="labels.index_label" /></label>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
</h3>
|
||||
<div class="body">
|
||||
<c:if test="${thumbnailSupport && !empty doc.thumbnail}">
|
||||
<div class="mr-3">
|
||||
<div class="me-3">
|
||||
<a class="link d-none d-sm-flex" href="${doc.url_link}" data-uri="${doc.url_link}" data-id="${doc.doc_id}"
|
||||
data-order="${s.index}"
|
||||
> <img src="${fe:url('/images/blank.png')}" alt="thumbnail"
|
||||
|
|
@ -70,19 +70,19 @@
|
|||
</c:if>
|
||||
<c:if test="${doc.content_length!=null && doc.content_length!=''}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:message key="labels.search_result_size"
|
||||
arg0="${fe:formatFileSize(doc.content_length)}" />
|
||||
</c:if>
|
||||
<c:if test="${searchLogSupport && doc.click_count!=null && doc.click_count>0}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:message key="labels.search_click_views"
|
||||
arg0="${f:h(doc.click_count)}" />
|
||||
</c:if>
|
||||
<c:if test="${doc.has_cache=='true'}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:link href="/cache/?docId=${doc.doc_id}${appendHighlightParams}"
|
||||
class="cache">
|
||||
<la:message key="labels.search_result_cache" />
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
</c:if>
|
||||
<c:if test="${doc.similar_docs_count!=null&&doc.similar_docs_count>1}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<la:link href="/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}&sdh=${f:u(fe:sdh(doc.similar_docs_hash))}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<la:message key="labels.search_result_similar"
|
||||
arg0="${fe:formatFileSize(doc.similar_docs_count-1)}" />
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
</c:if>
|
||||
<c:if test="${favoriteSupport}">
|
||||
<div class="d-sm-none"></div>
|
||||
<span class="d-none d-sm-inline"> </span>
|
||||
<span class="d-none d-sm-inline-block"> </span>
|
||||
<a href="#${doc.doc_id}" class="favorite"><i class="far fa-star"></i></a>
|
||||
<span class="favorited"><i class="fas fa-star"></i></span>
|
||||
</c:if>
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
<li class="list-group-item"><la:link
|
||||
href="/search?q=${f:u(q)}&ex_q=label%3a${f:u(countEntry.key)}&sdh=${f:u(fe:sdh(sh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
${f:h(fe:label(countEntry.key))}
|
||||
<span class="badge badge-secondary badge-pill float-right">${f:h(countEntry.value)}</span>
|
||||
<span class="badge rounded-pill text-bg-secondary float-end">${f:h(countEntry.value)}</span>
|
||||
</la:link></li>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
href="/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(queryEntry.value)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<c:if test="${fn:startsWith(queryEntry.key, 'labels.')}"><la:message key="${queryEntry.key}" /></c:if>
|
||||
<c:if test="${not fn:startsWith(queryEntry.key, 'labels.')}">${f:h(queryEntry.key)}</c:if>
|
||||
<span class="badge badge-secondary badge-pill float-right">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
|
||||
<span class="badge rounded-pill text-bg-secondary float-end">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
|
||||
</la:link></li>
|
||||
<c:set var="facetFound" value="T"/>
|
||||
</c:if>
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
</ul>
|
||||
</c:forEach>
|
||||
<c:if test="${!empty ex_q}">
|
||||
<div class="float-right">
|
||||
<div class="d-flex justify-content-end">
|
||||
<la:link href="/search?q=${f:u(q)}"
|
||||
styleClass="btn btn-link btn-sm">
|
||||
<la:message key="labels.facet_label_reset" />
|
||||
|
|
@ -162,24 +162,24 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<nav id="subfooter" class="mx-auto">
|
||||
<ul class="pagination">
|
||||
<ul class="pagination justify-content-center">
|
||||
<c:if test="${existPrevPage}">
|
||||
<li class="page-item"><la:link styleClass="page-link" aria-label="Previous"
|
||||
href="/search/prev?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<span aria-hidden="true">«</span>
|
||||
<span class="sr-only"><la:message key="labels.prev_page" /></span>
|
||||
<span class="visually-hidden"><la:message key="labels.prev_page" /></span>
|
||||
</la:link></li>
|
||||
</c:if>
|
||||
<c:if test="${!existPrevPage}">
|
||||
<li class="page-item disabled" aria-label="Previous"><a class="page-link" href="#">
|
||||
<span aria-hidden="true">«</span> <span class="sr-only"><la:message
|
||||
<span aria-hidden="true">«</span> <span class="visually-hidden"><la:message
|
||||
key="labels.prev_page" /></span>
|
||||
</a></li>
|
||||
</c:if>
|
||||
<c:forEach var="pageNumber" varStatus="s" items="${pageNumberList}">
|
||||
<li
|
||||
<c:choose>
|
||||
<c:when test="${pageNumber < currentPageNumber - 2 || pageNumber > currentPageNumber + 2}">class="page-item d-none d-sm-inline"</c:when>
|
||||
<c:when test="${pageNumber < currentPageNumber - 2 || pageNumber > currentPageNumber + 2}">class="page-item d-none d-sm-inline-block"</c:when>
|
||||
<c:when test="${pageNumber == currentPageNumber && pageNumber >= currentPageNumber - 2 && pageNumber <= currentPageNumber + 2}">class="page-item active"</c:when>
|
||||
<c:otherwise>class="page-item"</c:otherwise>
|
||||
</c:choose>>
|
||||
|
|
@ -190,13 +190,13 @@
|
|||
<c:if test="${existNextPage}">
|
||||
<li class="page-item"><la:link styleClass="page-link" aria-label="Next"
|
||||
href="/search/next?q=${f:u(q)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
|
||||
<span class="sr-only"><la:message key="labels.next_page" /></span>
|
||||
<span class="visually-hidden"><la:message key="labels.next_page" /></span>
|
||||
<span aria-hidden="true">»</span>
|
||||
</la:link></li>
|
||||
</c:if>
|
||||
<c:if test="${!existNextPage}">
|
||||
<li class="page-item disabled" aria-label="Next"><a class="page-link" href="#"> <span
|
||||
class="sr-only"><la:message key="labels.next_page" /></span> <span
|
||||
class="visually-hidden"><la:message key="labels.next_page" /></span> <span
|
||||
aria-hidden="true">»</span>
|
||||
</a></li>
|
||||
</c:if>
|
||||
|
|
|
|||
11
src/main/webapp/css/bootstrap.min.css
vendored
11
src/main/webapp/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -68,7 +68,7 @@ legend{
|
|||
transition: all .4s ease 0s;
|
||||
}
|
||||
|
||||
#searchOptions.active .container {
|
||||
#searchOptions.show .container {
|
||||
right: 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
10
src/main/webapp/js/bootstrap.min.js
vendored
10
src/main/webapp/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
8
src/main/webapp/js/clipboard.min.js
vendored
8
src/main/webapp/js/clipboard.min.js
vendored
File diff suppressed because one or more lines are too long
6
src/main/webapp/js/popper.min.js
vendored
Normal file
6
src/main/webapp/js/popper.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
Loading…
Add table
Reference in a new issue