From 36a55d3a484e15411a3ed6127c593987b51a9305 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 14 Jul 2023 18:11:04 +0000
Subject: [PATCH] Bug 34196: Improve styling of sidebar form on funds admin
 page

This patch makes a few markup changes to the sidebar filter form on the
funds administration page in order to make it more usable and more
consistent with other similar forms.

The patch removes the link for expanding and collapsing the sidebar
filter because it looked bad and was inconsistent with all similar
forms.

To test, apply the patch and go to Administration -> Funds. Confirm that
the sidebar form looks correct. Compare to, for example, the sidebar
form at Acquisitions -> Invoices.

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/admin/aqbudgets.tt        | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

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 b3e99fb56d6..fb1d387c166 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -449,7 +449,6 @@
 
 [% IF op == 'list' %]
   <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
-    <a href="#" id="filterbutton">Filters</a>
     <fieldset class="brief" id="fundfilters">
     <h4>Fund filters</h4>
         <ol>
@@ -460,15 +459,6 @@
                 [% PROCESS options_for_libraries libraries => Branches.all( selected => selected_branchcode, unfiltered => 1 ) %]
             </select>
         </li>
-        <li class="radio">
-
-        <label for="show_mine">Show my funds only:</label>
-            [% IF ( show_mine ) %]
-                <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
-            [% ELSE %]
-                <input type="checkbox" id="show_mine"  name="show_mine" value="1" />
-        [% END %]
-        </li>
 
         [% IF periods %]
           <li>
@@ -485,8 +475,18 @@
             </select>
           </li>
         [% END %]
-        </ol>
+        <li class="radio">
 
+        <label for="show_mine">Show my funds only:</label>
+            [% IF ( show_mine ) %]
+                <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
+            [% ELSE %]
+                <input type="checkbox" id="show_mine"  name="show_mine" value="1" />
+        [% END %]
+        </li>
+        </ol>
+    </fieldset>
+    <fieldset class="action">
         <input type="hidden" name="op" value="list" />
         <input type="submit" class="submit" name="filter" value="Go" />
     </fieldset>
@@ -733,10 +733,6 @@
                     oTable.fnAddFilters("filter", 750);
                 [% END %]
 
-                $("#filterbutton").click(function() {
-                    $("#fundfilters").slideToggle(0);
-                });
-
                 $(".deletefund-disabled").tooltip().on("click", function(e){
                     e.preventDefault();
                     alert(_("This fund has sub funds. It cannot be deleted."));
-- 
2.25.1