From 5b90019f8ad956915baa13873284eeb344ffd58f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 13 Aug 2019 18:26:57 +0000 Subject: [PATCH] Bug 23458: (follow-up) Add comments to markup This patch adds a few comments to the markup in order to highlight the structure of the page. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/en/modules/reserve/request.tt | 91 +++++++++---------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index d218ae5afe..91e4ebb6b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -25,7 +25,7 @@ [% ELSE %] @@ -34,7 +34,7 @@ Catalog › Confirm holds -[% END %] +[% END # UNLESS multi_hold %]
@@ -97,15 +97,15 @@ [% ELSE %] [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %] [% END %] - + [% IF ( multi_hold ) %] [% END %] - + - [% ELSIF NOT noitems %] + [% ELSIF NOT noitems # /UNLESS patron %] [% IF ( checked_previously && !multi_hold ) %]
@@ -135,9 +135,9 @@
  • No items are available to be placed on hold.
    • [% ELSIF ( maxreserves ) %]
  • Too many holds: [% patron.firstname | html %] [% patron.surname | html %] has too many holds.
    • - [% END %] + [% END # /IF exceeded_maxreserves %] - [% ELSE %] + [% ELSE # UNLESS multi_hold %]

    Cannot place hold on some items

    [% IF ( exceeded_maxreserves ) %]
  • Too many holds: [% patron.firstname | html %] [% patron.surname | html %] can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.
    • @@ -147,10 +147,10 @@
  • Too many holds for [% biblioloo.title | html %]: [% patron.firstname | html %] [% patron.surname | html %] can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.
    • [% END %] [% END %] - [% END %] - [% END %] + [% END # /IF exceeded_maxreserves %] + [% END # /UNLESS multi_hold %]
    - [% END %] + [% END # /IF ( exceeded_maxreserves || ... %] [% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
    @@ -170,10 +170,9 @@ [% IF ( diffbranch ) %]
  • Pickup library is different. Patron: [% patron.firstname | html %] [% patron.surname | html %] Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )
    • [% END %] - - +
    - [% END %] + [% END # /IF expiry || diffbranch ... %] [% IF ( messageborrower ) %]
    @@ -182,9 +181,9 @@
    [% END %] -
    +
    Hold details -
    + @@ -202,7 +201,7 @@ - [% END %] + [% END # /IF multi_hold %]
    1. @@ -244,7 +243,7 @@
      2. [% END %] - [% END %] + [% END # /UNLESS multi_hold %] [% IF ( reserve_in_future ) %]
    2. @@ -283,7 +282,7 @@ [% ELSE %] [% END %] - [% END %] + [% END # /UNLESS multi_hold %]
    [% UNLESS ( multi_hold ) %] @@ -387,7 +386,7 @@ [% END %] [% END %] - [% END %] + [% END # /IF itemloo.force_hold_level %] [% IF ( item_level_itypes ) %] @@ -452,10 +451,10 @@ [% END %] [% END %]. Cancel hold - [% END %] + [% END # /IF itemloo.nocancel %] [% ELSE %] Not on hold - [% END %] + [% END # /IF itemloo.reservedate %] [% IF itemloo.item_level_holds == "N" %]
    Item level hold not allowed from OPAC @@ -476,10 +475,10 @@ [% END %] - [% END %] - [% END %] + [% END # / UNLESS itemloo.hide %] + [% END # /FOREACH itemloo %] - + [% IF ( bibitemloo.hiddencount ) %] @@ -487,10 +486,10 @@ Show all items ([% bibitemloo.hiddencount | html %] hidden)

    - [% END %] - [% END %] + [% END # /IF bibitemloo.hiddencount %] + [% END # /FOREACH bibitemloo %] - [% ELSE %] + [% ELSE # /UNLESS multi_hold %] @@ -565,10 +564,10 @@ [% END %] - [% END %] -
    + [% END # /FOREACH biblioloo %] + - [% END %] + [% END # /UNLESS multi_hold %]
    [% IF ( patron AND patron.borrowernumber ) %] @@ -583,10 +582,10 @@ [% END %] [% END %] - [% END %] -
    - -
    + [% END # /IF patron %] +
    + + [% END %] [% UNLESS ( patron ) %] @@ -597,7 +596,7 @@ [% END %] -
    +
    Existing holds [% FOREACH biblioloo IN biblioloop %] @@ -629,7 +628,7 @@ [% Branches.GetName( b ) | html %] [% INCLUDE holds_table.inc holds=holds_by_branch %]
    - [% END %] + [% END # /FOREACh b %] [% ELSIF Koha.Preference('HoldsSplitQueue') == 'itemtype' %] [% SET itemtypes = [] %] @@ -656,7 +655,7 @@ [% END %] [% INCLUDE holds_table.inc holds=holds_by_itemtype %]
    - [% END %] + [% END # /FOREACH i %] [% ELSIF Koha.Preference('HoldsSplitQueue') == 'branch_itemtype' %] [% SET branchcodes = [] %] @@ -701,21 +700,21 @@ [% END %] - [% END %] + [% END # /FOREACH b %] [% ELSE %] [% INCLUDE holds_table.inc holds=biblioloo.reserveloop %] - [% END %] + [% END # /IF HoldsSplitQueue %] - [% END %] - [% END %] + [% END # /IF biblioloo.reserveloop %] + [% END # FOREACH biblioloo %]
    - - - [% END %] - [% END %] + + + [% END # IF reserveloop %] + [% END # UNLESS patron %] @@ -725,7 +724,7 @@
    [% END %] -- 2.39.5