Attachment 146595 Details for Bug 32952 – Bug 32952: Standardize action fieldsets in authorities, cataloging, and circulation

[patch] Bug 32952: Standardize action fieldsets in authorities, cataloging, and circulation

Bug-32952-Standardize-action-fieldsets-in-authorit.patch (text/plain), 6.77 KB, created by Owen Leonard on 2023-02-13 18:37:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-02-13 18:37:18 UTC

Size: 6.77 KB

patch

obsolete

>From 04608a5ff0761406745421074e9dba3b120c223a Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 1 Feb 2023 11:58:04 +0000
>Subject: [PATCH] Bug 32952: Standardize action fieldsets in authorities,
> cataloging, and circulation
>
>This patch updates some templates in authorities, cataloging, and
>circulation 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:
>
>- Authorities -> Authority search -> Merge
>- Catalog -> Search -> Merge records
>- Catalog -> Bibliographic record details -> Edit -> Attach item
>- Circulation -> Check out to patron -> Batch check out
>- Circulation -> Overdues -> Sidebar filter
>- Circulation -> Holds to pull -> Sidebar filter
>---
> .../intranet-tmpl/prog/en/modules/authorities/merge.tt    | 4 +++-
> .../intranet-tmpl/prog/en/modules/cataloguing/merge.tt    | 2 +-
> .../intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt | 8 ++++++--
> .../prog/en/modules/circ/circulation_batch_checkouts.tt   | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt   | 8 ++++----
> .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 6 ++++--
> 6 files changed, 20 insertions(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>index 965dcdbd04..7feeb2b80a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
>@@ -94,7 +94,9 @@ div#result { margin-top: 1em; }
> 
>     <input type="hidden" name="authid" value="[% recordid1 | html %]" />
>     <input type="hidden" name="authid" value="[% recordid2 | html %]" />
>-    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Next" /></fieldset>
>+    </fieldset>
>+    <fieldset class="action">
>+        <input type="submit" class="btn btn-primary" value="Next" />
>     </fieldset>
> </form>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>index c19fd7fb63..b04a327674 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>@@ -137,10 +137,10 @@ div#result { margin-top: 1em; }
>     [% FOREACH record IN records %]
>         <input type="hidden" name="biblionumber" value="[% record.biblionumber | html %]" />
>     [% END %]
>+    </fieldset>
>     <fieldset class="action">
>         <input type="submit" class="btn btn-primary" value="Next" />
>     </fieldset>
>-    </fieldset>
> </form>
> 
> <div id="dataPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>index d9d01d074e..ba5af45734 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>@@ -109,8 +109,10 @@
> 		<label for="biblionumber">Select the biblionumber to attach the item to</label>
> 			<div class="hint">Enter biblionumber:</div>
> 		    <input type="text" name="biblionumber" id="biblionumber" class="focus" size="14" />
>-            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" /></fieldset>
> 	    </fieldset>
>+        <fieldset class="action">
>+            <input type="submit" class="btn btn-primary" value="Submit" />
>+        </fieldset>
> 	    [% ELSE %]
> 	    <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber | html %]" />
> 	    [% END %]
>@@ -120,8 +122,10 @@
> 		<label for="barcode">Enter the barcode of the item to attach:</label>
> 		    <p class="hint">The item you select will be moved to the target record.</p>
> 		    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
>-            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" /></fieldset>
> 	    </fieldset>
>+        <fieldset class="action">
>+            <input type="submit" class="btn btn-primary" value="Submit" />
>+        </fieldset>
> 	    [% ELSE %]
> 	    <input type="hidden" name="barcode" id="barcode" value="[% barcode | html %]" />
> 	    [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>index b34bbac1ed..8d89c75e09 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>@@ -120,12 +120,12 @@
>           </fieldset>
>       [% END %]
>       <input type="hidden" name="op" value="show" />
>-      <fieldset class="action">
>+    </fieldset>
>+    <fieldset class="action">
>         <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
>         <input type="hidden" name="branch" value="[% branch | html %]" />
>         <input type="hidden" name="batch" value="1" />
>         <input type="submit" class="btn btn-primary" value="Check out" />
>-      </fieldset>
>     </fieldset>
>   </form>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index bc29885b4d..27d7dfb269 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -272,11 +272,11 @@
>     </li>
> 
> </ol>
>-   <fieldset class="action">
>-      <input type="submit" class="btn btn-primary" value="Apply filter" />
>-      <input type="hidden" name="op" value="apply filter" />
>-   </fieldset>
>    </fieldset>
>+    <fieldset class="action">
>+        <input type="submit" class="btn btn-primary" value="Apply filter" />
>+        <input type="hidden" name="op" value="apply filter" />
>+    </fieldset>
>   </form>
> 
>             </aside>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>index 89072074a0..98ee66fcbb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -300,9 +300,11 @@
> [% ELSE %]
>     <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p>
> [% END %]
>-
>-<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="btn btn-primary" /></fieldset>
> </fieldset>
>+
>+    <fieldset class="action">
>+        <input type="submit" name="run_report" value="Submit" class="btn btn-primary" />
>+    </fieldset>
> </form>
> 
> </div>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32952: 146590 | 146595 | 146612 | 147406