From 4e5a77fb9b0e266d49bfd8d2fa3be76aa8d51e6a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 31 May 2024 13:14:17 +0000
Subject: [PATCH] Bug 37002: Correct several HTML markup errors

This patch makes several minor corrections to HTML markup in the
bibliographic detail page template and related include files. This
corrects the following validator errors:

- Stray end tag a.
- Bad value true for attribute disabled on element select.
- Bad value true for attribute disabled on element input.
- No space between attributes.
- Duplicate attribute class.
- The value of the for attribute of the label element must be the ID of
  a non-hidden form control.

The patch is simple enough that an inspection of the patch is probably
enough, but following is a detailed test plan of the affected areas:

- Apply the patch and view the bibliographic detail page in the
  staff interface.
- Under the "Edit" menu in the toolbar, these options should still work
  correctly:
  - Modify record using template
  - Edit items in a batch
  - Delete items in a batch
- Click the "Items" link in the sidebar and find the "Bookable" setting
  for the title's items. Make at least one item bookable and return to
  the detail page.
- Click the "Place booking" button in the toolbar and confirm that you
  can successfully place the booking.
- If you have access to Novelist, confirm that Novelist content displays
  correctly on the detail page.
- Turn on the "EnableItemGroups" preference.
- On the detail page, open the "Item groups" tab and click the "New item
  group" button.
  - In the modal, the "Name" and "Display order" labels give focus to
    the corresponding form field when clicked.
  - Create an item group.
- Under the holdings tab, select one or more items and click "Add/move
  to item group".
  - In the modal, clicking the "Item group" label should give focus to
    the dropdown.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 928681a24cbcca64d02822c13776c2f92df2a963)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc   |  6 +++---
 .../html_helpers/tables/items/catalogue_detail.inc   |  2 +-
 .../prog/en/includes/modals/place_booking.inc        |  8 ++++----
 .../prog/en/modules/catalogue/detail.tt              | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 7b3582172f..37a7d05ee0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -54,7 +54,7 @@
                         <input type="hidden" name="recordtype" value="biblio" />
                         <input type="hidden" name="op" value="cud-list" />
                         <input type="hidden" name="bib_list" value="[% biblionumber | html %]" />
-                        <button type="submit" class="btn btn-default" id="modifybiblio">Modify record using template</a>
+                        <button type="submit" class="btn btn-default" id="modifybiblio">Modify record using template</button>
                     </form>
                 </li>
             [% END %]
@@ -71,7 +71,7 @@
                             <input type="hidden" name="op" value="cud-show" />
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="src" value="CATALOGUING" />
-                            <button id="batchedit" type="submit" class="btn btn-default" id="modifybiblio">Edit items in a batch</a>
+                            <button id="batchedit" type="submit" class="btn btn-default" id="modifybiblio">Edit items in a batch</button>
                         </form>
                     </li>
                 [% ELSE %]
@@ -88,7 +88,7 @@
                             <input type="hidden" name="del" value="1" />
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="src" value="CATALOGUING" />
-                            <button id="batchdelete" type="submit" class="btn btn-default" id="modifybiblio">Delete items in a batch</a>
+                            <button id="batchdelete" type="submit" class="btn btn-default" id="modifybiblio">Delete items in a batch</button>
                         </form>
                     </li>
                 [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
index 4d23b75103..f7ca251121 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
@@ -40,7 +40,7 @@
             [% IF ( analyze ) %]<th id="[% tab | html %]_usedin" data-colname="[% tab | html %]_usedin">Used in</th><th></th>[% END %]
             [% IF Koha.Preference('UseCourseReserves') %]<th id="[% tab | html %]_course_reserves" data-colname="[% tab | html %]_course_reserves">Course reserves</th>[% END %]
             [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th id="[% tab | html %]_spinelabel" data-colname="[% tab | html %]_spinelabel" class="NoSort">Spine label</th>[% END %]
-            [% IF ( CAN_user_editcatalogue_edit_items ) %]<th id="[% tab | html %]_actions" data-colname="[% tab | html %]_actions"class="NoSort noExport">&nbsp;</th>[% END %]
+            [% IF ( CAN_user_editcatalogue_edit_items ) %]<th id="[% tab | html %]_actions" data-colname="[% tab | html %]_actions" class="NoSort noExport">&nbsp;</th>[% END %]
             </tr>
         </thead>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc
index 1840e2b791..56c5302dd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc
@@ -26,20 +26,20 @@
                                 <div class="hint">Enter patron card number or partial name</div>
                             </li>
                             <li>
-                                <label class="required" for="booking_pickup">Pickup at:</label>
-                                <select name="booking_pickup" id="pickup_library_id" required="required" disabled="true"></select>
+                                <label class="required" for="pickup_library_id">Pickup at:</label>
+                                <select name="booking_pickup" id="pickup_library_id" required="required" disabled="disabled"></select>
                                 <span class="required">Required</span>
                             </li>
                             <li>
                             <label for="booking_item_id">Item: </label>
-                                <select name="booking_item_id" id="booking_item_id" disabled="true">
+                                <select name="booking_item_id" id="booking_item_id" disabled="disabled">
                                     <option value="0">Any item</option>
                                 </select>
                             </li>
                             <li>
                                 <div id="period_fields">
                                     <label class="required" for="period">Booking dates: </label>
-                                    <input type="text" id="period" name="period" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-disable-shortcuts="true" required="required" disabled="true" autocomplete="off">
+                                    <input type="text" id="period" name="period" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-disable-shortcuts="true" required="required" disabled="disabled" autocomplete="off">
                                     <span class="required">Required</span>
                                 </div>
                                 <div class="hint">Select the booking start and end date</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 92513e5599..65e395e508 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -742,7 +742,7 @@
 
 
 [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && Koha.Preference('NovelistSelectStaffView') == 'tab' ) %]
-    <div role="tabpanel" class="tab-pane" id="NovelistSelect" class="novelistSelect">
+    <div role="tabpanel" class="tab-pane novelistSelect" id="NovelistSelect">
         <div data-novelist-novelistselect=[% normalized_isbn | html %]></div>
     </div>
 [% END %]
@@ -832,12 +832,12 @@
                 <div class="modal-body">
                     <fieldset>
                         <p>
-                            <label for="item_group_description" class="required">Name: </label>
+                            <label for="modal-item-group-create-form-description" class="required">Name: </label>
                             <input name="description" id="modal-item-group-create-form-description" type="text" size="30" required="required" class="required" />
                             <span class="required">Required</span>
                         </p>
                         <p>
-                            <label for="item_group_display_order" class="required">Display order: </label>
+                            <label for="modal-item-group-create-form-display_order" class="required">Display order: </label>
                             <input name="display_order" id="modal-item-group-create-form-display_order" value="0" size="5" required="required" class="required" />
                             <span class="required">Required</span>
                             <br/>
@@ -865,12 +865,12 @@
                 <div class="modal-body">
                     <fieldset>
                         <p>
-                            <label for="item_group_description" class="required">Name: </label>
+                            <label for="modal-item-group-edit-form-description" class="required">Name: </label>
                             <input name="description" id="modal-item-group-edit-form-description" type="text" size="30" required="required" class="required" />
                             <span class="required">Required</span>
                         </p>
                         <p>
-                            <label for="item_group_display_order" class="required">Sort order: </label>
+                            <label for="modal-item-group-edit-form-display_order" class="required">Sort order: </label>
                             <input name="display_order" id="modal-item-group-edit-form-display_order" size="5" />
                             <span class="hint">Numbers only, item groups will be displayed in counting order</span>
                         </p>
@@ -914,7 +914,7 @@
                 <div class="modal-body">
                     <fieldset>
                         <p>
-                            <label for="item_group" class="required">Item group: </label>
+                            <label for="item-group-add-form-select" class="required">Item group: </label>
                             <select name="item_group" id="item-group-add-form-select">
                                 [% FOREACH ig IN biblio.item_groups.search({}, {order_by => 'display_order'}) %]
                                     <option value="[% ig.id | html %]">[% ig.description | html %]</option>
-- 
2.39.5