copy jsp files to orig directory

This commit is contained in:
Kaoru FUZITA 2015-11-26 10:59:27 +09:00
parent 6666d29dfd
commit 14a7fd1ca7
4 changed files with 59 additions and 58 deletions

View file

@ -1,7 +1,7 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<hr/>
<footer class="bd-footer text-muted" role="contentinfo">
<div id="footer" class="container center">
<div id="footer" class="center">
<p>
<la:message key="labels.footer.copyright" />
</p>

View file

@ -1,50 +1,50 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<la:form action="search" method="get" styleId="searchForm"
styleClass="searchResultForm">
<la:form action="search" method="get" styleId="searchForm" role="search">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-static-top pos-f-t">
<div class="container">
<la:link styleClass="navbar-brand" href="/">
<img src="${f:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<div class="form-inline navbar-form pull-right">
<la:text property="query" maxlength="1000" styleId="query"
styleClass="form-control" autocomplete="off" />
<div class="btn-group">
<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="/logout" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
</div>
</div>
</li>
</c:if>
</ul>
<div class="navbar-form navbar-right" role="search">
<div class="input-group">
<la:text property="query" styleId="query" styleClass="form-control"
autocomplete="off" />
<div class="input-group-btn">
<button type="submit" name="search" id="searchButton"
class="btn btn-primary">
<i class="fa fa-search"></i>
<la:message key="labels.search" />
<i class="fa fa-search"></i> <span class="hidden-xs-down"><la:message
key="labels.search" /></span>
</button>
<button type="button" class="btn btn-primary dropdown-toggle"
data-toggle="dropdown" aria-expanded="false">
<span class="caret"></span> <span class="sr-only"><la:message
id="searchOptionsButton" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<span class="sr-only"><la:message
key="labels.header_form_option_btn" /></span>
</button>
<div class="dropdown-menu" aria-labelledby="optionMenu">
<div class="dropdown-menu dropdown-menu-right">
<a href="#searchOptions" class="dropdown-item" data-toggle="modal"><la:message
key="labels.header_form_option_btn" /></a>
</div>
</div>
</div>
<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="/logout" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
</div>
</div>
</li>
</c:if>
</ul>
</div>
</nav>
<div class="modal fade" id="searchOptions" tabindex="-1" role="dialog"

View file

@ -22,11 +22,11 @@
<jsp:include page="header.jsp" />
<div class="container">
<div class="row">
<div class="col-md-9">
<p id="searchOptionMenu">
<span> <la:message key="labels.searchoptions_menu_sort" />
<a href="#searchOptions" data-toggle="modal"> <c:if
test="${empty sort}">
<div class="col-md-12">
<ul class="searchOptionLabels">
<li><la:message key="labels.searchoptions_menu_sort" /> <a
href="#searchOptions" class="label label-primary"
data-toggle="modal"> <c:if test="${empty sort}">
<la:message key="labels.searchoptions_score" />
</c:if> <c:if test="${sort=='created.asc'}">
<la:message key="labels.search_result_sort_created_asc" />
@ -49,14 +49,15 @@
</c:if> <c:if test="${sort=='favoriteCount_l_x_dv.desc'}">
<la:message key="labels.search_result_sort_favoriteCount_desc" />
</c:if>
</a>
</span> <span> <la:message key="labels.searchoptions_menu_num" />
<a href="#searchOptions" data-toggle="modal"> <la:message
</a></li>
<li><la:message key="labels.searchoptions_menu_num" /> <a
href="#searchOptions" class="label label-primary"
data-toggle="modal"> <la:message
key="labels.searchoptions_num" arg0="${f:h(num)}" />
</a>
</span> <span> <la:message key="labels.searchoptions_menu_lang" />
<a href="#searchOptions" data-toggle="modal"> <c:if
test="${empty lang}">
</a></li>
<li><la:message key="labels.searchoptions_menu_lang" /> <a
href="#searchOptions" class="label label-primary"
data-toggle="modal"> <c:if test="${empty lang}">
<la:message key="labels.searchoptions_all" />
</c:if> <c:if test="${!empty lang}">
<c:forEach var="sLang" items="${lang}">
@ -65,12 +66,11 @@
</c:forEach>
</c:forEach>
</c:if>
</a>
</span>
</a></li>
<c:if test="${displayLabelTypeItems}">
<span> <la:message key="labels.searchoptions_menu_labels" />
<a href="#searchOptions" data-toggle="modal"> <c:if
test="${empty fields.label}">
<li><la:message key="labels.searchoptions_menu_labels" /> <a
href="#searchOptions" class="label label-primary"
data-toggle="modal"> <c:if test="${empty fields.label}">
<la:message key="labels.searchoptions_all" />
</c:if> <c:if test="${!empty fields.label}">
<c:forEach var="sLabel" items="${fields.label}">
@ -79,10 +79,9 @@
</c:forEach>
</c:forEach>
</c:if>
</a>
</span>
</a></li>
</c:if>
</p>
</ul>
</div>
</div>
<c:if test="${fe:hswsize(null) != 0}">

View file

@ -44,20 +44,21 @@
<a href="#result${s.index}"><la:message key="labels.search_result_more" /></a>
</div>
<div class="info">
<small>
<c:if test="${doc.created!=null && doc.created!=''}">
<c:set var="hasInfo" value="true"/>
<la:message key="labels.search_result_created" />
<fmt:formatDate value="${fe:parseDate(doc.created)}" type="BOTH" />
<fmt:formatDate value="${fe:parseDate(doc.created)}" type="BOTH" pattern="yyyy-MM-dd HH:mm" />
</c:if>
<c:if test="${doc.last_modified!=null && doc.last_modified!=''}">
<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
<la:message key="labels.search_result_last_modified" />
<fmt:formatDate value="${fe:parseDate(doc.last_modified)}" type="BOTH" />
<fmt:formatDate value="${fe:parseDate(doc.last_modified)}" type="BOTH" pattern="yyyy-MM-dd HH:mm" />
</c:if>
<c:if test="${doc.content_length!=null && doc.content_length!=''}">
<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
<la:message key="labels.search_result_size"
arg0="${f:h(doc.content_length)}" />
arg0="${fe:formatNumber(doc.content_length)}" />
</c:if>
<c:if test="${searchLogSupport}">
<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
@ -71,6 +72,7 @@
<span class="favorited"><la:message
key="labels.search_result_favorited"/> <span class="favorited-count">(${f:h(doc.favorite_count)})</span></span>
</c:if>
</small>
</div>
</div>
</li>