From 835420f6cfb98fa5b4b73011b1b2fe0b20e35e28 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 25 Jan 2021 11:30:30 +0000 Subject: [PATCH] Bug 27446: Markup errors in suggestion/suggestion.tt This patch makes various corrections to the suggestions template in the staff interface: - Correct indentation - Fix unclosed tags - Fix non-unique IDs - Add comments to highlight markup structure To test, apply the patch and test the suggestions interface in the staff client: - Viewing the list of suggestions - Viewing the details of a single suggestion - Filtering suggestions - Organizing suggestions Test that labels on form controls work correctly, including under each tab. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 42419de5e33c5d8f01c380213db8969f0f6b1cf3) Signed-off-by: Fridolin Somers --- .../prog/en/modules/suggestion/suggestion.tt | 2023 +++++++++-------- 1 file changed, 1116 insertions(+), 907 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index a227fc244f..5feda9c041 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -23,945 +23,1154 @@ [% INCLUDE 'doc-head-close.inc' %] [% IF op == 'else' %] - + [% FILTER collapse %] + + [% END %] [% END %] -[% INCLUDE 'header.inc' %] -[% INCLUDE 'cat-search.inc' %] - - -[% IF ( op == 'show' ) %] -
-
-
- - - -
- Bibliographic information -
    - [% IF ( title ) %] -
  1. - Title: - [% IF suggestion.biblionumber %] - [% suggestion.title | html %] - [% ELSE %] - [% title | html %] - [% END %] -
    2. - [% END %] - [% IF ( author ) %] -
  2. - Author: - [% author | html %] -
    3. - [% END %] - [% IF ( copyrightdate ) %] -
  3. - Copyright date: - [% copyrightdate | html %] -
    4. - [% END %] - [% IF ( isbn ) %] -
  4. - ISBN or ISSN or other standard number: - [% isbn | html %] -
    5. - [% END %] - [% IF ( publishercode ) %] -
  5. - Publisher: - [% publishercode | html %] -
    6. - [% END %] - [% IF ( place ) %] -
  6. - Publication place: - [% place | html %] -
    7. - [% END %] - [% IF ( collectiontitle ) %] -
  7. - Collection title: - [% collectiontitle | html %] -
    8. - [% END %] - [% IF ( itemtype ) %] -
  8. - Document type: - [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', itemtype, 0 ) | html %] -
    9. - [% END %] - [% IF ( patron_reason_loop ) %] -
  9. Reason for suggestion: - [% FOREACH patron_reason_loo IN patron_reason_loop %] - [% IF patron_reason_loo.authorised_value == patronreason %][% patron_reason_loo.lib | html %][% END %] - [% END %] -
    10. - [% END %] - [% IF ( note ) %] -
  10. - Notes: - [% note | html %] -
    11. - [% END %] -
-
-
Suggestion management -
    -
  1. - Status: - [% SET status_found = 0 %] - [% IF ( STATUS == 'ASKED' ) %] - Pending - [% SET status_found = 1 %] - [% ELSIF ( STATUS == 'ACCEPTED' ) %] - Accepted - [% SET status_found = 1 %] - [% ELSIF ( STATUS == 'CHECKED' ) %] - Checked - [% SET status_found = 1 %] - [% ELSIF ( STATUS == 'REJECTED' ) %] - Rejected - [% SET status_found = 1 %] - [% ELSIF ( STATUS == 'ORDERED' ) %] - Ordered - [% SET status_found = 1 %] - [% ELSIF ( STATUS == 'AVAILABLE' ) %] - Available - [% SET status_found = 1 %] - [% ELSE %] - [% FOREACH s IN SuggestionStatuses %] - [% IF STATUS == s.authorised_value %] - [% s.lib | html %] - [% SET status_found = 1 %] - [% END %] - [% END %] - [% END %] - -
    2. -
  2. - Reason: - [% IF ( reason ) %] - [% AuthorisedValues.GetByCode( 'SUGGEST', reason, 0 ) | html %] - [% END %] -
    3. -
  3. - - - - - - - - - - - - - - - - - - - - - - - - -
     DateBy
    [% tp('purchase suggestion created by', 'Created by:') | html %][% suggesteddate | $KohaDates %] - [% IF ( suggestedby_patron.borrowernumber ) %] - [% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %]) - [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %]) - [% END %] -
    Managed by:[% manageddate | $KohaDates %] - [% IF ( managedby_patron.borrowernumber ) %] - [% managedby_patron.surname | html %], [% managedby_patron.firstname | html %] ([% managedby_patron.cardnumber | html %]) - [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) - [% END %] -
    Accepted on:[% accepteddate | $KohaDates %] - [% IF ( acceptedby_patron.borrowernumber ) %] - [% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% acceptedby_patron.cardnumber | html %]) - [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %]) - [% END %] -
    Last modification on:[% lastmodificationdate | $KohaDates %] - [% IF ( lastmodificationby_patron.borrowernumber ) %] - [% lastmodificationby_patron.surname | html %], [% lastmodificationby_patron.firstname | html %] ([% lastmodificationby_patron.cardnumber | html %]) - [% Branches.GetName( lastmodificationby_patron.branchcode ) | html %] ([% lastmodificationby_patron.category.description | html %]) - [% END %] -
-
-
Acquisition information -
    -
  1. - Library: [% Branches.GetName( branchcode ) | html %] -
    2. -
  2. - Fund: [% budgetname | html %] -
    3. -
  3. - Copies:[% quantity | html %] -
    4. -
  4. - Currency:[% currency | html %] -
    5. -
  5. - Price:[% price | $Price %] -
    6. -
  6. - Total[% total | $Price %] -
    7. -
-
- -
- << Back to suggestions -
- -
-
-
-[% ELSE %] - -[% IF op == 'save' %] -
-
-
-[% ELSE %] -
-
-
-
+ [% INCLUDE 'header.inc' %] + [% INCLUDE 'cat-search.inc' %] -[% END %] - -[% IF op == 'save' %] - [% FOR m IN messages %] -
- [% SWITCH m.code %] - [% CASE 'biblio_exists' %] - A similar document already exists: [% m.title | html %]. Click on "Confirm your suggestion" to ignore this message. - [% CASE 'manager_not_enough_permissions' %] - The manager you selected does not have sufficient permissions. - [% CASE %] - [% m.code | html %] + - [% END %] -
- - - [% IF ( suggestionid ) %] -

Edit purchase suggestion #[% suggestionid | html %]

- - [% ELSE %] -

Enter a new purchase suggestion

- [% END %] -
Bibliographic information
    -
  1. - - - Required -
    2. -
    3. -
    4. -
    5. -
    6. -
    7. -
    8. -
  8. - [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20, default=itemtype %] -
    9. - [% IF patron_reason_loop %] -
  9. - - -
    10. + [% ELSIF ( op == 'show' ) %] + Suggestions › Show suggestion #[% suggestionid | html %] + [% ELSE %] + Suggestions management [% END %] -
    11. -
-
-
Suggestion management -
    - [% IF ( suggestionid ) %] -
  1. - - -
    2. -
  2. - - - - - [% IF other_reason %] - - [% ELSE %] - - [% END %] - Cancel - -
    3. - [% END %] -
  3. - - - - - - - - - - - - - - - - - - - - - -
     DateByAction
    [% INCLUDE 'date-format.inc' %][% IF ( suggestedby_patron.borrowernumber ) %][% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %]) [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %])[% END %] - Set to patron
    [% INCLUDE 'date-format.inc' %][% IF ( acceptedby_patron.borrowernumber ) %][% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %]) [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %])[% END %]
    [% lastmodificationdate | $KohaDates %] - [% IF lastmodificationby_patron %] - [% INCLUDE 'patron-title.inc' patron=lastmodificationby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( lastmodificationby_patron.branchcode ) | html %] ([% lastmodificationby_patron.category.description | html %]) - [% END %] -
    4. - -
  4. - - [% INCLUDE 'date-format.inc' %] -
    5. -
  5. - -
    - - You - - [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] - | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) - [% END %] -
    - Select manager - [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] - Keep existing manager - [% END %] - - -
    - - -
    -
    6. -
-
-
Acquisition information
    -
  1. - -
    2. -
  2. - - - -
    3. -
  3. - -
    4. -
  4. - - [% FOREACH c IN currencies %] - - - [% END %] - - -
    5. -
  5. - -
  6. - -
-
-
- - [% IF ( suggestionid ) %] - [% IF ( need_confirm ) %] - - - [% ELSE %] - - [% END %] - Cancel + [% IF ( publishercode ) %] +
  • + Publisher: + [% publishercode | html %] +
    • + [% END %] + [% IF ( place ) %] +
  • + Publication place: + [% place | html %] +
    • + [% END %] + [% IF ( collectiontitle ) %] +
  • + Collection title: + [% collectiontitle | html %] +
    • + [% END %] + [% IF ( itemtype ) %] +
  • + Document type: + [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', itemtype, 0 ) | html %] +
    • + [% END %] + [% IF ( patron_reason_loop ) %] +
  • + Reason for suggestion: + [% FOREACH patron_reason_loo IN patron_reason_loop %] + [% IF patron_reason_loo.authorised_value == patronreason %] + [% patron_reason_loo.lib | html %] + [% END %] + [% END %] +
    • + [% END %] + [% IF ( note ) %] +
  • + Notes: + [% note | html %] +
    • + [% END %] + +
    + +
    + Suggestion management +
      +
    1. + Status: + [% SET status_found = 0 %] + [% IF ( STATUS == 'ASKED' ) %] + Pending + [% SET status_found = 1 %] + [% ELSIF ( STATUS == 'ACCEPTED' ) %] + Accepted + [% SET status_found = 1 %] + [% ELSIF ( STATUS == 'CHECKED' ) %] + Checked + [% SET status_found = 1 %] + [% ELSIF ( STATUS == 'REJECTED' ) %] + Rejected + [% SET status_found = 1 %] + [% ELSIF ( STATUS == 'ORDERED' ) %] + Ordered + [% SET status_found = 1 %] + [% ELSIF ( STATUS == 'AVAILABLE' ) %] + Available + [% SET status_found = 1 %] + [% ELSE %] + [% FOREACH s IN SuggestionStatuses %] + [% IF STATUS == s.authorised_value %] + [% s.lib | html %] + [% SET status_found = 1 %] + [% END %] + [% END %] + [% END %] +
      2. +
    2. + Reason: + [% IF ( reason ) %] + [% AuthorisedValues.GetByCode( 'SUGGEST', reason, 0 ) | html %] + [% END %] +
      3. +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     DateBy
    [% tp('purchase suggestion created by', 'Created by:') | html %][% suggesteddate | $KohaDates %] + [% IF ( suggestedby_patron.borrowernumber ) %] + [% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %]) + [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %]) + [% END %] +
    Managed by:[% manageddate | $KohaDates %] + [% IF ( managedby_patron.borrowernumber ) %] + [% managedby_patron.surname | html %], [% managedby_patron.firstname | html %] ([% managedby_patron.cardnumber | html %]) + [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) + [% END %] +
    Accepted on:[% accepteddate | $KohaDates %] + [% IF ( acceptedby_patron.borrowernumber ) %] + [% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% acceptedby_patron.cardnumber | html %]) + [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %]) + [% END %] +
    Last modification on:[% lastmodificationdate | $KohaDates %] + [% IF ( lastmodificationby_patron.borrowernumber ) %] + [% lastmodificationby_patron.surname | html %], [% lastmodificationby_patron.firstname | html %] ([% lastmodificationby_patron.cardnumber | html %]) + [% Branches.GetName( lastmodificationby_patron.branchcode ) | html %] ([% lastmodificationby_patron.category.description | html %]) + [% END %] +
    +
    + +
    + Acquisition information +
      +
    1. + Library: + [% Branches.GetName( branchcode ) | html %] +
      2. +
    2. + Fund: + [% budgetname | html %] +
      3. +
    3. + Copies: + [% quantity | html %] +
      4. +
    4. + Currency: + [% currency | html %] +
      5. +
    5. + Price: + [% price | $Price %] +
      6. +
    6. + Total + [% total | $Price %] +
      7. +
    +
    + +
    + << Back to suggestions +
    + +
    +
    + [% ELSE # IF op == "show" %] + + [% IF op == 'save' %] +
    +
    +
    [% ELSE %] - [% IF ( need_confirm ) %] - - - [% ELSE %] - - [% END %] - Cancel +
    +
    +
    [% END %] - - -[% END %] - -[% IF op == 'else' %] - - -

    Suggestions management

    - -[% IF ( displayby != "branchcode" ) %] - - -[% END %] - -[% FOR m IN messages %] -
    - [% SWITCH m.code %] - [% CASE 'already_exists' %] - The suggestion has not been added. A suggestion with this title already exists (suggestion #[% m.id | html %]) - [% CASE 'biblio_exists' %] - A similar document already exists: [% m.title | html %]. Click on "Confirm your suggestion" to ignore this message. - [% CASE %] - [% m.code | html %] - [% END %] -
    -[% END %] + [% IF op == 'save' %] + [% FOR m IN messages %] +
    + [% SWITCH m.code %] + [% CASE 'biblio_exists' %] + A similar document already exists: [% m.title | html %]. Click on "Confirm your suggestion" to ignore this message. + [% CASE 'manager_not_enough_permissions' %] + The manager you selected does not have sufficient permissions. + [% CASE %] + [% m.code | html %] + [% END %] +
    + [% END %] -[% UNLESS ( notabs ) %] -
    - -[% END %] - -[% FOREACH suggestion IN suggestions %] -
    - - -[% IF ( suggestion.suggestions_loop ) %] -

    Check all | Uncheck all

    - - - - - - - - - - - - - - - - - - - [% FOREACH suggestions_loo IN suggestion.suggestions_loop %] - - - - - - - - - - - - - - - [% END %] -
     SuggestionSuggested bySuggested onManaged byManaged onLast modification byLast modification onLibraryFundStatus 
    - - - - [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %] -
    - [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate | html %] [% END %] - [% IF ( suggestions_loo.volumedesc ) %]; Volume:[% suggestions_loo.volumedesc | html %] [% END %] - [% IF ( suggestions_loo.isbn ) %]; ISBN: [% suggestions_loo.isbn | html %] [% END %] - [% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %] - [% IF ( suggestions_loo.publicationyear ) %]in [% suggestions_loo.publicationyear | html %] [% END %] - [% IF ( suggestions_loo.place ) %]in [% suggestions_loo.place | html %] [% END %] - [% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %] - [% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]
    - [% IF ( suggestions_loo.note ) %]
    [% suggestions_loo.note | html %]
    [% END %] - [% IF suggestions_loo.archived %]
    Archived[% END %] -     		- [% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %] - - [% IF ( suggestions_loo.suggesteddate ) %][% suggestions_loo.suggesteddate | $KohaDates %][% END %] - - [% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %] - - [% IF ( suggestions_loo.manageddate ) %][% suggestions_loo.manageddate | $KohaDates %][% END %] - - [% suggestions_loo.surnamelastmodificationby | html %][% IF ( suggestions_loo.firstnamelastmodificationby ) %], [% suggestions_loo.firstnamelastmodificationby | html %][% END %] - - [% IF ( suggestions_loo.lastmodificationdate ) %][% suggestions_loo.lastmodificationdate | $KohaDates %][% END %] - - [% Branches.GetName( suggestions_loo.branchcode ) | html %] - - [% suggestions_loo.budget_name | html %] - - [% IF ( suggestions_loo.ASKED ) %] - Pending - [% ELSIF ( suggestions_loo.ACCEPTED ) %] - Accepted - [% ELSIF ( suggestions_loo.ORDERED ) %] - Ordered - [% ELSIF ( suggestions_loo.REJECTED ) %] - Rejected - [% ELSIF ( suggestions_loo.CHECKED ) %] - Checked - [% ELSIF ( suggestions_loo.AVAILABLE ) %] - Available - [% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %] - [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) | html %] - [% ELSE %] - Status unknown - [% END %] - - [% IF ( suggestions_loo.reason ) %] -
    ([% suggestions_loo.reason | html %]) - [% END %] -     		-
    - Edit - -
    -
    - -
    -

    Change selected suggestions

    -
    -
    -
    - - - - - - - - - Cancel - -
    - - - -
    -
    -
    -
    -
    - - [% PROCESS 'av-build-dropbox.inc' name="suggestion_itemtype", category="SUGGEST_FORMAT", size = 20 %] - - -
    -
    -
    -
    -
    -
    - Select manager - - - - -
    +
    + Bibliographic information +
      +
    1. + + + Required +
      2. +
    2. + + +
      3. +
    3. + + +
      4. +
    4. + + +
      5. +
    5. + + +
      6. +
    6. + + +
      7. +
    7. + + +
      8. +
    8. + + [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20, default=itemtype %] +
      9. + [% IF patron_reason_loop %] +
    9. + + +
      10. + [% END # /IF patron_reason_loop %] +
    10. + + +
      11. +
    -
    -
    -
    - - - -
    +
    + Suggestion management +
      + [% IF ( suggestionid ) %] +
    1. + + +
      2. +
    2. + + + + + [% IF other_reason %] + + [% ELSE %] + + [% END %] + Cancel + +
      3. + [% END %] +
    3. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
       DateByAction
      + + + [% INCLUDE 'date-format.inc' %] + + + [% IF ( suggestedby_patron.borrowernumber ) %] + [% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %]) [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %]) + [% END %] + + Set to patron +
      + + + [% INCLUDE 'date-format.inc' %] + + + [% IF ( acceptedby_patron.borrowernumber ) %] + [% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %]) + [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %]) + [% END %] +
      + + + [% lastmodificationdate | $KohaDates %] + + [% IF lastmodificationby_patron %] + [% INCLUDE 'patron-title.inc' patron=lastmodificationby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( lastmodificationby_patron.branchcode ) | html %] ([% lastmodificationby_patron.category.description | html %]) + [% END %] +
      +
      4. +
    4. + + [% INCLUDE 'date-format.inc' %] +
      5. +
    5. + +
      + + You + + [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] + | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) + [% END %] +
      + Select manager + [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] + Keep existing manager + [% END %] + + +
      + + +
      +
      6. +
    -
    - -
    - -[% ELSE %] - No results. -[% END %] - -
    -[% END %] -[% END %] -[% UNLESS op == 'save' %] - [% UNLESS ( op == 'show' ) %] +
    + Acquisition information +
      +
    1. + + +
      2. +
    2. + + + + +
      3. +
    3. + + +
      4. +
    4. + + [% FOREACH c IN currencies %] + + + [% END %] + +
      5. +
    5. + + +
      6. +
    6. + + +
      7. +
    +
    + + + +
    + + [% IF ( suggestionid ) %] + [% IF ( need_confirm ) %] + + + [% ELSE %] + + [% END %] + Cancel + [% ELSE %] + [% IF ( need_confirm ) %] + + + [% ELSE %] + + [% END %] + Cancel + [% END %] +
    + + [% END # /IF op == 'save' %] - -
    + [% IF op == 'else' %] + -
    - -
    -
    - - [% END %] - [% END %] -
    -[% END %] + [% ELSE %] + No results. + [% END # /IF ( suggestion.suggestions_loop ) %] + +
    + [% END # /FOREACH suggestion %] + [% UNLESS ( notabs ) %] +
    + [% END # /UNLESS notabs %] + [% END # /IF op == 'else' %] + + [% UNLESS op == 'save' %] + [% UNLESS ( op == 'show' ) %] +
    + +
    + +
    + [% END # /UNLESS ( op == 'show' ) %] + [% END # /UNLESS op == 'save' %] +
    + + [% END # /IF op == "show" %] [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] -- 2.39.5