From c5b0ce92f249e72e66d7276221c84f956d2ac75b 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>
---
 .../prog/en/includes/subscriptions-search.inc        |  6 +++---
 .../prog/en/modules/serials/serials-search.tt        | 12 ++++++------
 .../modules/serials/subscription-numberpatterns.tt   |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

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/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index 603e897da7..81582f2ec7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -300,10 +300,10 @@
                                     [% 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 -->
                     [% END # /UNLESS ( done_searched )%]
@@ -433,11 +433,11 @@
                                             [% END %]
                                         </ol>
                                         <input type="hidden" name="searched" value="1" />
-                                        <fieldset class="action">
-                                            <input type="submit" class="btn btn-primary" value="Search" />
-                                        </fieldset>
 
                                     </fieldset> <!-- /.brief -->
+                                    <fieldset class="action">
+                                        <input type="submit" class="btn btn-primary" value="Search" />
+                                    </fieldset>
                                 </form>
                             </div> <!-- /#advsearch -->
                         [% END # / UNLESS ( mana ) %]
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.30.2