From 62c11821236f6390d37440f93628e408606e296a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 26 Jun 2019 12:39:59 +0000 Subject: [PATCH] Bug 22951: (follow-up) Fix indentation This patch fixes indentation related to the markup corrections in the previous patch. It contains no textual changes. Signed-off-by: Mark Tompsett Signed-off-by: Nadine Pierre Signed-off-by: frederik chenier Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 178a805a5d3055dd17050111c1227a9d5cef1b96) Signed-off-by: Fridolin Somers (cherry picked from commit 444727e3e75b0f33c6b93006455debec15e725fe) Signed-off-by: Lucas Gass --- .../bootstrap/en/modules/opac-reserve.tt | 614 +++++++++--------- 1 file changed, 307 insertions(+), 307 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 30bbd9b882..171409eb9b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -121,334 +121,334 @@ [% ELSE # /IF message %] - [% IF ( none_available && multi_hold ) %] -
- Sorry, none of these titles can be placed on hold. -
- [% END %] + [% IF ( none_available && multi_hold ) %] +
+ Sorry, none of these titles can be placed on hold. +
+ [% END %] [% END # / IF message %] - [% UNLESS ( message ) %] - [% UNLESS ( none_available ) %] -

Confirm holds for:[% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])

- [% END # / UNLESS none_available %] - - [% IF (RESERVE_CHARGE) %] -
- [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %] - You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item - [% ELSE %] - You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold - [% END %] -
- [% END %] - - [% IF ( new_reserves_allowed ) %] -
- Sorry, you can only place [% new_reserves_allowed | html %] more holds. Please uncheck the checkboxes for the items you wish to not place holds on. -
+ [% UNLESS ( message ) %] + [% UNLESS ( none_available ) %] +

Confirm holds for:[% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])

+ [% END # / UNLESS none_available %] + + [% IF (RESERVE_CHARGE) %] +
+ [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %] + You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item + [% ELSE %] + You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold [% END %] - -
- - - - -
- - [% FOREACH bibitemloo IN bibitemloop %] -
-

- [% IF ( bibitemloo.holdable ) %] - - - - - - - - [% END # / bibitemloo.holdable %] - - - [% bibitemloo.title | html %] - [% IF ( bibitemloo.subtitle ) %] - [% FOREACH subtitl IN bibitemloo.subtitle %] - [% subtitl.subfield | html %] - [% END %] - [% END %] - - [% IF ( bibitemloo.author ) %], by [% bibitemloo.author | html %][% END %] -

- - [% UNLESS ( bibitemloo.holdable ) %] - [% IF ( bibitemloo.ageRestricted ) %] -
Sorry, you are too young to reserve this material.
+
+ [% END %] + + [% IF ( new_reserves_allowed ) %] +
+ Sorry, you can only place [% new_reserves_allowed | html %] more holds. Please uncheck the checkboxes for the items you wish to not place holds on. +
+ [% END %] + + + + + + +
+ + [% FOREACH bibitemloo IN bibitemloop %] +
+

+ [% IF ( bibitemloo.holdable ) %] + + + + + + + + [% END # / bibitemloo.holdable %] + + + [% bibitemloo.title | html %] + [% IF ( bibitemloo.subtitle ) %] + [% FOREACH subtitl IN bibitemloo.subtitle %] + [% subtitl.subfield | html %] [% END %] - [% IF ( bibitemloo.already_reserved ) %] -

You have already requested this title.
+ [% END %] + + [% IF ( bibitemloo.author ) %], by [% bibitemloo.author | html %][% END %] +

+ + [% UNLESS ( bibitemloo.holdable ) %] + [% IF ( bibitemloo.ageRestricted ) %] +
Sorry, you are too young to reserve this material.
+ [% END %] + [% IF ( bibitemloo.already_reserved ) %] +
You have already requested this title.
+ [% ELSE %] + [% UNLESS ( bibitemloo.bib_available ) %] +
There are no items that can be placed on hold.
+ [% ELSE %] + [% IF ( bibitemloo.already_patron_possession ) %] +
This title cannot be requested because it's already in your possession.
[% ELSE %] - [% UNLESS ( bibitemloo.bib_available ) %] -
There are no items that can be placed on hold.
- [% ELSE %] - [% IF ( bibitemloo.already_patron_possession ) %] -
This title cannot be requested because it's already in your possession.
- [% ELSE %] -
This title cannot be requested.
- [% END %] - [% END # / UNLESS bibitemloo.bib_available %] - [% END # / IF bibitemloo.already_reserved %] - [% END # / UNLESS bibitemloo.holdable %] - - [% IF ( bibitemloo.holdable ) %] -
-
    - - [% UNLESS ( item_level_itypes ) %] -
  • - Item type: - [% IF ( bibitemloo.imageurl ) %][% END %] - [% bibitemloo.translated_description | html %] -
    • - [% END %] - - [% SET OPACShowHoldQueueDetails = Koha.Preference('OPACShowHoldQueueDetails') %] - [% IF OPACShowHoldQueueDetails == 'holds_priority' || OPACShowHoldQueueDetails == 'priority' %] -
  • - Your priority: - [% bibitemloo.rank | html %] -
    • - [% END %] - - [% IF OPACShowHoldQueueDetails == 'holds_priority' || OPACShowHoldQueueDetails == 'holds' %] -
  • - Number of holds: - [% bibitemloo.reservecount | html %] -
    • - [% END %] - - [% UNLESS ( singleBranchMode ) %] - [% IF ( bibitemloo.holdable && Koha.Preference('OPACAllowUserToChooseBranch')) %] -
  • - - [% UNLESS ( bibitemloo.holdable ) %] - - [% ELSE %] - [% SET at_least_one_library_not_available_for_pickup = 0 %] - - [% IF at_least_one_library_not_available_for_pickup %] -
    Note: Library policy does not allow hold/pickup of an item available locally. Please come to the library to retrieve these items - [% END %] - [% END # / UNLESS bibitemloo.holdable %] -
    • - [% END # / IF bibitemloo.holdable && Koha.Preference('OPACAllowUserToChooseBranch') %] - [% END # / UNLESS singleBranchMode %] -
- - - -
- -
    - [% IF ( reserve_in_future ) %] -
  • - - - [% INCLUDE 'date-format.inc' %] -
    • - [% END %] +
    This title cannot be requested.
    + [% END %] + [% END # / UNLESS bibitemloo.bib_available %] + [% END # / IF bibitemloo.already_reserved %] + [% END # / UNLESS bibitemloo.holdable %] + + [% IF ( bibitemloo.holdable ) %] +
    +
      + + [% UNLESS ( item_level_itypes ) %] +
    • + Item type: + [% IF ( bibitemloo.imageurl ) %][% END %] + [% bibitemloo.translated_description | html %] +
      • + [% END %] -
    • - - - [% INCLUDE 'date-format.inc' %] -
      • + [% SET OPACShowHoldQueueDetails = Koha.Preference('OPACShowHoldQueueDetails') %] + [% IF OPACShowHoldQueueDetails == 'holds_priority' || OPACShowHoldQueueDetails == 'priority' %] +
    • + Your priority: + [% bibitemloo.rank | html %] +
      • + [% END %] - [% IF Koha.Preference('AllowHoldItemTypeSelection') %] - [% itemtypes = [] %] - [% FOREACH item IN bibitemloo.itemLoop %] - [% itemtypes.push( item.itype ) %] - [%- END %] -
    • - - -
      • - [% END %] + [% IF OPACShowHoldQueueDetails == 'holds_priority' || OPACShowHoldQueueDetails == 'holds' %] +
    • + Number of holds: + [% bibitemloo.reservecount | html %] +
      • + [% END %] - [% IF ( OpacHoldNotes ) %] -
    • -
      - - [% IF bibitemloo.reqholdnotes %] - Please enter additional information about the requested item: + [% UNLESS ( singleBranchMode ) %] + [% IF ( bibitemloo.holdable && Koha.Preference('OPACAllowUserToChooseBranch')) %] +
    • + + [% UNLESS ( bibitemloo.holdable ) %] + + [% ELSE %] + [% SET at_least_one_library_not_available_for_pickup = 0 %] + -
- - [% END # / IF OpacHoldNotes %] - - [% IF bibitemloo.itemholdable %] - - - [% END # / IF bibitemloo.itemholdable %] - - - [% IF bibitemloo.itemholdable %] - - - - - [% IF ( item_level_itypes ) %] - [% END %] - - [% UNLESS ( singleBranchMode ) %] - - - [% END %] - [% IF ( itemdata_ccode ) %] - + + [% IF at_least_one_library_not_available_for_pickup %] +
Note: Library policy does not allow hold/pickup of an item available locally. Please come to the library to retrieve these items + [% END %] + [% END # / UNLESS bibitemloo.holdable %] + + [% END # / IF bibitemloo.holdable && Koha.Preference('OPACAllowUserToChooseBranch') %] + [% END # / UNLESS singleBranchMode %] + + + + +
+ +
    + [% IF ( reserve_in_future ) %] +
  • + + + [% INCLUDE 'date-format.inc' %] +
    • + [% END %] + +
  • + + + [% INCLUDE 'date-format.inc' %] +
    • + + [% IF Koha.Preference('AllowHoldItemTypeSelection') %] + [% itemtypes = [] %] + [% FOREACH item IN bibitemloo.itemLoop %] + [% itemtypes.push( item.itype ) %] + [%- END %] +
  • + + +
    • + [% END %] + + [% IF ( OpacHoldNotes ) %] +
  • +
    + + [% IF bibitemloo.reqholdnotes %] + Please enter additional information about the requested item: + [% END %] + +
    +
    • + [% END # / IF OpacHoldNotes %] + + [% IF bibitemloo.itemholdable %] + + + [% END # / IF bibitemloo.itemholdable %] +
+ + [% IF bibitemloo.itemholdable %] +
Select a specific item:
Copy numberItem typeBarcodeHome libraryLast locationCollection
+ + + + [% IF ( item_level_itypes ) %] + + [% END %] + + [% UNLESS ( singleBranchMode ) %] + + + [% END %] + [% IF ( itemdata_ccode ) %] + + [% END %] + + [% IF ( itemdata_enumchron ) %] + + [% END %] + + + + [% FOREACH itemLoo IN bibitemloo.itemLoop %] + + - [% IF ( itemdata_enumchron ) %] - + + [% IF ( itemLoo.copynumber ) %] + [% itemLoo.copynumber | html %] [% END %] - - - - [% FOREACH itemLoo IN bibitemloo.itemLoop %] - - - [% IF ( itemLoo.copynumber ) %] - [% itemLoo.copynumber | html %] + [% IF ( item_level_itypes ) %] + - - [% IF ( item_level_itypes ) %] - [% END %] + [% itemLoo.translated_description | html %] + + [% END %] + + + [% UNLESS ( singleBranchMode ) %] + + + [% END %] + [% IF ( itemdata_ccode ) %] + + [% END %] + + [% IF ( itemdata_enumchron ) %] + + [% END %] + - [% UNLESS ( singleBranchMode ) %] - - - [% END %] - [% IF ( itemdata_ccode ) %] - - [% END %] - - [% IF ( itemdata_enumchron ) %] - - [% END %] - - - [% END # / FOREACH itemLoo IN bibitemloo.itemLoop%] -
Select a specific item:
Copy numberItem typeBarcodeHome libraryLast locationCollectionCall numberVol infoInformation
+ [% IF ( itemLoo.available ) %] + + [% ELSE %] + + Cannot be put on hold [% END %] - Call numberVol infoInformation
- [% IF ( itemLoo.available ) %] - - [% ELSE %] - - Cannot be put on hold - [% END %] + + [% UNLESS ( noItemTypeImages ) %] + [% IF ( itemLoo.imageurl ) %] + [% END %] - - [% UNLESS ( noItemTypeImages ) %] - [% IF ( itemLoo.imageurl ) %] - - [% END %] - [% END %] - [% itemLoo.translated_description | html %] - [% itemLoo.barcode | html %][% Branches.GetName( itemLoo.homeBranchName ) | html %][% Branches.GetName( itemLoo.holdingBranchName ) | html %] [% IF ( itemLoo.ccode ) %][% AuthorisedValues.GetByCode( 'CCODE', itemLoo.ccode, 1 ) | html %][% END %][% itemLoo.callNumber | html %][% itemLoo.enumchron | html %] + [% IF ( itemLoo.dateDue ) %] + Due [% itemLoo.dateDue | html %] + [% ELSIF ( itemLoo.transfertwhen ) %] + In transit from [% Branches.GetName( itemLoo.transfertfrom ) | html %] to [% Branches.GetName( itemLoo.transfertto ) | html %] since [% itemLoo.transfertwhen | html %] + [% END %] - [% itemLoo.barcode | html %][% Branches.GetName( itemLoo.homeBranchName ) | html %][% Branches.GetName( itemLoo.holdingBranchName ) | html %] [% IF ( itemLoo.ccode ) %][% AuthorisedValues.GetByCode( 'CCODE', itemLoo.ccode, 1 ) | html %][% END %][% itemLoo.callNumber | html %][% itemLoo.enumchron | html %] - [% IF ( itemLoo.dateDue ) %] - Due [% itemLoo.dateDue | html %] - [% ELSIF ( itemLoo.transfertwhen ) %] - In transit from [% Branches.GetName( itemLoo.transfertfrom ) | html %] to [% Branches.GetName( itemLoo.transfertto ) | html %] since [% itemLoo.transfertwhen | html %] - [% END %] + [% IF ( itemLoo.message ) %] + Unavailable (lost or missing) + [% END %] - [% IF ( itemLoo.message ) %] - Unavailable (lost or missing) - [% END %] + [% IF ( itemLoo.notforloan ) %] + Not for loan ([% itemLoo.notforloanvalue | html %]) + [% END %] - [% IF ( itemLoo.notforloan ) %] - Not for loan ([% itemLoo.notforloanvalue | html %]) + [% IF ( itemLoo.reservedate ) %] + + [% IF ( itemLoo.waitingdate ) %] + Waiting + [% ELSE %] + On hold [% END %] - - [% IF ( itemLoo.reservedate ) %] - - [% IF ( itemLoo.waitingdate ) %] - Waiting - [% ELSE %] - On hold - [% END %] - for patron - [% IF ( itemLoo.waitingdate ) %] - at - [% ELSE %] - expected at - [% END %] - [% itemLoo.ExpectedAtLibrary | html %] since - [% IF ( itemLoo.waitingdate ) %] - [% itemLoo.waitingdate | $KohaDates %] - [% ELSE %] - [% IF ( itemLoo.reservedate ) %] - [% itemLoo.reservedate | html %] - [% END %] - [% END %]. - + for patron + [% IF ( itemLoo.waitingdate ) %] + at + [% ELSE %] + expected at + [% END %] + [% itemLoo.ExpectedAtLibrary | html %] since + [% IF ( itemLoo.waitingdate ) %] + [% itemLoo.waitingdate | $KohaDates %] [% ELSE %] - Not on hold - [% END # / IF ( itemLoo.reservedate )%] -
- [% END # / IF ( bibitemloo.itemholdable )%] -
- - [% END # / IF ( bibitemloo.holdable ) %] -
- [% END # / FOREACH bibitemloo IN bibitemloop %] -
- - [% UNLESS ( none_available ) %] - - [% END %] - -
- [% END # / UNLESS message %] -
+ [% IF ( itemLoo.reservedate ) %] + [% itemLoo.reservedate | html %] + [% END %] + [% END %]. + + [% ELSE %] + Not on hold + [% END # / IF ( itemLoo.reservedate )%] + + + [% END # / FOREACH itemLoo IN bibitemloo.itemLoop%] + + [% END # / IF ( bibitemloo.itemholdable )%] + + + [% END # / IF ( bibitemloo.holdable ) %] + + [% END # / FOREACH bibitemloo IN bibitemloop %] + + + [% UNLESS ( none_available ) %] + + [% END %] + + + [% END # / UNLESS message %] + [% INCLUDE 'opac-bottom.inc' %] -- 2.39.5