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

fix add login link

Browse source
This commit is contained in:
matsutani 2016-06-01 23:50:20 +09:00
parent 4af3db7069
commit 64dda64ce2
5 changed files with 57 additions and 56 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

@ -122,7 +122,7 @@ public abstract class FessSearchAction extends FessBaseAction {
runtime.registerData("langItems", systemHelper.getLanguageItems(locale));
runtime.registerData("username", systemHelper.getUsername());
runtime.registerData("pageLoginLink", systemHelper.getPageLoginLink());
runtime.registerData("pageLoginLink", fessConfig.isPageLoginLink());
}
// ===================================================================================

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

@ -288,8 +288,5 @@ public class SystemHelper implements Serializable {
protected String createSearchRole(final String type, final String name) {
return type + name;
}
public boolean getPageLoginLink() {
return ComponentUtil.getFessConfig().isPageLoginLink();
}
}

2
src/main/resources/fess_config.properties
View file

@ -375,7 +375,7 @@ online.help.name.crawlinginfo=crawlinginfo
online.help.name.backup=backup
online.help.name.upgrade=upgrade
online.help.supported.langs=
online.help.supported.langs=ja
# ----------------------------------------------------------
# Suggest

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

@ -8,32 +8,34 @@ ${fe:facetForm()}${fe:geoForm()}
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<ul class="nav navbar-nav hidden-xs-down">
<c:if test="${!empty username && username != 'guest'}">
<li class="nav-item username">
<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>
<div class="dropdown-menu" aria-labelledby="userMenu">
<la:link href="/profile" styleClass="dropdown-item">
<la:message key="labels.profile" />
</la:link>
<la:link href="/logout" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
<c:choose>
<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>
<div class="dropdown-menu" aria-labelledby="userMenu">
<la:link href="/profile" styleClass="dropdown-item">
<la:message key="labels.profile" />
</la:link>
<la:link href="/logout" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
</div>
</div>
</div>
</li>
</c:if>
<c:if test="${ pageLoginLink }">
<li class="nav-item username"><la:link href="/login"
styleClass="nav-link" role="button" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-user"></i>
<la:message key="labels.login" />
</la:link></li>
</c:if>
</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">
<i class="fa fa-user"></i>
<la:message key="labels.login" />
</la:link></li>
</c:when>
</c:choose>
</ul>
<div
class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8 pull-right"

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

@ -21,32 +21,34 @@
<nav class="navbar navbar-dark bg-inverse navbar-static-top pos-f-t">
<div class="container">
<ul class="nav navbar-nav pull-right">
<c:if 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>
<div class="dropdown-menu" aria-labelledby="userMenu">
<la:link href="/profile" styleClass="dropdown-item">
<la:message key="labels.profile" />
</la:link>
<la:link href="/logout" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
<c:choose>
<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>
<div class="dropdown-menu" aria-labelledby="userMenu">
<la:link href="/profile" styleClass="dropdown-item">
<la:message key="labels.profile" />
</la:link>
<la:link href="/logout" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
</div>
</div>
</div>
</li>
</c:if>
<c:if test="${ pageLoginLink }">
<li class="nav-item username"><la:link href="/login"
styleClass="nav-link" role="button" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-user"></i>
<la:message key="labels.login" />
</la:link></li>
</c:if>
</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">
<i class="fa fa-user"></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">
<i class="fa fa-question-circle"></i>