From 86767844dd026668b5e98b61b93062558f6258ad Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 1 Feb 2023 11:59:09 +0000
Subject: [PATCH] Bug 32955: Standardize structure around action fieldsets in
 various templates

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

To test, apply the patch and check the following pages to confirm that
changes to form structure look correct:

- Cataloging -> Quick spine label creator
- Patrons -> Patron details -> Files
- Patrons -> Patron details -> Housebound
- Circulation -> Upload offline circulation file
- Tools -> Patron card creator -> Manage -> Images
- Point of sale -> Transaction history -> "Older transactions" form
---
 .../prog/en/modules/labels/spinelabel-home.tt   |  4 +++-
 .../prog/en/modules/members/files.tt            |  4 +++-
 .../prog/en/modules/members/housebound.tt       | 10 +++++-----
 .../prog/en/modules/offline_circ/process_koc.tt |  4 +++-
 .../prog/en/modules/patroncards/image-manage.tt | 17 ++++++++---------
 .../prog/en/modules/pos/register.tt             |  4 ++--
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
index eeed2bd99d0..9e749f0c9a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
@@ -41,8 +41,10 @@
                         <input type="text" name="barcode" id="barcode" class="focus" required="required" />
 					</li>
 				</ol>
-                <fieldset class="action"><input type="submit" class="btn btn-primary" value="View spine label" /></fieldset>
 				</fieldset>
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="View spine label" />
+                    </fieldset>
 				</form>
 
             </main>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
index 9e04a619c17..f50efe67bc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
@@ -94,7 +94,9 @@
                         <li><label for="uploadfile">File:</label><input name="uploadfile" type="file" id="uploadfile" /></li>
 
                         </ol>
-                        <fieldset class="action"><input name="upload" type="submit" id="upload" class="btn btn-primary" value="Upload file" /></fieldset>
+                    </fieldset>
+                    <fieldset class="action">
+                        <input name="upload" type="submit" id="upload" class="btn btn-primary" value="Upload file" />
                     </fieldset>
                 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
index eef273ce557..3bef4b075de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
@@ -236,11 +236,11 @@
                   </ol>
                 </fieldset>
                 <fieldset class="action">
-                  <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Save changes</button>
-                  <a class="cancel btn btn-link"
-                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">
-                    Cancel
-                  </a>
+                    <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Save changes</button>
+                    <a class="cancel btn btn-link"
+                        href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">
+                        Cancel
+                    </a>
                 </fieldset>
               </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
index cb7154543cd..94586b14e77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
@@ -70,8 +70,10 @@
             <input class="required" required="required" type="file" id="fileToUpload" size="50" name="fileToUpload" />
             <span class="required">Required</span>
        </li></ol>
-       <fieldset class="action"><input type="button" class="btn btn-primary" value="Upload file" id="upload_file" /></fieldset>
 	   </fieldset>
+        <fieldset class="action">
+            <input type="button" class="btn btn-primary" value="Upload file" id="upload_file" />
+        </fieldset>
      </form>
      <div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div>
      <div id="fileuploadfailed" style="display:none"></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
index 9f39a0f848e..9064ca9a0de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
@@ -60,10 +60,6 @@
                                     <input type="text" id="image_name" name="image_name" size="20" />
                                 </li>
                                 </ol>
-                                <div class="action">
-                                    <input type="hidden" name="op" value="upload" />
-                                    <input class="btn btn-primary" id="uploadsu" type="submit" value="Upload" />
-                                </div>
                                 [% IF ( IMPORT_SUCCESSFUL ) %]
                                     <div class="dialog message">
                                     <h3>Image successfully uploaded</h3>
@@ -72,7 +68,10 @@
                                     </div>
                                 [% END %]
                             </fieldset>
-
+                            <fieldset class="action">
+                                <input type="hidden" name="op" value="upload" />
+                                <input class="btn btn-primary" id="uploadsu" type="submit" value="Upload" />
+                            </fieldset>
                         </form>
                     </div>
                     <div class="col-sm-6">
@@ -120,16 +119,16 @@
                                     [% END %]
                                     [% END %]
                                 </table>
-                                <div class="action">
-                                    <input type="hidden" name="op" value="delete" />
-                                    <input class="btn btn-default btn-default" type="button" id="delete" value="Delete selected" />
-                                </div>
                                 [% IF ( DELETE_SUCCESSFULL ) %]
                                 <div id="dialog" class="dialog message">
                                     <h3>Image(s) successfully deleted</h3>
                                 </div>
                                 [% END %]
                             </fieldset>
+                            <fieldset class="action">
+                                <input type="hidden" name="op" value="delete" />
+                                <input class="btn btn-primary" type="button" id="delete" value="Delete selected" />
+                            </fieldset>
                         </form>
                         [% ELSE %]
                         <fieldset class="brief">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
index bafe7494eb7..35883f66919 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -190,10 +190,10 @@
                     </ol>
                 </fieldset>
 
-                <div class="action">
+                <fieldset class="action">
                     <input type="hidden" name="registerid" value="[% register.id | html %]">
                     <input type="submit" class="btn btn-primary" value="Display" />
-                </div>
+                </fieldset>
             </form>
 
             [% IF trange_f %]
-- 
2.30.2