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

fix #524 : modify search form position

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-06-04 07:46:41 +09:00
parent 3cbc99bb39
commit 0368c8ea39
3 changed files with 38 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,38 +7,8 @@ ${fe:facetForm()}${fe:geoForm()}
<img src="${f:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<ul class="nav navbar-nav hidden-xs-down">
<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>
</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"
class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8"
role="search">
<div class="input-group">
<la:text property="q" maxlength="1000" styleId="query"
@ -57,6 +27,42 @@ ${fe:facetForm()}${fe:geoForm()}
</span>
</div>
</div>
<ul class="nav navbar-nav hidden-xs-down pull-right">
<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>
<span>${username}</span>
</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>
</li>
</c:when>
<c:when test="${ pageLoginLink }">
<li class="nav-item"><la:link href="/login"
styleClass="nav-link " role="button" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-sign-in"></i>
<span><la:message key="labels.login" /></span>
</la:link></li>
</c:when>
</c:choose>
<li class="nav-item"><la:link href="/help" styleClass="nav-link" role="help" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-question-circle"></i>
<span><la:message key="labels.index_help" /></span>
</la:link></li>
</ul>
</nav>
<div id="searchOptions" class="control-options">
<div class="container">

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

@ -44,7 +44,7 @@
<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>
<i class="fa fa-sign-in"></i>
<la:message key="labels.login" />
</la:link></li>
</c:when>

13
src/main/webapp/css/style.css
View file

@ -86,19 +86,6 @@ h3 {
padding: 0;
}
.navbar .logout-link {
margin-right: 10px;
}
.navbar .logout-link, .navbar .help-link {
color: #ffffff;
}
.navbar .logout-link:hover, .navbar .help-link:hover {
color: #08c;
text-decoration: none;
}
.nav-list li.reset {
margin-top: 10px;
}