From 7479d719fcb4b038c41c5e9bd20ba1c0d9781e12 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 1 Feb 2023 11:59:53 +0000
Subject: [PATCH] Bug 32954: Standardize action fieldsets in rotating
 collections, suggestions, tools

As per Bug 32744: Fieldsets with the class "action" should be placed
outside of the fieldset containing the main body of the form. This
report covers a few templates in rotating collections, suggestions, and
tools.

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

- Tools -> Rotating collections. Create a collection if necessary, then
  click "Action" -> "Manage items." Check the form on the manage items
  page.
- Suggestions -> Sidebar filter. Check that different sets of filters
  expand and collapse correctly.
- Tools -> Batch item modification (initial form)
- Tools -> Inventory (initial form)
- Cataloging -> Stage records for import (initial form)
- Tools -> Upload (upload and search forms)

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 508ad15cb789b4b190f8172fcf58265b8a957a66)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../modules/rotating_collections/addItems.tt  | 10 +--
 .../prog/en/modules/suggestion/suggestion.tt  | 79 +++++++++++--------
 .../prog/en/modules/tools/batchMod.tt         |  4 +-
 .../prog/en/modules/tools/inventory.tt        |  2 +-
 .../en/modules/tools/stage-marc-import.tt     |  2 +-
 .../prog/en/modules/tools/upload.tt           |  6 +-
 6 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
index 68fb2048b7..30520c3c82 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
@@ -103,11 +103,11 @@
                                 [% END %]
                             </li>
                         </ol>
-                        <p>
-                            <input type="hidden" id="colId" name="colId" value="[% colId | html %]" />
-                            <input type="hidden" name="action" value="addItem" />
-                            <input type="submit" class="btn btn-primary" value="Submit" />
-                        </p>
+                    </fieldset>
+                    <fieldset class="action">
+                        <input type="hidden" id="colId" name="colId" value="[% colId | html %]" />
+                        <input type="hidden" name="action" value="addItem" />
+                        <input type="submit" class="btn btn-primary" value="Submit" />
                     </fieldset>
 
                 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 0a502e7788..f516c5f9a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -31,7 +31,8 @@
                 font-size: 80%;
                 text-decoration: none;
             }
-            #limits fieldset.brief {
+            #limits fieldset.brief,
+            #limits fieldset.action {
                 display: none;
             }
             .overlay {
@@ -644,9 +645,8 @@
                     </ol>
                 </fieldset> <!-- /.rows -->
 
-                <input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby | html %][% ELSE %]noone[% END %]"/>
-
                 <fieldset class="action">
+                    <input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby | html %][% ELSE %]noone[% END %]"/>
                     <input type="hidden" name="op" value="[% op | html %]" />
                     [% IF ( suggestionid ) %]
                         [% IF ( need_confirm ) %]
@@ -948,13 +948,13 @@
 
                                             <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
                                             <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
-                                            <fieldset class="action">
-                                                <button type="submit" class="btn btn-primary" value="update_status">Submit</button>
-                                            </fieldset>
+                                        </fieldset>
+                                        <fieldset class="action">
+                                            <button type="submit" class="btn btn-primary" value="update_status">Submit</button>
                                         </fieldset>
                                     </div> <!-- /.col-sm-4 -->
 
-                                    <div class="col-sm-4">
+                                    <div class="col-sm-2">
                                         <fieldset class="brief">
                                             <label id="suggestion_itemtype">
                                                 Update item types with:
@@ -962,9 +962,9 @@
                                             [% PROCESS 'av-build-dropbox.inc' name="suggestion_itemtype", category="SUGGEST_FORMAT", size = 20  %]
                                             <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
                                             <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
-                                            <fieldset class="action">
-                                                <button type="submit" class="btn btn-primary" value="update_itemtype">Submit</button>
-                                            </fieldset>
+                                        </fieldset>
+                                        <fieldset class="action">
+                                            <button type="submit" class="btn btn-primary" value="update_itemtype">Submit</button>
                                         </fieldset>
                                     </div> <!-- /.col-sm-4 -->
 
@@ -976,9 +976,9 @@
                                             <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count | html %]" value="[% logged_in_user.borrowernumber | html %]" />
                                             <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
                                             <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
-                                            <fieldset class="action">
-                                                <button type="submit" class="btn btn-primary" value="update_manager">Submit</button>
-                                            </fieldset>
+                                        </fieldset>
+                                        <fieldset class="action">
+                                            <button type="submit" class="btn btn-primary" value="update_manager">Submit</button>
                                         </fieldset>
                                     </div> <!-- /.col-sm-2 -->
 
@@ -987,9 +987,9 @@
                                             <span class="label">Delete selected</span>
                                             <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
                                             <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
-                                            <fieldset class="action">
-                                                <button type="submit" class="btn btn-primary" value="delete">Delete</button>
-                                            </fieldset>
+                                        </fieldset>
+                                        <fieldset class="action">
+                                            <button type="submit" class="btn btn-primary" value="delete">Delete</button>
                                         </fieldset>
                                     </div> <!-- /.col-sm-2 -->
                                     <div class="col-sm-2">
@@ -1058,17 +1058,17 @@
                                         </select>
                                     </li>
                                 </ol>
-                                <fieldset class="action">
-                                    <input type="submit" class="btn btn-primary" value="Go" />
-                                </fieldset>
                             </fieldset> <!-- /.brief -->
+                            <fieldset class="action">
+                                <input type="submit" class="btn btn-primary" value="Go" />
+                            </fieldset>
 
                             <fieldset class="brief">
                                 <h4>Filter by: <a style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4>
 
                                 <div id="limits">
                                     <h4 class="local_collapse"><a href="#" data-target="biblio_information">Bibliographic information</a></h4>
-                                    <fieldset class="brief" id="biblio_information">
+                                    <fieldset class="brief biblio_information">
                                         <ol>
                                             <li>
                                                 <label for="title"> Title:</label>
@@ -1095,13 +1095,13 @@
                                                 <input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" />
                                             </li>
                                         </ol>
-                                        <fieldset class="action">
-                                            <input type="submit" value="Go" />
-                                        </fieldset>
-                                    </fieldset> <!-- /#biblio_information -->
+                                    </fieldset> <!-- /.biblio_information -->
+                                    <fieldset class="action biblio_information">
+                                        <input type="submit" value="Go" />
+                                    </fieldset>
 
                                     <h4 class="local_collapse"><a href="#" data-target="suggestion_information">Suggestion information</a></h4>
-                                    <fieldset class="brief" id="suggestion_information">
+                                    <fieldset class="brief suggestion_information">
                                         <ol>
                                             <li>
                                                 <label for="archived" style="display: inline;">Include archived:</label>
@@ -1219,15 +1219,15 @@
                                                 <input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to | html %]" class="flatpickr" />
                                             </li>
                                         </ol>
-                                        <fieldset class="action">
-                                            <input type="submit" value="Go" />
-                                        </fieldset>
                                     </fieldset> <!-- /#suggestion_information -->
+                                    <fieldset class="action suggestion_information">
+                                        <input type="submit" value="Go" />
+                                    </fieldset>
 
                                     <h4 class="local_collapse">
                                         <a href="#" data-target="acquisition_information">Acquisition information</a>
                                     </h4>
-                                    <fieldset class="brief" id="acquisition_information">
+                                    <fieldset class="brief acquisition_information">
                                         <ol>
                                             <li>
                                                 <label for="budgetid"> Book fund:</label>
@@ -1248,10 +1248,23 @@
                                                 </select>
                                             </li>
                                         </ol>
-                                        <fieldset class="action">
-                                            <input type="submit" value="Go" />
-                                        </fieldset>
                                     </fieldset> <!-- /#acquisition_information -->
+                                    <fieldset class="action acquisition_information">
+                                        <input type="submit" value="Go" />
+                                    </fieldset>
+
+                                    <div id="filter_archived_information">
+                                        <ol>
+                                            <li>
+                                                <label for="archived" style="display: inline;">Include archived:</label>
+                                                [% IF filter_archived %]
+                                                    <input type="checkbox" id="archived" value="1" name="filter_archived" checked="checked" title="Include archived suggestions in the search" />
+                                                [% ELSE %]
+                                                    <input type="checkbox" id="archived" value="1" name="filter_archived" title="Include archived suggestions in the search" />
+                                                [% END %]
+                                            </li>
+                                        </ol>
+                                    </div>
                                 </div> <!-- /#limits -->
                             </fieldset> <!-- /.brief -->
                         </form> <!-- /suggestionsfilter -->
@@ -1409,7 +1422,7 @@
                 $("h4.local_collapse a").on("click", function(e){
                     e.preventDefault();
                     const target = $(this).data("target");
-                    $("#" + target).toggle();
+                    $("." + target).toggle();
                 });
 
                 // Note: the selector below passes a second 'context' param - it is not a multiple selector
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
index fc37f49172..3bca0ad225 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
@@ -63,8 +63,8 @@
                                       <textarea rows="10" cols="30" id="barcodelist" name="barcodelist"></textarea>
                                     </li>
                                 </ol>
+                                <input type="hidden" name="op" value="show" />
                             </fieldset>
-                            <input type="hidden" name="op" value="show" />
 
                             [% UNLESS del %]
                                 <fieldset class="rows">
@@ -79,8 +79,8 @@
                                 </fieldset>
                             [% END %]
 
-                            [% IF ( del ) %]<input type="hidden" name="del" value="1" />[% END %]
                             <fieldset class="action">
+                                [% IF ( del ) %]<input type="hidden" name="del" value="1" />[% END %]
                                 <input type="submit" class="btn btn-primary" value="Continue" />
                                 <a class="cancel" href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cancel</a>
                             </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
index 1571f6a3ee..3209c016f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -235,8 +235,8 @@
            <input type="checkbox" name="CSVexport" id="CSVexport" />
         </li>
         </ol>
-  </fieldset>
             <input type="hidden" name="op" value="do_it" />
+  </fieldset>
 
             <fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" /></fieldset>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
index dfb1d05fe7..0fe36f2ba4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
@@ -98,11 +98,11 @@
         </div>
     </li>
 </ol>
+</fieldset>
     <fieldset class="action">
         <button id="fileuploadbutton" class="btn btn-primary">Upload file</button>
         <button id="fileuploadcancel">Cancel</button>
     </fieldset>
-</fieldset>
 
     <div id="fileuploadpanel">
         <div id="fileuploadstatus" class="progress_panel">Upload progress:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
index 2ee6c6a489..8f4952148f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -99,11 +99,11 @@
             [% END %]
         </li>
         </ol>
+        </fieldset>
         <fieldset class="action">
             <button id="fileuploadbutton" class="btn btn-primary">Upload</button>
             <button id="fileuploadcancel">Cancel</button>
         </fieldset>
-        </fieldset>
         <div id="fileuploadpanel">
             <div id="fileuploadstatus" class="progress_panel">Upload progress:
             <progress id="fileuploadprogress" max="100" value="0">
@@ -137,10 +137,10 @@
                 </select>
             </li>
         </ol>
+        </fieldset>
         <fieldset class="action">
             <button id="browsebutton" class="btn btn-primary">Search</button>
         </fieldset>
-        </fieldset>
     </form>
     [% END %]
 [% END %]
@@ -157,10 +157,10 @@
             <input type="text" id="term" name="term" value=""/>
         </li>
         </ol>
+        </fieldset>
         <fieldset class="action">
             <button id="searchbutton" class="btn btn-primary">Search</button>
         </fieldset>
-        </fieldset>
     </form>
 [% END %]
 
-- 
2.39.5