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

update orig files

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-06-09 14:31:34 +09:00
parent 02eb2dbd50
commit d6675baf35
2 changed files with 76 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,33 +1,14 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<la:form action="/search" method="get" styleId="searchForm" role="search">
<la:form action="/search" method="get" styleId="searchForm"
role="search">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<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: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>
</div>
</div>
</li>
</c:if>
</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"
@ -46,6 +27,47 @@ ${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>
<c:if test="${adminUser == true}">
<la:link href="/admin" styleClass="dropdown-item">
<la:message key="labels.administration" />
</la:link>
</c:if>
<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">

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

@ -21,24 +21,39 @@
<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>
<c:if test="${adminUser == true}">
<la:link href="/admin" styleClass="dropdown-item">
<la:message key="labels.administration" />
</la:link>
</c:if>
<la:link href="/logout" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
</div>
</div>
</div>
</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-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">
<i class="fa fa-question-circle"></i>