From 03262f5ce95b43f4dfaaec7d0203d349bd689b3e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 17 Sep 2019 18:41:48 +0000 Subject: [PATCH] Bug 23533: (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. --- .../prog/en/modules/members/memberentrygen.tt | 1446 ++++++++++---------- 1 file changed, 724 insertions(+), 722 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 9847f748374..c19d249f4f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -122,7 +122,7 @@ - [% END %] + [% END # /IF check_member %] [% IF ( nok ) %]
@@ -178,8 +178,8 @@
  • The alternative email is invalid.
  • [% END %] -
    - [% END %] + + [% END # /IF nok %]
    @@ -195,8 +195,8 @@ [% END %] Cancel - [% END %] -
    + [% END # /UNLESS check_member %] +
    [% UNLESS ( check_member ) %] @@ -226,7 +226,7 @@ [% END %] [% END %] - [% END %] + [% END # /IF opadd %] [% IF ( step_1 ) %] [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] @@ -257,9 +257,9 @@ Required [% END %] - [% END %] - [% END %] - [% END %] + [% END # /IF BorrowersTitles %] + [% END # /UNLESS notitle %] + [% END # /UNLESS I %] [% UNLESS nosurname %]
  • @@ -274,7 +274,7 @@ - [% END %] + [% END # /IF I %] [% IF ( uppercasesurnames ) %] @@ -283,7 +283,7 @@ [% END %] [% IF ( mandatorysurname ) %]Required[% END %]
  • - [% END %] + [% END # /UNLESS nosurname %] [% UNLESS ( I ) %] [% UNLESS nofirstname %] @@ -298,7 +298,7 @@ [% IF ( mandatoryfirstname ) %]Required[% END %] - [% END %] + [% END # /UNLESS nofirstname %] [% UNLESS nodateofbirth %]
  • [% IF ( mandatorydateofbirth ) %] @@ -313,7 +313,7 @@ [% IF ( ERROR_dateofbirth ) %](Error)[% END %]
    [% INCLUDE 'date-format.inc' %]
  • - [% END %] + [% END # /UNLESS nodateofbirth %] [% UNLESS noinitials %]
  • [% IF ( mandatoryinitials ) %] @@ -326,8 +326,8 @@ [% IF ( mandatoryinitials ) %]Required[% END %]
  • - [% END %] - [% END %] + [% END # /UNLESS noinitials %] + [% END # /UNLESS I %] [% UNLESS noothernames %]
  • @@ -342,7 +342,7 @@ [% IF ( mandatoryothernames ) %]Required[% END %] [% IF ( I ) %][% END %]
  • - [% END %] + [% END # /UNLESS noothernames %] [% UNLESS ( I ) %] [% UNLESS nosex %] @@ -367,13 +367,13 @@ - [% END %] + [% END # /UNLESS opduplicate %] - [% END %] - [% END %] + [% END # /UNLESS nosex %] + [% END # /UNLESS I %] - [% END # hide fieldset %] + [% END # /UNLESS notitle && nosurname && nofirstname... %] [% IF show_guarantor || guarantor %] [% SET possible_relationships = Koha.Preference('borrowerRelationship') %] @@ -422,10 +422,10 @@ - [% END %] + [% END # /IF category_type %] - [% END # END relationships foreach %] + [% END # END FOREACH r %]
    @@ -485,7 +485,7 @@
    Allow guarantors of this patron to view this patron's checkouts from the OPAC
    - [% END %] + [% END # /IF relationships %] [% IF relationships && Koha.Preference('AllowStaffToSetFinesVisibilityForGuarantor') %]
  • @@ -500,10 +500,10 @@
    Allow guarantors of this patron to view this patron's fines from the OPAC
  • - [% END %] + [% END # /IF relationships %]
    - [% END %] + [% END # /IF show_guarantor %] [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %] [% IF Koha.Preference( 'AddressFormat' ) %] @@ -513,793 +513,795 @@ [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
    - Contact
      - - [% UNLESS nocontactname %] -
    1. - [% IF ( mandatorycontactname ) %] -
    2. - [% END %] - - [% UNLESS nocontactfirstname %] -
    3. - [% IF ( mandatorycontactfirstname ) %] -
    4. - [% END %] + Contact +
        - [% UNLESS norelationship %] - [% IF possible_relationships %] + [% UNLESS nocontactname %]
      1. - - + [% IF ( mandatorycontactname ) %] +
      2. - [% END %] - [% END %] + [% END # /UNLESS nocontactname %] - [% UNLESS nophone %] -
      3. - [% IF ( mandatoryphone ) %] -
      4. - [% END %] + [% UNLESS nocontactfirstname %] +
      5. + [% IF ( mandatorycontactfirstname ) %] +
      6. + [% END # /UNLESS nocontactfirstname %] - [% UNLESS nophonepro %] -
      7. - [% IF ( mandatoryphonepro ) %] -
      8. - [% END %] + [% UNLESS norelationship %] + [% IF possible_relationships %] +
      9. + + +
      10. + [% END # /UNLESS possible_relationships %] + [% END # /UNLESS norelationship %] - [% UNLESS nomobile %] -
      11. - [% IF ( mandatorymobile ) %] -
      12. - [% END %] + [% UNLESS nophone %] +
      13. + [% IF ( mandatoryphone ) %] +
      14. + [% END # /UNLESS nophone %] - [% UNLESS noemail %] -
      15. - [% IF ( mandatoryemail ) %] -
      16. - [% END %] + [% UNLESS nophonepro %] +
      17. + [% IF ( mandatoryphonepro ) %] +
      18. + [% END # /UNLESS nophonepro %] - [% UNLESS noemailpro %] -
      19. - [% IF ( mandatoryemailpro ) %] -
      20. - [% END %] + [% UNLESS nomobile %] +
      21. + [% IF ( mandatorymobile ) %] +
      22. + [% END # /UNLESS nomobile %] - [% UNLESS nofax %] -
      23. - [% IF ( mandatoryfax ) %] -
      24. - [% END %] -
      -
    - [% END # hide fieldset %] + [% UNLESS noemail %] +
  • + [% IF ( mandatoryemail ) %] +
  • + [% END # /UNLESS noemail %] - - [% END %] + [% UNLESS noemailpro %] +
  • + [% IF ( mandatoryemailpro ) %] +
  • + [% END # /UNLESS noemailpro %] - [% IF ( step_6 ) %] - [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %] + [% UNLESS nofax %] +
  • + [% IF ( mandatoryfax ) %] +
  • + [% END # /nofax %] + + + [% END # /UNLESS nophone && nophonepro... %] + + + [% 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 %] + [% SWITCH Koha.Preference( 'AddressFormat' ) %] + [% CASE 'de' %] + [% INCLUDE 'member-alt-address-style-de.inc' %] + [% CASE # us %] + [% INCLUDE 'member-alt-address-style-us.inc' %] + [% END %] + [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] + [% END # /IF step_6 %] + + [% IF ( step_2 ) %] + [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %] [% SWITCH Koha.Preference( 'AddressFormat' ) %] [% CASE 'de' %] - [% INCLUDE 'member-alt-address-style-de.inc' %] + [% INCLUDE 'member-alt-contact-style-de.inc' %] [% CASE # us %] - [% INCLUDE 'member-alt-address-style-us.inc' %] + [% INCLUDE 'member-alt-contact-style-us.inc' %] [% END %] - [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] - [% END %] + [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] + [% END # /IF step_2 %] - [% IF ( step_2 ) %] - [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %] - [% SWITCH Koha.Preference( 'AddressFormat' ) %] - [% CASE 'de' %] - [% INCLUDE 'member-alt-contact-style-de.inc' %] - [% CASE # us %] - [% INCLUDE 'member-alt-contact-style-us.inc' %] - [% END %] - [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] - [% END %] - - [% IF ( step_3 ) %] - [% SET autoMemberNum = Koha.Preference('autoMemberNum') %] -
    - Library management -
      - [% UNLESS nocardnumber %] -
    1. - [% IF mandatorycardnumber %] -
    - [% UNLESS nouserid && nopassword %] -
    - OPAC/Staff login
      - [% UNLESS nouserid %] -
    1. - [% IF ( mandatoryuserid ) %] -
    2. - [% IF ( step_7 ) %] - [% IF Koha.Preference('HouseboundModule') %] -
      - Housebound roles -
        -
      1. - - [% IF ( housebound_role.housebound_chooser == 1 ) %] - - - - - [% ELSE %] - - - - - [% END %] -
      2. -
      3. - - [% IF ( housebound_role.housebound_deliverer == 1 ) %] - - - - - [% ELSE %] - - - - - [% END %] -
      4. -
      -
      - [% END # hide fieldset %] - [% END # IF step_7 %] - - [% IF ( step_4 ) %] - [% IF Koha.Preference('ExtendedPatronAttributes') %] - [% UNLESS ( no_patron_attribute_types ) %] -
      - Additional attributes and identifiers - - [% FOREACH pa_loo IN patron_attributes %] -
        - [% IF pa_loo.class %] -
        - [% pa_loo.lib | html %] - [% END %] - [% FOREACH patron_attribute IN pa_loo.items %] -
      1. - - [% IF ( patron_attribute.use_dropdown ) %] - +
      2. + [% IF ( mandatorypassword ) %] +
      3. - [% END %] - [% IF pa_loo.class %] -
        - [% END %] + [% END # /UNLESS nopassword %]
      - [% END %] -
      - [% END %] - [% END %] - [% END %] - - [% IF ( step_5 ) %] - [% IF ( EnhancedMessagingPreferences ) %] -
      - Patron messaging preferences - - - [% INCLUDE 'messaging-preference-form.inc' %] - [% IF ( SMSSendDriver ) %] -

      - - - SMS number should be in the format 1234567890 or +11234567890 -

      - [% UNLESS nosms_provider_id %] -

      - - + [% ELSE %] + + [% END %] + Yes + + [% ELSE %] - + [% IF flagloo.yes %]Yes[% ELSE %]No[% END %] + [% END # /IF CAN_user_circulate_manage_restrictions %] + + [% END # /FOREACH flagloo %] +

    +
    + +
    + Patron restrictions + [% IF ( debarments ) %] + + + + + + + + [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] + + [% END %] + + + + [% FOREACH d IN debarments %] + + + + + + [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] + + [% END %] + [% END %] + +
    TypeCommentExpirationCreatedRemove?
    [% d.type | html %] + [% IF d.comment.search('OVERDUES_PROCESS') %] + Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %] + [% ELSE %] + [% d.comment | $raw %] + [% END %] + [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %][% d.created | $KohaDates %] + +
    + [% ELSE %] +

    Patron is currently unrestricted.

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

    Add manual restriction

    +
    + Add manual restriction + +
      +
    1. +
    2. + Clear date
    3. + +
    +

    + Cancel +

    +
    + [% END # /IF CAN_user_borrowers_edit_borrowers %] +
    + [% END # /UNLESS ( opadd || opduplicate ) %] + [% END # /IF step_3 %] + + [% IF ( step_7 ) %] + [% IF Koha.Preference('HouseboundModule') %] +
    + Housebound roles +
      +
    1. + + [% IF ( housebound_role.housebound_chooser == 1 ) %] + + + + + [% ELSE %] + + + + [% END %] - -

      - [% END %] - [% END %] -
    + +
  • + + [% IF ( housebound_role.housebound_deliverer == 1 ) %] + + + + + [% ELSE %] + + + + + [% END %] +
  • + + + [% END # /IF Koha.Preference('HouseboundModule') %] + [% END # /IF step_7 %] + + [% IF ( step_4 ) %] + [% IF Koha.Preference('ExtendedPatronAttributes') %] + [% UNLESS ( no_patron_attribute_types ) %] +
    + Additional attributes and identifiers + + [% FOREACH pa_loo IN patron_attributes %] +
      + [% IF pa_loo.class %] +
      + [% pa_loo.lib | html %] + [% END %] + [% FOREACH patron_attribute IN pa_loo.items %] +
    1. + + [% IF ( patron_attribute.use_dropdown ) %] + + [% ELSE %] + + [% END %] + + Clear + [% IF ( patron_attribute.repeatable ) %] + New + [% END %] +
    2. + [% END # /FOREACH patron_attribute %] + [% IF pa_loo.class %] +
      + [% 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 ) %] +
    + Patron messaging preferences + + + [% INCLUDE 'messaging-preference-form.inc' %] + [% IF ( SMSSendDriver ) %] +

    + + + SMS number should be in the format 1234567890 or +11234567890 +

    + [% UNLESS nosms_provider_id %] +

    + + +

    + [% END # /IF nosms_provider_id %] + [% END # /IF SMSSendDriver %] +
    + [% END # /IF EnhancedMessagingPreferences %] + [% END # /IF step_5 %] +
    + + [% IF quickadd && opadd && !check_member %] +
    +
    Quick add +
      +
    +
    +
    [% END %] - [% END %] - - - [% IF quickadd && opadd && !check_member %] -
    -
    Quick add -
      -
    -
    -
    - [% END %] + [% END # /UNLESS no_add %] + + + + [% UNLESS ( opadd ) %] +
    + +
    [% END %] - - - - [% UNLESS ( opadd ) %] -
    - -
    - [% END %] - + [% MACRO jsinclude BLOCK %] [% Asset.js("lib/hc-sticky.js") | $raw %] -- 2.11.0