From 0cb7bdedcdcdb0646146af35885cbb0e5d3c0d0c Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 1 Nov 2023 23:05:42 +0000 Subject: [PATCH] Bug 35157: Remove spans from patronfields.inc To test: 1. Run any page that contains the "Search patrons" search bar through an HTML validator and you will see a lot of: Stray start tag span. Stray end tag span. 2. Apply patch 3. Try step 1 again, no more errors from the HTML validator. 4. Make sure the patron searches still work when limiting by 'Search field'. Signed-off-by: Brendan Lawlor Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Katrin Fischer (cherry picked from commit 1faa3eb0e927f424d830fead5aa7552eb05e0aea) Signed-off-by: Fridolin Somers --- .../prog/en/includes/patronfields.inc | 156 +++++++++--------- .../en/modules/members/alert-subscriptions.tt | 1 + 2 files changed, 79 insertions(+), 78 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc index d3e111eb3d..88cada8b69 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc @@ -1,82 +1,82 @@ [%- BLOCK patron_fields -%] - [%- SWITCH name -%] - [%- CASE 'standard' -%]Standard - [%- CASE 'full_address' -%]Full address - [%- CASE 'all_emails' -%]All emails - [%- CASE 'all_phones' -%]All phones - [%- CASE 'borrowernumber' -%]Borrowernumber - [%- CASE 'cardnumber' -%]Card number - [%- CASE 'surname' -%]Surname - [%- CASE 'firstname' -%]First name - [%- CASE 'middle_name' -%]Middle name - [%- CASE 'title' -%]Salutation - [%- CASE 'othernames' -%]Other name - [%- CASE 'initials' -%]Initials - [%- CASE 'pronouns' -%]Pronouns - [%- CASE 'streetnumber' -%]Street number - [%- CASE 'streettype' -%]Street type - [%- CASE 'address' -%]Address - [%- CASE 'address2' -%]Address 2 - [%- CASE 'city' -%]City - [%- CASE 'state' -%]State - [%- CASE 'zipcode' -%]ZIP/Postal code - [%- CASE 'country' -%]Country - [%- CASE 'email' -%]Primary email - [%- CASE 'phone' -%]Primary phone - [%- CASE 'mobile' -%]Mobile phone - [%- CASE 'fax' -%]Fax - [%- CASE 'emailpro' -%]Secondary email - [%- CASE 'phonepro' -%]Secondary phone - [%- CASE 'B_streetnumber' -%]Alternate street number - [%- CASE 'B_streettype' -%]Alternate street type - [%- CASE 'B_address' -%]Alternate address - [%- CASE 'B_address2' -%]Alternate address line 2 - [%- CASE 'B_city' -%]Alternate city - [%- CASE 'B_state' -%]Alternate state - [%- CASE 'B_zipcode' -%]Alternate zip code - [%- CASE 'B_country' -%]Alternate country - [%- CASE 'B_email' -%]Alternate email - [%- CASE 'B_phone' -%]Alternate phone - [%- CASE 'dateofbirth' -%]Date of birth - [%- CASE 'branchcode' -%]Library (code) - [%- CASE 'categorycode' -%]Category (code) - [%- CASE 'dateenrolled' -%]Registration date - [%- CASE 'dateexpiry' -%]Expiry date - [%- CASE 'gonenoaddress' -%]Gone no address - [%- CASE 'lost' -%]Lost card - [%- CASE 'debarred' -%]Restricted - [%- CASE 'debarredcomment' -%]Restriction reason - [%- CASE 'contactname' -%]Guarantor surname - [%- CASE 'contactfirstname' -%]Guarantor firstname - [%- CASE 'contacttitle' -%]Guarantor title - [%- CASE 'guarantorid' -%]Guarantor ID - [%- CASE 'borrowernotes' -%]Circulation note - [%- CASE 'relationship' -%]Guarantor relationship - [%- CASE 'sex' -%]Gender - [%- CASE 'flags' -%]Permissions (code) - [%- CASE 'userid' -%]Username - [%- CASE 'opacnote' -%]OPAC note - [%- CASE 'contactnote' -%]Contact note - [%- CASE 'sort1' -%]Sort 1 - [%- CASE 'sort2' -%]Sort 2 - [%- CASE 'altcontactfirstname' -%]Alternate contact first name - [%- CASE 'altcontactsurname' -%]Alternate contact surname - [%- CASE 'altcontactaddress1' -%]Alternate contact address - [%- CASE 'altcontactaddress2' -%]Alternate contact address 2 - [%- CASE 'altcontactaddress3' -%]Alternate contact city - [%- CASE 'altcontactstate' -%]Alternate contact state - [%- CASE 'altcontactzipcode' -%]Alternate contact ZIP/postal code - [%- CASE 'altcontactcountry' -%]Alternate contact country - [%- CASE 'altcontactphone' -%]Alternate contact phone - [%- CASE 'smsalertnumber' -%]SMS alert number - [%- CASE 'sms_provider_id' -%]SMS provider - [%- CASE 'privacy' -%]Privacy (code) - [%- CASE 'privacy_guarantor_checkouts' -%]Guarantor can view checkouts - [%- CASE 'updated_on' -%]Last updated - [%- CASE 'lastseen' -%]Last seen - [%- CASE 'checkprevcheckout' -%]Check previous checkout - [%- CASE DEFAULT -%] - [%- END -%] + [%- SWITCH name -%] + [%- CASE 'standard' -%][% t("Standard") | html %] + [%- CASE 'full_address' -%][% t("Full address") | html %] + [%- CASE 'all_emails' -%][% t("All emails") | html %] + [%- CASE 'all_phones' -%][% t("All phones") | html %] + [%- CASE 'borrowernumber' -%][% t("Borrowernumber") | html %] + [%- CASE 'cardnumber' -%][% t("Card number") | html %] + [%- CASE 'surname' -%][% t("Surname") | html %] + [%- CASE 'firstname' -%][% t("First name") | html %] + [%- CASE 'middle_name' -%][% t("Middle name") | html %] + [%- CASE 'title' -%][% t("Salutation") | html %] + [%- CASE 'othernames' -%][% t("Other name") | html %] + [%- CASE 'initials' -%][% t("Initials") | html %] + [%- CASE 'pronouns' -%][% t("Pronouns") | html %] + [%- CASE 'streetnumber' -%][% t("Street number") | html %] + [%- CASE 'streettype' -%][% t("Street type") | html %] + [%- CASE 'address' -%][% t("Address") | html %] + [%- CASE 'address2' -%][% t("Address 2") | html %] + [%- CASE 'city' -%][% t("City") | html %] + [%- CASE 'state' -%][% t("State") | html %] + [%- CASE 'zipcode' -%][% t("ZIP/Postal code") | html %] + [%- CASE 'country' -%][% t("Country") | html %] + [%- CASE 'email' -%][% t("Primary email") | html %] + [%- CASE 'phone' -%][% t("Primary phone") | html %] + [%- CASE 'mobile' -%][% t("Mobile phone") | html %] + [%- CASE 'fax' -%][% t("Fax") | html %] + [%- CASE 'emailpro' -%][% t("Secondary email") | html %] + [%- CASE 'phonepro' -%][% t("Secondary phone") | html %] + [%- CASE 'B_streetnumber' -%][% t("Alternate street number") | html %] + [%- CASE 'B_streettype' -%][% t("Alternate street type") | html %] + [%- CASE 'B_address' -%][% t("Alternate address") | html %] + [%- CASE 'B_address2' -%][% t("Alternate address line 2") | html %] + [%- CASE 'B_city' -%][% t("Alternate city") | html %] + [%- CASE 'B_state' -%][% t("Alternate state") | html %] + [%- CASE 'B_zipcode' -%][% t("Alternate zip code") | html %] + [%- CASE 'B_country' -%][% t("Alternate country") | html %] + [%- CASE 'B_email' -%][% t("Alternate email") | html %] + [%- CASE 'B_phone' -%][% t("Alternate phone") | html %] + [%- CASE 'dateofbirth' -%][% t("Date of birth") | html %] + [%- CASE 'branchcode' -%][% t("Library (code)") | html %] + [%- CASE 'categorycode' -%][% t("Category (code)") | html %] + [%- CASE 'dateenrolled' -%][% t("Registration date") | html %] + [%- CASE 'dateexpiry' -%][% t("Expiry date") | html %] + [%- CASE 'gonenoaddress' -%][% t("Gone no address") | html %] + [%- CASE 'lost' -%][% t("Lost card") | html %] + [%- CASE 'debarred' -%][% t("Restricted") | html %] + [%- CASE 'debarredcomment' -%][% t("Restriction reason") | html %] + [%- CASE 'contactname' -%][% t("Guarantor surname") | html %] + [%- CASE 'contactfirstname' -%][% t("Guarantor firstname") | html %] + [%- CASE 'contacttitle' -%][% t("Guarantor title") | html %] + [%- CASE 'guarantorid' -%][% t("Guarantor ID") | html %] + [%- CASE 'borrowernotes' -%][% t("Circulation note") | html %] + [%- CASE 'relationship' -%][% t("Guarantor relationship") | html %] + [%- CASE 'sex' -%][% t("Gender") | html %] + [%- CASE 'flags' -%][% t("Permissions (code)") | html %] + [%- CASE 'userid' -%][% t("Username") | html %] + [%- CASE 'opacnote' -%][% t("OPAC note") | html %] + [%- CASE 'contactnote' -%][% t("Contact note") | html %] + [%- CASE 'sort1' -%][% t("Sort 1") | html %] + [%- CASE 'sort2' -%][% t("Sort 2") | html %] + [%- CASE 'altcontactfirstname' -%][% t("Alternate contact first name") | html %] + [%- CASE 'altcontactsurname' -%][% t("Alternate contact surname") | html %] + [%- CASE 'altcontactaddress1' -%][% t("Alternate contact address") | html %] + [%- CASE 'altcontactaddress2' -%][% t("Alternate contact address 2") | html %] + [%- CASE 'altcontactaddress3' -%][% t("Alternate contact city") | html %] + [%- CASE 'altcontactstate' -%][% t("Alternate contact state") | html %] + [%- CASE 'altcontactzipcode' -%][% t("Alternate contact ZIP/postal code") | html %] + [%- CASE 'altcontactcountry' -%][% t("Alternate contact country") | html %] + [%- CASE 'altcontactphone' -%][% t("Alternate contact phone") | html %] + [%- CASE 'smsalertnumber' -%][% t("SMS alert number") | html %] + [%- CASE 'sms_provider_id' -%][% t("SMS provider") | html %] + [%- CASE 'privacy' -%][% t("Privacy (code)") | html %] + [%- CASE 'privacy_guarantor_checkouts' -%][% t("Guarantor can view checkouts") | html %] + [%- CASE 'updated_on' -%][% t("Last updated") | html %] + [%- CASE 'lastseen' -%][% t("Last seen") | html %] + [%- CASE 'checkprevcheckout' -%][% t("Check previous checkout") | html %] + [%- CASE DEFAULT -%] + [%- END -%] [%- END -%] [%- BLOCK patron_fields_dropdown -%] [% IF search_box %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt index d087835b5e..d149cc66ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt @@ -2,6 +2,7 @@ [% USE Asset %] [% USE AuthorisedValues %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Alert subscriptions for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha -- 2.20.1