From 548f0a4aeb4b62fe61e27acc43eebd4e10efc95a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 22 Jan 2026 13:36:36 -0500 Subject: [PATCH] Bug 41638: (follow-up) Fix more instances, some markup errors I've added changes for member-alt-address-style.inc, member-alt-contact-style.inc, and member-main-address-style.inc. I've also made some related markup corrections: Missing ID on some inputs, incorrect "for" label on some labels. These fixes don't correct *all* validation errors but it's an improvement. --- .../en/includes/member-alt-address-style.inc | 24 +++++++++---------- .../en/includes/member-alt-contact-style.inc | 20 ++++++++-------- .../en/includes/member-main-address-style.inc | 18 +++++++------- .../prog/en/modules/members/memberentrygen.tt | 18 +++++++------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc index 569151921f1..d955270b52b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc @@ -63,8 +63,8 @@ [% IF roadtypes.count %] [% UNLESS noB_streettype %]
  • - - [% FOR roadtype IN roadtypes %] [% IF roadtype.authorised_value == patron.B_streettype %] @@ -83,7 +83,7 @@ [% BLOCK 'alt-address-style_B_address' %] [% UNLESS noB_address %]
  • - + [% IF ( mandatoryB_address ) %]Required[% END %]
  • @@ -93,7 +93,7 @@ [% BLOCK 'alt-address-style_B_streetnumber' %] [% UNLESS noB_streetnumber %]
  • - + [% IF ( mandatoryB_streetnumber ) %]Required[% END %]
  • @@ -103,7 +103,7 @@ [% BLOCK 'alt-address-style_B_address2' %] [% UNLESS noB_address2 %]
  • - + [% IF ( mandatoryB_address2 ) %]Required[% END %]
  • @@ -113,7 +113,7 @@ [% BLOCK 'alt-address-style_B_zipcode' %] [% UNLESS noB_zipcode %]
  • - + [% IF ( mandatoryB_zipcode ) %]Required[% END %]
  • @@ -123,7 +123,7 @@ [% BLOCK 'alt-address-style_B_city' %] [% UNLESS noB_city %]
  • - + [% IF cities.count %] [% IF ( mandatoryB_state ) %]Required[% END %]
  • @@ -157,7 +157,7 @@ [% BLOCK 'alt-address-style_B_country' %] [% UNLESS noB_country %]
  • - + [% IF ( mandatoryB_country ) %]Required[% END %]
  • @@ -167,7 +167,7 @@ [% BLOCK 'alt-address-style_B_phone' %] [% UNLESS noB_phone %]
  • - + [% IF ( mandatoryB_phone ) %]Required[% END %]
  • @@ -177,7 +177,7 @@ [% BLOCK 'alt-address-style_B_email' %] [% UNLESS noB_email %]
  • - + [% IF ( NoUpdateEmail ) %] [% ELSE %] @@ -191,7 +191,7 @@ [% BLOCK 'alt-address-style_B_contactnote' %] [% UNLESS nocontactnote %]
  • - + [% IF ( mandatorycontactnote ) %]Required[% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc index 9f3d3b2ebaa..596fbb0b4f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc @@ -54,7 +54,7 @@ [% BLOCK 'alt-contact-style_altcontactsurname' %] [% UNLESS noaltcontactsurname %]
  • - + [% IF ( mandatoryaltcontactsurname ) %]Required[% END %]
  • @@ -64,7 +64,7 @@ [% BLOCK 'alt-contact-style_altcontactfirstname' %] [% UNLESS noaltcontactfirstname %]
  • - + [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %]
  • @@ -74,7 +74,7 @@ [% BLOCK 'alt-contact-style_altcontactaddress1' %] [% UNLESS noaltcontactaddress1 %]
  • - + [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %]
  • @@ -84,7 +84,7 @@ [% BLOCK 'alt-contact-style_altcontactaddress2' %] [% UNLESS noaltcontactaddress2 %]
  • - + [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %]
  • @@ -94,7 +94,7 @@ [% BLOCK 'alt-contact-style_altcontactzipcode' %] [% UNLESS noaltcontactzipcode %]
  • - + [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %]
  • @@ -104,9 +104,9 @@ [% BLOCK 'alt-contact-style_altcontactaddress3' %] [% UNLESS noaltcontactaddress3 %]
  • - + [% IF cities.count %] - [% FOREACH c IN cities %] [% SET option_value = c.city_zipcode _ '|' _ c.city_name _ '|' _ c.city_state _ '|' _ c.city_country %] @@ -128,7 +128,7 @@ [% BLOCK 'alt-contact-style_altcontactstate' %] [% UNLESS noaltcontactstate %]
  • - + [% IF ( mandatoryaltcontactstate ) %]Required[% END %]
  • @@ -138,7 +138,7 @@ [% BLOCK 'alt-contact-style_altcontactcountry' %] [% UNLESS noaltcontactcountry %]
  • - + [% IF ( mandatoryaltcontactcountry ) %]Required[% END %]
  • @@ -148,7 +148,7 @@ [% BLOCK 'alt-contact-style_altcontactphone' %] [% UNLESS noaltcontactphone %]
  • - + [% IF ( mandatoryaltcontactphone ) %]Required[% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc index 2a60ff0f9b3..fed4f883102 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc @@ -54,8 +54,8 @@ [% IF roadtypes.count %] [% UNLESS nostreettype %]
  • - - [% FOR roadtype IN roadtypes %] [% IF roadtype.authorised_value == patron.streettype %] @@ -74,7 +74,7 @@ [% BLOCK 'address-style_address' %] [% UNLESS noaddress %]
  • - + [% IF ( mandatoryaddress ) %]Required[% END %]
  • @@ -84,7 +84,7 @@ [% BLOCK 'address-style_streetnumber' %] [% UNLESS nostreetnumber %]
  • - + [% IF ( mandatorystreetnumber ) %]Required[% END %]
  • @@ -94,7 +94,7 @@ [% BLOCK 'address-style_address2' %] [% UNLESS noaddress2 %]
  • - + [% IF ( mandatoryaddress2 ) %]Required[% END %]
  • @@ -104,7 +104,7 @@ [% BLOCK 'address-style_zipcode' %] [% UNLESS nozipcode %]
  • - + [% IF ( mandatoryzipcode ) %]Required[% END %]
  • @@ -114,7 +114,7 @@ [% BLOCK 'address-style_city' %] [% UNLESS nocity %]
  • - + [% IF cities.count %] [% IF ( mandatorystate ) %]Required[% END %]
  • @@ -148,7 +148,7 @@ [% BLOCK 'address-style_country' %] [% UNLESS nocountry %]
  • - + [% IF ( mandatorycountry ) %]Required[% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index a8d127058f5..fd09b7ca931 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -437,7 +437,7 @@ [% UNLESS ( patron_category.category_type == 'I' ) %] [% UNLESS nosex %]
  • - + [% UNLESS ( op == 'duplicate' ) %] [% IF ( female ) %] @@ -532,7 +532,7 @@ [% UNLESS norelationship %]
  • - + Add manual restriction +
      [% IF Koha.Preference('PatronRestrictionTypes') %]
    1. - [% FOREACH restriction_type IN restriction_types %] [% IF !restriction_type.is_system %] [% IF restriction_type.is_default %] @@ -1488,7 +1488,7 @@
      1. - + [% IF ( housebound_role.housebound_chooser == 1 ) %] @@ -1502,7 +1502,7 @@ [% END %]
      2. - + [% IF ( housebound_role.housebound_deliverer == 1 ) %] -- 2.39.5