From 92a5bed9e43efad55908667927303aa21a3ad82a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 30 Aug 2024 17:35:06 +0000 Subject: [PATCH] Bug 30699: Fix various HTML validity errors in staff interface templates This patch fixes several HTML validity issues in various staff interface templates. Most of these changes won't be visible in the interface. - Advanced search: - Remove stray tags - Fix duplicate IDs by adding loop.index to repeated dropdown menus - Circulation - Fix mismatched label and form field id in checkouts table footer - Fix mismatched label and form field id claim returned modal - Remove invalid href attribute from button in claim returned modal - Wrap relatives' checkouts tab in conditional so that panel doesn't appear when tab has been hidden - Fix duplicate id attributes in patron messages-related markup - Remove redundant class attribute from patron messages-related markup - Acquisitions -> Vendor -> Basket -> Add to basket -> From staged file - Remove invalid "size" attribute from hidden form fields - Circulation -> Holds awaiting pickup - Fix mismatched label and form field id - Patron -> Accounting -> Pay fine -> Submit cash amount higher than the charge - Remove invalid href attribute from button in confirmation modal - Fix errors in tab markup WRAPPERs in html_helpers.inc to prevent mismatched aria-labelledby attributes - Footer language selector: - Fix markup to correct errors in aria-controls - Remove invalid href attribute from cookie consent modal Sponsored-by: Athens County Public Libraries Signed-off-by: Phil Ringnalda Signed-off-by: Aleisha Amohia --- .../intranet-tmpl/prog/en/includes/adv-search.inc | 8 ++++---- .../prog/en/includes/checkouts-table-footer.inc | 2 +- .../intranet-tmpl/prog/en/includes/html_helpers.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/intranet-bottom.inc | 6 +++--- .../intranet-tmpl/prog/en/includes/members-toolbar.inc | 6 +++--- .../prog/en/includes/modals/resolve_return_claim.inc | 4 ++-- .../prog/en/includes/patron-detail-tabs.inc | 10 ++++++---- .../intranet-tmpl/prog/en/includes/patron_messages.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/search_indexes.inc | 4 ++-- .../prog/en/modules/acqui/addorderiso2709.tt | 4 ++-- .../prog/en/modules/catalogue/advsearch.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../prog/en/modules/members/paycollect.tt | 2 +- .../intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- 14 files changed, 35 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc index aa48fc49617..64c5e4d647b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc @@ -16,18 +16,18 @@ [% WRAPPER tabs_nav %] [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] [% WRAPPER tab_item tabname= "circ_search" bt_active= 1 %] - Check out + Check out [% END %] [% WRAPPER tab_item tabname= "checkin_search" %] - Check in + Check in [% END %] [% WRAPPER tab_item tabname= "renew_search" %] - Renew + Renew [% END %] [% END %] [% IF ( CAN_user_borrowers_edit_borrowers ) %] [% WRAPPER tab_item tabname= "patron_search" %] - Search patrons + Search patrons [% END %] [% END %] [% END # /WRAPPER tabs_nav %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc index c12c14a631c..f4029f580f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc @@ -11,7 +11,7 @@ [% END %]

-

+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index 12eba7fa6d4..d5af13c7dc6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -395,9 +395,9 @@ [% END %] [% IF ( bt_active ) %] [% IF (linktab) %] - + [% ELSE %] - + [% END %] [% ELSE %] [% IF (linktab) %] @@ -420,9 +420,9 @@ [% BLOCK tab_panel %] [% IF ( bt_active ) %] -
+
[% ELSE %] -
+
[% END %] [% content| $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index 554825e2024..cb6b50ae30f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -13,10 +13,10 @@ [% UNLESS ( one_language_enabled ) %] -