From 1edb6ef9ff3d8750757e48ef91d4c7c9dc872b8b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 3 Sep 2019 18:31:03 +0000 Subject: [PATCH] Bug 23512: (follow-up) Add markup comments This patch adds comments to the template to highlight the markup structure. This patch should have no effect on the interface or functionality. https://bugs.koha-community.org/show_bug.cgi?id=23533 Signed-off-by: Maryse Simard --- .../prog/en/modules/members/memberentrygen.tt | 210 +++++++++++---------- 1 file changed, 106 insertions(+), 104 deletions(-) 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 67823dd..770fada 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -65,8 +65,8 @@ [% IF ( S ) %] Staff [% END %] [% END %]) - [% END %] - + [% END # /UNLESS blocking_error %] +
@@ -101,8 +101,10 @@ [% ELSE %] Modify patron [% END %] + [% IF (firstname) %] [% firstname | html %] [% END %] [% IF (surname) %] [% surname | html %] [% END %] + ([% IF ( categoryname ) %] [% categoryname | html %] [% ELSE %] @@ -129,7 +131,7 @@
- [% END %] + [% END # /IF check_member %] [% IF ( nok ) %]
@@ -185,8 +187,8 @@
  • The alternative email is invalid.
  • [% END %] -
    - [% END %] +
    + [% END # /IF nok %]
    [% UNLESS ( check_member ) %] @@ -201,8 +203,8 @@ [% END %] Cancel - [% END %] -
    + [% END # /UNLESS check_member %] +
    [% UNLESS ( check_member ) %] @@ -232,7 +234,7 @@ [% END %] [% END %] - [% END %] + [% END # /IF opadd %] [% IF ( step_1 ) %] [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames && nosex %] @@ -262,9 +264,9 @@ [% IF ( mandatorytitle ) %]Required[% END %] - [% END %] - [% END %] - [% END %] + [% END # /IF BorrowersTitles %] + [% END # /UNLESS notitle %] + [% END # /UNLESS I %] [% UNLESS nosurname %]
  • @@ -289,7 +291,7 @@ [% END %] [% IF ( mandatorysurname ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS nosurname %] [% UNLESS ( I ) %] [% UNLESS nofirstname %] @@ -304,7 +306,7 @@ [% IF ( mandatoryfirstname ) %]Required[% END %] - [% END %] + [% END # /UNLESS nofirstname %] [% UNLESS nodateofbirth %]
  • @@ -320,7 +322,7 @@ [% IF ( ERROR_dateofbirth ) %](Error)[% END %]
    [% INCLUDE 'date-format.inc' %]
  • - [% END %] + [% END # /UNLESS nodateofbirth %] [% UNLESS noinitials %]
  • @@ -334,8 +336,8 @@ [% IF ( mandatoryinitials ) %]Required[% END %]
  • - [% END %] - [% END %] + [% END # /UNLESS noinitials %] + [% END # /UNLESS I %] [% UNLESS noothernames %]
  • @@ -350,7 +352,7 @@ [% IF ( mandatoryothernames ) %]Required[% END %] [% IF ( I ) %][% END %]
  • - [% END %] + [% END # /UNLESS noothernames %] [% UNLESS ( I ) %] [% UNLESS nosex %] @@ -375,12 +377,12 @@ - [% END %] + [% END # /UNLESS ( opduplicate ) %] - [% END %] - [% END %] + [% END # /UNLESS nosex %] + [% END # /UNLESS ( I ) %] - + [% END # hide fieldset %] [% IF show_guarantor || guarantor %] @@ -427,11 +429,11 @@ - [% END %] + [% END # /IF category_type == 'I' %] - + [% END # END relationships foreach %] - +
      @@ -465,7 +467,7 @@ Remove
    -
    +
      @@ -492,8 +494,8 @@ [% END %]
    - - [% END %] + + [% END # /IF show_guarantor || guarantor %] [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %] @@ -519,7 +521,7 @@ [% IF ( mandatorycontactname ) %]Required[% END %]
    Non-patron guarantor surname
    - [% END %] + [% END # /UNLESS nocontactname %] [% UNLESS nocontactfirstname %]
  • @@ -533,7 +535,7 @@ [% IF ( mandatorycontactfirstname ) %]Required[% END %]
    Non-patron guarantor first name
  • - [% END %] + [% END # /UNLESS nocontactfirstname %] [% UNLESS norelationship %] [% IF possible_relationships %] @@ -550,8 +552,8 @@ [% END %] - [% END %] - [% END %] + [% END # /IF possible_relationships %] + [% END # /UNLESS norelationship %] [% UNLESS nophone %]
  • @@ -565,7 +567,7 @@ [% IF ( mandatoryphone ) %]Required[% END %]
    Shows on transit slips
  • - [% END %] + [% END # UNLESS nophone %] [% UNLESS nophonepro %]
  • @@ -578,7 +580,7 @@ [% IF ( mandatoryphonepro ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS nophonepro %] [% UNLESS nomobile %]
  • @@ -591,7 +593,7 @@ [% IF ( mandatorymobile ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS nomobile %] [% UNLESS noemail %]
  • @@ -604,7 +606,7 @@ [% IF ( mandatoryemail ) %]Required[% END %]
    Shows on transit slips
  • - [% END %] + [% END # /UNLESS noemail %] [% UNLESS noemailpro %]
  • @@ -617,7 +619,7 @@ [% IF ( mandatoryemailpro ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS noemailpro %] [% UNLESS nofax %]
  • @@ -630,13 +632,13 @@ [% IF ( mandatoryfax ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS nofax %] - - [% END # hide fieldset %] + + [% END # /UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %] - [% END %] + [% END # /IF ( step_1 ) %] [% IF ( step_6 ) %] [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %] @@ -647,7 +649,7 @@ [% INCLUDE 'member-alt-address-style-us.inc' %] [% END %] [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] - [% END %] + [% END # / IF ( step_6 ) %] [% IF ( step_2 ) %] [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %] @@ -658,7 +660,7 @@ [% INCLUDE 'member-alt-contact-style-us.inc' %] [% END %] [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] - [% END %] + [% END # /IF ( step_2 ) %] [% IF ( step_3 ) %] [% SET autoMemberNum = Koha.Preference('autoMemberNum') %] @@ -695,7 +697,7 @@ [% IF mandatorycardnumber %]Required[% END %]
    There is no minimum or maximum character length. - [% END %] + [% END # /IF minlength_cardnumber == maxlength_cardnumber %] [% IF autoMemberNum %] [% IF mandatorycardnumber %]
    AutoMemberNum is set to enabled, but cardnumber is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled. @@ -703,9 +705,9 @@
    Leave blank for auto calc during registration [% END %] [% END %] -
    + - [% END %] + [% END # /UNLESS nocardnumber %] [% UNLESS nobranchcode %]
  • @@ -756,7 +758,7 @@ [% PROCESS 'av-build-dropbox.inc' name="sort1", category="Bsort1", default=sort1, size = 20 %] [% IF ( mandatorysort1 ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS nosort1 %] [% UNLESS nosort2 %]
  • @@ -770,7 +772,7 @@ [% PROCESS 'av-build-dropbox.inc' name="sort2", category="Bsort2", default=sort2, size = 20 %] [% IF ( mandatorysort2 ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS nosort2 %] [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
  • @@ -789,9 +791,9 @@ [% END %] - +
  • - [% END %] + [% END # /IF CheckPrevCheckout %] [% IF Koha.Preference('TranslateNotices') %]
  • @@ -805,21 +807,21 @@ [% ELSE %] - [% END %] + [% END # /IF sublanguage.rfc4646_subtag %] [% ELSE %] [% IF sublanguage.rfc4646_subtag == lang %] [% ELSE %] - [% END %] - [% END %] - [% END %] - [% END %] - + [% END # /IF sublanguage.rfc4646_subtag %] + [% END # /language.plural %] + [% END #/FOR sublanguage %] + [% END # /FOR language %] +
  • - [% END %] + [% END # /IF Koha.Preference('TranslateNotices') %] - + [% UNLESS nodateenrolled && noopacnote && noborrowernotes %]
    @@ -838,12 +840,12 @@ [% ELSE %] - [% END %] + [% END # /IF dateformat metric %] [% IF ( mandatorydateenrolled ) %]Required[% END %] [% IF ( ERROR_dateenrolled ) %](Error)[% END %]
    [% INCLUDE 'date-format.inc' %]
    - [% END %] + [% END # /UNLESS nodateenrolled %] [% UNLESS nodateexpiry %]
  • @@ -870,7 +872,7 @@ [% ELSE %] [% END %] - [% END %] + [% END # /IF dateformat metric %] [% IF ( mandatorydateexpiry ) %]Required[% END %] [% IF ( ERROR_dateexpiry ) %](Error)[% END %]
    [% INCLUDE 'date-format.inc' %]
    @@ -889,7 +891,7 @@
    This message appears on this patron's user page in the OPAC
    [% IF ( mandatoryopacnote ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS noopacnote %] [% UNLESS noborrowernotes %]
  • @@ -904,10 +906,10 @@
    This message displays when checking out to this patron
    [% IF ( mandatoryborrowernotes ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS noborrowernotes %] -
    - [% END # hide fieldset %] + + [% END # /UNLESS nodateenrolled && noopacnote && noborrowernotes %] [% UNLESS nouserid && nopassword %]
    @@ -942,7 +944,7 @@ [% IF ( mandatoryuserid ) %]Required[% END %] - [% END %] + [% END # /UNLESS nouserid %] [% UNLESS nopassword %]
  • @@ -966,7 +968,7 @@ [% ELSE %] [% END %] - [% END %] + [% END # /IF ( NoUpdateLogin ) %] [% ELSE %] [% IF ( password ) %] [% IF ( NoUpdateLogin ) %] @@ -984,8 +986,8 @@ [% ELSE %] [% END %] - [% END %] - [% END %] + [% END # /IF ( password ) %] + [% END # /IF ( opadd ) %] [% IF ( mandatorypassword ) %]Required[% END %] [% IF ( ERROR_password_too_short ) %]Password is too short[% END %] [% IF ( ERROR_password_too_weak ) %]Password is too weak[% END %] @@ -1013,7 +1015,7 @@ [% ELSE %] [% END %] - [% END %] + [% END # /IF ( NoUpdateLogin ) %] [% ELSE %] [% IF ( password ) %] [% IF ( NoUpdateLogin ) %] @@ -1031,16 +1033,16 @@ [% ELSE %] [% END %] - [% END %] - [% END %] + [% END # IF ( password ) %] + [% END # /IF ( opadd ) %] [% IF ( mandatorypassword ) %]Required[% END %] [% IF ( ERROR_password_mismatch ) %]Passwords do not match[% END %]
  • - [% END %] + [% END # /UNLESS nopassword %] -
    - [% END # hide fieldset %] + + [% END # /UNLESS nouserid && nopassword %] [% UNLESS ( opadd || opduplicate ) %] @@ -1072,11 +1074,11 @@ [% ELSE %] [% IF flagloo.yes %]Yes[% ELSE %]No[% END %] - [% END %] + [% END # /IF CAN_user_circulate_manage_restrictions %] [% END %] - - + +
    Patron restrictions @@ -1113,12 +1115,12 @@ [% END %] - [% END %] + [% END # /FOREACH d%] [% ELSE %]

    Patron is currently unrestricted.

    - [% END %] + [% END # /IF ( debarments )%] [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]

    Add manual restriction

    @@ -1139,11 +1141,11 @@

    Cancel

    -
    - [% END %] - - [% END %] - [% END %] + + [% END # /IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] + + [% END # /UNLESS ( opadd || opduplicate ) %] + [% END # /IF ( step_3 ) %] [% IF ( step_7 ) %] [% IF Koha.Preference('HouseboundModule') %] @@ -1164,7 +1166,7 @@ - [% END %] + [% END # /IF ( housebound_role.housebound_chooser == 1 ) %]
  • @@ -1178,10 +1180,10 @@ - [% END %] + [% END # /IF ( housebound_role.housebound_deliverer == 1 ) %]
  • - - + + [% END # hide fieldset %] [% END # IF step_7 %] @@ -1213,25 +1215,25 @@ [% auth_val_loo.lib | html %] [% END %] - [% END %] + [% END # /FOREACH auth_val_loo %] [% ELSE %] - [% END %] + [% END # /IF ( patron_attribute.use_dropdown ) %] Clear [% IF ( patron_attribute.repeatable ) %] New [% END %] - [% END %] + [% END # /FOREACH patron_attribute %] [% IF pa_loo.class %][% END %] - [% END %] - - [% END %] - [% END %] - [% END %] + [% END # /FOREACH pa_loo %] + + [% END # /UNLESS ( no_patron_attribute_types ) %] + [% END # /IF Koha.Preference('ExtendedPatronAttributes') %] + [% END # /IF ( step_4 ) %] [% IF ( step_5 ) %] [% IF ( EnhancedMessagingPreferences ) %] @@ -1261,12 +1263,12 @@ [% END %]

    - [% END %] - [% END %] - - [% END %] - [% END %] -
    + [% END # /UNLESS nosms_provider_id %] + [% END # /IF ( SMSSendDriver ) %] + + [% END # /IF ( EnhancedMessagingPreferences ) %] + [% END # /IF ( step_5 ) %] + [% IF quickadd && opadd && !check_member %]
    @@ -1277,7 +1279,7 @@
    [% END %] - [% END %] + [% END # /UNLESS no_add %] @@ -1444,7 +1446,7 @@ $("#qagd").click(function() { $("#guarantordelete").click(); }); $("#quick_add_form").show(); }); - [% END %] + [% END # /IF quickadd && opadd && !check_member %] [% Asset.js("js/members.js") | $raw %] -- 2.7.4