From 121208d86ddc8d951a8d5e97883e66c23d13b4d1 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 14 Nov 2017 21:45:50 +0000 Subject: [PATCH] Bug 19532: Fixing broken OPAC recalls table Forgot to add Signed-off-by: Nick Clemens --- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 128 +++++++++++---------- 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index e4528db..fda493e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -591,7 +591,7 @@ Using this account is not recommended because some parts of Koha will not functi Title Placed on Expires on - Pick up location + Pickup location [% IF ( showpriority ) %] Priority [% END %] @@ -787,78 +787,80 @@ Using this account is not recommended because some parts of Koha will not functi Title Placed on Expires on - Pick up location + Pickup location Status Cancel [% FOREACH RECALL IN RECALLS %] - - - [% RECALL.biblio.title %] - [% FOREACH s IN RECALL.biblio.subtitles %] - [% s %] - [% END %] - [% RECALL.item.enumchron %] - - [% RECALL.biblio.author %] - - - - Recall date: - [% RECALL.recalldate | $KohaDates %] - - - - [% IF ( RECALL.is_waiting ) %] - [% IF ( RECALL.expirationdate ) %] - + + + + [% RECALL.biblio.title %] + [% FOREACH s IN RECALL.biblio.subtitles %] + [% s %] + [% END %] + [% RECALL.item.enumchron %] + + [% RECALL.biblio.author %] + + + + Recall date: + [% RECALL.recalldate | $KohaDates %] + + + + [% IF ( RECALL.is_waiting ) %] + [% IF ( RECALL.expirationdate ) %] + + Expiration: + [% RECALL.expirationdate | $KohaDates %] + + [% ELSE %] + + Expiration: + Never expires + + [% END %] + [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %] + Expiration: - [% RECALL.expirationdate | $KohaDates %] + [% RECALL.expirationdate | $KohaDates %] [% ELSE %] - - Expiration: - Never expires - + - [% END %] - [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %] - - Expiration: - [% RECALL.expirationdate | $KohaDates %] - - [% ELSE %] - - - [% END %] - - - Pick up location: - [% RECALL.branch.branchname %] - - - Status: - [% IF ( RECALL.is_requested ) %] - Requested - [% ELSIF ( RECALL.is_waiting ) %] - Ready for pickup - [% ELSIF ( RECALL.has_expired ) %] - Expired - [% END %] - - - [% IF ( !RECALL.cancellationdate ) %] -
- - - - -
- [% ELSE %] - Cancelled - [% END %] - - [% END %] + + + Pick up location: + [% RECALL.branch.branchname %] + + + Status: + [% IF ( RECALL.is_requested ) %] + Requested + [% ELSIF ( RECALL.is_waiting ) %] + Ready for pickup + [% ELSIF ( RECALL.has_expired ) %] + Expired + [% END %] + + + [% IF ( !RECALL.cancellationdate ) %] +
+ + + + +
+ [% ELSE %] + Cancelled + [% END %] + + [% END %] + -- 2.1.4