From 52fe978a092f79afeae3d56f12b94ff94523239f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 9 Feb 2021 19:31:33 +0000
Subject: [PATCH] Bug 27653: Use div instead of caption for controls

The funds and acquisitions home page tables use captions for additional
table controls. These are more appropriate as "toolbar" divs.

This patch converts the <caption> to <div class="toolbar btn-toolbar">
and moves it just above <table> in the markup to keep it valid.

To test:
1 - View the tables on acquisitions home and budgets views
2 - Note the 'Expand all...' control row
3 - Apply patch
4 - The row remains, but is below the table controls
5 - The row is not included when printing or copying the table

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit a63748e241ccfc2ae4dc4487c5c6cb87b1b54b84)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit d0f350314a7ad43f44f67a10b8c023b7671b517c)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 .../prog/en/modules/acqui/acqui-home.tt       | 29 ++++++++++---------
 .../prog/en/modules/admin/aqbudgets.tt        | 17 ++++++-----
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 1361b4a10a..128bc138ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -67,21 +67,22 @@
     <h3>All available funds</h3>
 
     <div id="BudgetsAndFunds">
+        <div class="toolbar btn-toolbar">
+            <span class="actions">
+                <a href="#" id="expand_all">Expand all</a> |
+                <a href="#" id="collapse_all">Collapse all</a> |
+                <a href="#" id="hide_inactive">Hide inactive budgets</a> |
+                <a href="#" id="show_inactive">Show inactive budgets</a> |
+                <select id="library-filter">
+                    <option value="">Filter by library</option>
+                    [% FOREACH b IN Branches.all %]
+                        <option value="[% b.branchname | html %]">[% b.branchname | html %]</option>
+                    [% END %]
+                </select>
+            </span>
+        </div>
+
     <table id="accounts">
-        <caption>
-          <span class="actions"><a href="#" id="expand_all">Expand all</a>
-          | <a href="#" id="collapse_all">Collapse all</a>
-          | <a href="#" id="hide_inactive">Hide inactive budgets</a>
-          | <a href="#" id="show_inactive">Show inactive budgets</a>
-          | <select id="library-filter">
-              <option value="">Filter by library</option>
-              [% FOREACH b IN Branches.all %]
-                <option value="[% b.branchname | html %]">[% b.branchname | html %]</option>
-              [% END %]
-            </select>
-        </span>
-
-        </caption>
 
         <thead>
         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index a52cda66f2..3fb5727045 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -51,15 +51,18 @@
 
 [% IF budgets %]
 
-<table id="budgeth" class="group">
     [% UNLESS budget_period_id %]
-      <caption>
-        <span class="actions"><a href="#" id="expand_all">Expand all</a>
-        | <a href="#" id="collapse_all">Collapse all</a>
-        | <a href="#" id="hide_inactive">Hide inactive budgets</a>
-        | <a href="#" id="show_inactive">Show inactive budgets</a></span>
-      </caption>
+        <div class="toolbar btn-toolbar">
+            <span class="actions">
+                <a href="#" id="expand_all">Expand all</a> |
+                <a href="#" id="collapse_all">Collapse all</a> |
+                <a href="#" id="hide_inactive">Hide inactive budgets</a> |
+                <a href="#" id="show_inactive">Show inactive budgets</a>
+            </span>
+        </div>
     [% END %]
+
+<table id="budgeth" class="group">
     <thead>
         <tr>
             <th>Active</th>
-- 
2.39.5