Fix pagers and minorfix (#2435)

This commit is contained in:
Koki Igarashi 2020-03-24 22:43:18 +09:00 committed by GitHub
parent 3e64fff96e
commit 22e1034b68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 46 deletions

View file

@ -135,7 +135,7 @@
<c:forEach var="p" varStatus="s"
items="${pager.pageNumberList}">
<li
<c:if test="${p == pager.currentPageNumber}">class="active"</c:if>>
<c:if test="${p == pager.currentPageNumber}">class="page-item active"</c:if>>
<la:link
styleClass="page-link"
href="list/${p}?dictId=${f:u(dictId)}">${p}</la:link></li>

View file

@ -78,7 +78,7 @@
<la:errors/>
</div>
<div class="form-group row">
<label class="col-sm-12 text-sm-right col-form-label"><la:message
<label class="col-sm-12 col-form-label"><la:message
key="labels.elevate_word_file"/></label>
</div>
</div>

View file

@ -59,25 +59,30 @@
</div>
</c:if>
<c:if test="${reqHeaderPager.allRecordCount > 0}">
<table class="table table-bordered table-striped">
<thead>
<tr>
<th><la:message key="labels.reqheader_list_name"/></th>
<th><la:message
key="labels.reqheader_list_web_crawling_config"/></th>
</tr>
</thead>
<tbody>
<c:forEach var="data" varStatus="s"
items="${requestHeaderItems}">
<tr
data-href="${contextPath}/admin/reqheader/details/4/${f:u(data.id)}">
<td>${f:h(data.name)}</td>
<td>${f:h(data.webConfig.name)}</td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="row top10">
<div class="col-sm-12">
<table class="table table-bordered table-striped">
<thead>
<tr>
<th><la:message key="labels.reqheader_list_name"/></th>
<th><la:message
key="labels.reqheader_list_web_crawling_config"/></th>
</tr>
</thead>
<tbody>
<c:forEach var="data" varStatus="s"
items="${requestHeaderItems}">
<tr
data-href="${contextPath}/admin/reqheader/details/4/${f:u(data.id)}">
<td>${f:h(data.name)}</td>
<td>${f:h(data.webConfig.name)}</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
<c:set var="pager" value="${reqHeaderPager}"
scope="request"/>
<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp"/>

View file

@ -60,31 +60,35 @@
</div>
</c:if>
<c:if test="${webAuthPager.allRecordCount > 0}">
<table class="table table-bordered table-striped">
<thead>
<tr>
<th><la:message key="labels.webauth_list_hostname"/></th>
<th><la:message
key="labels.webauth_list_web_crawling_config"/></th>
</tr>
</thead>
<tbody>
<c:forEach var="data" varStatus="s"
items="${webAuthenticationItems}">
<tr
data-href="${contextPath}/admin/webauth/details/4/${f:u(data.id)}">
<td><c:if
test="${data.hostname==null||data.hostname==''}">
<la:message key="labels.webauth_any"/>
</c:if> ${f:h(data.hostname)}: <c:if
test="${data.port==null||data.port==''}">
<la:message key="labels.webauth_any"/>
</c:if> ${f:h(data.port)}</td>
<td>${f:h(data.webConfig.name)}</td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="row top10">
<div class="col-sm-12">
<table class="table table-bordered table-striped">
<thead>
<tr>
<th><la:message key="labels.webauth_list_hostname"/></th>
<th><la:message
key="labels.webauth_list_web_crawling_config"/></th>
</tr>
</thead>
<tbody>
<c:forEach var="data" varStatus="s"
items="${webAuthenticationItems}">
<tr
data-href="${contextPath}/admin/webauth/details/4/${f:u(data.id)}">
<td><c:if
test="${data.hostname==null||data.hostname==''}">
<la:message key="labels.webauth_any"/>
</c:if> ${f:h(data.hostname)}: <c:if
test="${data.port==null||data.port==''}">
<la:message key="labels.webauth_any"/>
</c:if> ${f:h(data.port)}</td>
<td>${f:h(data.webConfig.name)}</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
<c:set var="pager" value="${webAuthPager}" scope="request"/>
<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp"/>
<c:if test="${pager.currentPageNumber > pager.allPageCount}">