From 9ab846a517f7303872093fe55ba4dadb6bdf2c85 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Sat, 21 Dec 2019 15:39:15 +0900
Subject: [PATCH] fix #2340 collapse search form
---
.../webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp | 4 ++++
.../webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp | 4 ++++
.../WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp | 4 ++++
.../webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp | 4 ++++
.../webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp | 4 ++++
.../webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp | 4 ++++
src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp | 4 ++++
.../view/admin/relatedcontent/admin_relatedcontent.jsp | 4 ++++
.../WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp | 4 ++++
.../webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp | 4 ++++
10 files changed, 40 insertions(+)
diff --git a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
index 2794fc9a3..a739e0e6a 100644
--- a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/boostdoc/"
styleClass="form-horizontal">
<div class="form-group">
@@ -67,6 +70,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${boostDocPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
index a569875a8..e5f641f10 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/dataconfig/"
styleClass="form-horizontal">
<div class="form-group">
@@ -82,6 +85,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${dataConfigPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
index fb5b5a1f3..d2a1f754f 100644
--- a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/duplicatehost/"
styleClass="form-horizontal">
<div class="form-group">
@@ -67,6 +70,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${duplicateHostPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp
index 2b79f2e05..079b2286d 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp
@@ -38,6 +38,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/fileconfig/"
styleClass="form-horizontal">
<div class="form-group">
@@ -76,6 +79,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${fileConfigPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
index 1f7384192..4724d2f3b 100644
--- a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/keymatch/"
styleClass="form-horizontal">
<div class="form-group">
@@ -67,6 +70,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${keyMatchPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
index 8fbae886b..52b14ae12 100644
--- a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/labeltype/"
styleClass="form-horizontal">
<div class="form-group">
@@ -67,6 +70,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${labelTypePager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
index b93eae80f..ebecf6c8e 100644
--- a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/pathmap/"
styleClass="form-horizontal">
<div class="form-group">
@@ -67,6 +70,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${pathMapPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
index 803091c16..72a150138 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/relatedcontent/"
styleClass="form-horizontal">
<div class="form-group">
@@ -67,6 +70,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${relatedContentPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
index bb8274d7c..1c8e5995f 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/relatedquery/"
styleClass="form-horizontal">
<div class="form-group">
@@ -67,6 +70,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${relatedQueryPager.allRecordCount == 0}">
<div class="row top10">
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp
index 5f51d30d3..4bbcefc14 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp
@@ -36,6 +36,9 @@
</la:info>
<la:errors />
</div>
+ <a role="button" data-toggle="collapse" href="#listSearchForm" aria-expanded="false"
+ aria-controls="listSearchForm"><i class="fas fa-search" aria-hidden="true"></i></a>
+ <div class="collapse" id="listSearchForm">
<la:form action="/admin/webconfig/"
styleClass="form-horizontal">
<div class="form-group">
@@ -74,6 +77,7 @@
</div>
</div>
</la:form>
+ </div>
<%-- List --%>
<c:if test="${webConfigPager.allRecordCount == 0}">
<div class="row top10">
--
GitLab