diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt index 95272ac2a0..445854d0cf 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt @@ -40,7 +40,7 @@ Pickup location Status Due date -   + Modify @@ -57,84 +57,72 @@ [% RECALL.biblio.author | html %] - - Recall date: - [% RECALL.created_date | $KohaDates %] - + [% RECALL.created_date | $KohaDates %] - [% IF ( RECALL.expiration_date ) %] - - Expiration: - [% RECALL.expiration_date | $KohaDates %] - - [% ELSIF ( !RECALL.completed ) %] - - Expiration: - Never expires - - [% ELSE %] - - - [% END %] - - - Pick up location: - [% RECALL.library.branchname | html %] - - - Status: - [% IF ( RECALL.in_transit ) %] - In transit to [% RECALL.library.branchname | html %] - [% ELSIF ( RECALL.waiting ) %] - Ready for pickup - [% ELSIF ( RECALL.overdue ) %] - Overdue to be returned - [% ELSIF ( RECALL.expired ) %] - Expired on [% RECALL.expiration_date | $KohaDates %] - [% ELSIF ( RECALL.cancelled ) %] - Cancelled on [% RECALL.completed_date | $KohaDates %] - [% ELSIF ( RECALL.fulfilled ) %] - Fulfilled - [% ELSE %] - Requested - [% END %] - - - Due date - [% IF ( RECALL.requested ) %] - Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %] - [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %] - Pick up by [% RECALL.expiration_date | $KohaDates %] - [% ELSE %] - - - [% END %] - + [% IF ( RECALL.expiration_date ) %] + [% RECALL.expiration_date | $KohaDates %] + [% ELSIF ( !RECALL.completed ) %] + Never expires + [% ELSE %] + - + [% END %] + + + [% RECALL.library.branchname | html %] + + + [% IF ( RECALL.in_transit ) %] + In transit to [% RECALL.library.branchname | html %] + [% ELSIF ( RECALL.waiting ) %] + Ready for pickup + [% ELSIF ( RECALL.overdue ) %] + Overdue to be returned + [% ELSIF ( RECALL.expired ) %] + Expired on [% RECALL.expiration_date | $KohaDates %] + [% ELSIF ( RECALL.cancelled ) %] + Cancelled on [% RECALL.completed_date | $KohaDates %] + [% ELSIF ( RECALL.fulfilled ) %] + Fulfilled + [% ELSE %] + Requested + [% END %] + + + [% IF ( RECALL.requested ) %] + Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %] + [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %] + Pick up by [% RECALL.expiration_date | $KohaDates %] + [% ELSE %] + - + [% END %] + - - [% IF ( RECALL.requested or RECALL.overdue ) %] -
- [% INCLUDE 'csrf-token.inc' %] - - - - -
- [% END %] - - [% END %] + + [% IF ( RECALL.requested or RECALL.overdue ) %] +
+ [% INCLUDE 'csrf-token.inc' %] + + + + +
+ [% END %] + - - - - [% ELSE %] - No recalls have been made. - [% END # / # RECALLS.count %] + [% END %] + + + [% ELSE %] - Recalls have not been enabled. Please contact your library. - [% END %] - - + No recalls have been made. + [% END # / # RECALLS.count %] + [% ELSE %] + Recalls have not been enabled. Please contact your library. + [% END %] + + @@ -142,23 +130,22 @@ [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] [% INCLUDE 'datatables.inc' %] - [% END %]