0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2492 add warning icons

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-10-24 12:00:28 +09:00
parent 1264b15b78
commit abde5ed1c9
9 changed files with 88 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
View file

@ -115,6 +115,8 @@ public abstract class FessSearchAction extends FessBaseAction {
@Override
protected void setupHtmlData(final ActionRuntime runtime) {
super.setupHtmlData(runtime);
systemHelper.setupSearchHtmlData(this, runtime);
runtime.registerData("osddLink", openSearchHelper.hasOpenSearchFile());
final List<Map<String, String>> labelTypeItems = labelTypeHelper.getLabelTypeItemList(SearchRequestType.SEARCH);

13
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -436,6 +436,19 @@ public class SystemHelper {
}
}
public void setupSearchHtmlData(final TypicalAction action, final ActionRuntime runtime) {
runtime.registerData("developmentMode", ComponentUtil.getFessEsClient().isEmbedded());
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final String installationLink = fessConfig.getOnlineHelpInstallation();
runtime.registerData("installationLink", getHelpUrl(installationLink));
final boolean eoled = isEoled();
runtime.registerData("eoled", eoled);
if (eoled) {
final String eolLink = fessConfig.getOnlineHelpEol();
runtime.registerData("eolLink", getHelpUrl(eolLink));
}
}
protected boolean isEoled() {
return getCurrentTimeAsLong() > eolTime;
}

12
src/main/webapp/WEB-INF/orig/view/advance.jsp
View file

@ -32,6 +32,18 @@
<div class="collapse navbar-collapse" id="navbar">
<div class="mr-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" />">
<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"
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"
></em></a></li>
</c:if>
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">

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

@ -31,6 +31,18 @@
</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" />">
<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"
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"
></em></a></li>
</c:if>
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">

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

@ -30,6 +30,18 @@
<div class="collapse navbar-collapse" id="navbar">
<div class="mr-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" />">
<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"
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"
></em></a></li>
</c:if>
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">

12
src/main/webapp/WEB-INF/view/advance.jsp
View file

@ -32,6 +32,18 @@
<div class="collapse navbar-collapse" id="navbar">
<div class="mr-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" />">
<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"
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"
></em></a></li>
</c:if>
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">

2
src/main/webapp/WEB-INF/view/common/admin/header.jsp
View file

@ -13,7 +13,7 @@
<c:if test="${eoled}">
<li class="nav-item" data-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-warning"></em></a></li>
<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"

12
src/main/webapp/WEB-INF/view/header.jsp
View file

@ -31,6 +31,18 @@
</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" />">
<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"
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"
></em></a></li>
</c:if>
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">

12
src/main/webapp/WEB-INF/view/index.jsp
View file

@ -30,6 +30,18 @@
<div class="collapse navbar-collapse" id="navbar">
<div class="mr-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" />">
<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"
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"
></em></a></li>
</c:if>
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">