From 0c824193dfce24ff7fe4a42f6edcc855d4ffad8e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 30 Jan 2023 16:06:01 +0000
Subject: [PATCH] Bug 32771: Standardize structure around action fieldsets in
 serials

This patch updates serials templates so that fieldsets with the
"action" class are placed outside the form's main fieldset.

To test, apply the patch and rebuild the staff interface CSS. Go to
serials and check the following pages to confirm that changes to
form structure look correct:

- Navigate directly to /cgi-bin/koha/serials/serials-search.pl
  - Check the form on this page.
  - Perform a subscription search. On the search results page, check
    the sidebar form.
- Click "Manage numbering patterns" in the left-hand sidebar menu.
  - Click "New numbering pattern" and check the forms on that page.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ab76971ec44ead2baae42075b79436c7810ca672)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/includes/serials-advsearch.inc    | 6 +++---
 .../intranet-tmpl/prog/en/includes/subscriptions-search.inc | 6 +++---
 .../prog/en/modules/serials/subscription-numberpatterns.tt  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc
index 5f518e8827..ec34b6f073 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc
@@ -56,9 +56,9 @@
             [% IF ( mana ) %]
                 <input type="hidden" name="mana" value="1" />
             [% END %]
-            <fieldset class="action">
-                <input type="submit" class="btn btn-primary" value="Search" />
-            </fieldset>
         </fieldset> <!-- /.rows -->
+        <fieldset class="action">
+            <input type="submit" class="btn btn-primary" value="Search" />
+        </fieldset>
     </form>
 </div> <!-- /#advsearch -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
index fd1222ea33..5e1275d249 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
@@ -43,10 +43,10 @@
             [% IF (basketno) %]
                 <input type="hidden" name="basketno" value="[% basketno | html %]" />
             [% END %]
-            <fieldset class="action">
-              <input type="submit" class="btn btn-primary" value="Search" />
-            </fieldset>
             </div>
         </fieldset>
+        <fieldset class="action">
+            <input type="submit" class="btn btn-primary" value="Search" />
+        </fieldset>
     </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
index 3f94b03c3f..79f22ccc19 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
@@ -249,11 +249,11 @@
                   </tr>
                 </tbody>
               </table>
-              <fieldset class="action">
-                  <button type="button" id="test_pattern" class="btn btn-default">Test pattern</button>
-              </fieldset>
               <div id="predictionpattern"></div>
             </fieldset>
+            <fieldset class="action">
+                <button type="button" id="test_pattern" class="btn btn-default">Test pattern</button>
+            </fieldset>
           </form>
 
       [% ELSE %]
-- 
2.39.5