From 0f6d55a0a13aa598f9da5543b72aecd40335eb89 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 10 Dec 2019 17:30:41 +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. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/en/modules/members/memberentrygen.tt | 711 +++++++++--------- 1 file changed, 356 insertions(+), 355 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 7735b19a3d..d9cfe94bd1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -65,7 +65,7 @@ [% END %]) [% END %] - +
@@ -234,7 +234,7 @@ [% END %] [% IF ( step_1 ) %] - [%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] + [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity
    @@ -262,9 +262,9 @@ Required [% END %] - [% END %] - [% END %] - [% END %] + [% END # /IF Koha.Preference('BorrowersTitles') %] + [% END # /UNLESS notitle %] + [% END # /UNLESS ( I ) %] [% UNLESS nosurname %]
  1. @@ -290,7 +290,7 @@ Required [% END %]
    2. - [% END %] + [% END # /UNLESS nosurname %] [% UNLESS ( I ) %] [% UNLESS nofirstname %] @@ -307,7 +307,7 @@ Required [% END %] - [% END %] + [% END #/UNLESS nofirstname %] [% UNLESS nodateofbirth %]
  2. [% IF ( mandatorydateofbirth ) %] @@ -326,7 +326,7 @@ [% END %]
    [% INCLUDE 'date-format.inc' %]
    3. - [% END %] + [% END # /UNLESS nodateofbirth %] [% UNLESS noinitials %]
  3. [% IF ( mandatoryinitials ) %] @@ -341,8 +341,8 @@ Required [% END %]
    4. - [% END %] - [% END %] + [% END # /UNLESS noinitials %] + [% END #/UNLESS ( I ) %] [% UNLESS noothernames %]
  4. [% IF ( mandatoryothernames ) %] @@ -358,7 +358,7 @@ [% END %] [% IF ( I ) %][% END %]
    5. - [% END %] + [% END #/UNLESS noothernames %] [% UNLESS ( I ) %] [% UNLESS nosex %] @@ -383,12 +383,12 @@ - [% END %] + [% END # /UNLESS ( opduplicate )%] - [% END %] - [% END %] + [% END # /UNLESS nosex %] + [% END # /UNLESS ( I ) %]
-
+ [% END # hide fieldset %] [% IF show_guarantor || guarantor %] @@ -443,41 +443,41 @@ [% END # END relationships foreach %] - - -
-
    -
  1. - Patron #: - - -
    2. + + +
    +
      +
    1. + Patron #: + + +
      2. -
    2. - - -
      3. +
    3. + + +
      4. -
    4. - - -
      5. +
    5. + + +
      6. -
    6. - - -
      7. +
    7. + + +
      8. -
    8. - - Remove -
      9. -
    -
    +
  2. + + Remove +
    3. +
+
    @@ -519,16 +519,16 @@ [% END %]
- - - [% END %] + + + [% END # /IF show_guarantor || guarantor %] [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %] [% IF Koha.Preference( 'AddressFormat' ) %] [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] [% END %] - [% END # nostreet && nocity etc group%] + [% END # /UNLESS nostreet && nocity etc group%] [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
@@ -549,7 +549,7 @@ [% END %]
Non-patron guarantor surname
- [% END %] + [% END # /UNLESS nocontactname %] [% UNLESS nocontactfirstname %]
  • @@ -566,7 +566,7 @@ [% END %]
    Non-patron guarantor first name
    • - [% END %] + [% END # /UNLESS noaltcontactfirstname %] [% UNLESS norelationship %] [% IF possible_relationships %] @@ -583,8 +583,8 @@ [% END %] - [% END %] - [% END %] + [% END #/IF possible_relationships %] + [% END # /UNLESS norelationship %] [% UNLESS nophone %]
  • @@ -601,7 +601,7 @@ [% END %]
    Shows on transit slips
    • - [% END %] + [% END # /UNLESS nophone %] [% UNLESS nophonepro %]
  • @@ -617,7 +617,7 @@ Required [% END %]
    • - [% END %] + [% END # /UNLESS nophonepro %] [% UNLESS nomobile %]
  • @@ -633,7 +633,7 @@ Required [% END %]
    • - [% END %] + [% END # /UNLESS nomobile %] [% UNLESS noemail %]
  • @@ -650,7 +650,7 @@ [% END %]
    Shows on transit slips
    • - [% END %] + [% END #/UNLESS noemail %] [% UNLESS noemailpro %]
  • @@ -666,7 +666,7 @@ Required [% END %]
    • - [% END %] + [% END # /UNLESS noemailpro %] [% UNLESS nofax %]
  • @@ -682,13 +682,13 @@ Required [% END %]
    • - [% END %] + [% END #/UNLESS nofax %] -
    + [% END # hide fieldset %] - [% 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 %] @@ -699,7 +699,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 %] @@ -710,62 +710,62 @@ [% 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') %] -
    - Library management -
      - [% UNLESS nocardnumber %] -
    1. +
      + Library management +
        + [% UNLESS nocardnumber %] +
      1. + [% IF mandatorycardnumber %] +
        2. - [% END %] + [% END # /UNLESS nocardnumber %] [% UNLESS nobranchcode %]
      2. @@ -798,8 +798,8 @@ [% IF ( loop.last ) %] [% END %] - [% END %] - [% END %] + [% END # /FOREACH categoryloo %] + [% END # /FOREACH typeloo %] Required
        3. @@ -818,7 +818,7 @@ Required [% END %] - [% END %] + [% END # /UNLESS nosort1 %] [% UNLESS nosort2 %]
      3. @@ -834,7 +834,7 @@ Required [% END %]
        4. - [% END %] + [% END # /UNLESS nosort2 %] [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
      4. @@ -855,7 +855,7 @@ [% END %]
        5. - [% END %] + [% END # /IF ( Koha.Preference('CheckPrevCheckout') %] [% IF Koha.Preference('TranslateNotices') %]
      5. @@ -876,14 +876,14 @@ [% ELSE %] [% END %] - [% END %] - [% END %] - [% END %] - + [% END # /IF language.plural %] + [% END # /FOR sublanguage %] + [% END #/FOR language %] +
        6. - [% END %] + [% END #/IF Koha.Preference('TranslateNotices') %]
      -
      +
    [% UNLESS nodateenrolled && noopacnote && noborrowernotes %]
    @@ -910,7 +910,7 @@ [% END %]
    [% INCLUDE 'date-format.inc' %]
    - [% END %] + [% END # /UNLESS nodateenrolled %] [% UNLESS nodateexpiry %]
  • @@ -936,7 +936,7 @@ [% ELSE %] [% END %] - [% END %] + [% END # /IF ( dateformat == "metric" ) %] [% IF ( mandatorydateexpiry ) %] Required [% END %] @@ -961,7 +961,7 @@ Required [% END %]
    • - [% END %] + [% END # /UNLESS noopacnote %] [% UNLESS noborrowernotes %]
  • @@ -978,269 +978,270 @@ Required [% END %]
    • - [% END %] + [% END # /UNLESS noborrowernotes %] -
    + [% END # hide fieldset %] [% UNLESS nouserid && nopassword %]
    - OPAC/Staff login
      - [% UNLESS nouserid %] -
    1. - [% IF ( mandatoryuserid ) %] -
    - [% END # hide fieldset %] - [% END %] + + [% END # UNLESS nouserid && nopassword %] - - [% UNLESS ( opadd || opduplicate ) %] -
    - Patron account flags -
      - [% FOREACH flagloo IN flagloop %] -
    1. - - [% IF CAN_user_circulate_manage_restrictions %] - -
    +
    - [% IF ( step_7 ) %] - [% IF Koha.Preference('HouseboundModule') %] +
    + 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 # /FOREACH d %] + +
    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. +
    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
      @@ -1274,8 +1275,8 @@ [% END %] -
    -
    + + [% END # hide fieldset %] [% END # IF step_7 %] @@ -1313,21 +1314,21 @@ [% 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 ) %] @@ -1358,12 +1359,12 @@ [% END %]

    - [% END %] - [% END %] + [% END # /UNLESS nosms_provider_id %] + [% END # IF ( SMSSendDriver ) %] - [% END %] - [% END %] - + [% END # IF ( EnhancedMessagingPreferences ) %] + [% END # /IF step_5 %] + [% IF quickadd && opadd && !check_member %]
    @@ -1374,7 +1375,7 @@
    [% END %] - [% END %] + [% END # /UNLESS ( no_add ) %]
    -- 2.39.5