From feba31878bf7fa33ffc1b82ac0362d887c57f3fb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 15 Jan 2014 11:53:56 +0100 Subject: [PATCH] Bug 6739: template changes for the bootstrap theme Signed-off-by: Chris Cormack --- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 +++ .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 35 +++++++++++++++++----- 2 files changed, 32 insertions(+), 7 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 af6a5a5..df461e4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -76,6 +76,10 @@
ERROR: Internal error: incomplete hold request.
[% END %] + [% IF ( expired_patron ) %] +
Sorry, you cannot place holds because your library card has expired.

Please contact your librarian if you wish to renew your card.

+ [% END %] + [% ELSE %] [% IF ( none_available ) %] 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 edd569c..a027a3e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -57,7 +57,25 @@ [% IF ( BORROWER_INF.warnexpired ) %]
- Please note: Your card has expired. Please contact the library for more information. + Please note: Your account has expired as of [% BORROWER_INF.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account. +
+ [% END %] + + [% IF ( RENEW_ERROR ) %] +
+ Please note: + + Your account renewal failed because of the following: + [% FOREACH error IN RENEW_ERROR.split('\|') %] + [% IF error == 'card_expired' %] + Your account has expired. Please contact the library for more information. + [% ELSIF error == 'too_many' %] + You have renewed this item the maximum number of times allowed. + [% ELSIF error == 'on_reserve' %] + This item is on hold for another patron. + [% END %] + [% END %] +
[% END %] @@ -112,7 +130,7 @@ Barcode [% END %] Call No. - [% IF ( OpacRenewalAllowed ) %] + [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %] Renew [% END %] [% IF ( OPACFinesTab ) %] @@ -198,7 +216,7 @@ Call number: [% ISSUE.itemcallnumber %] - [% IF ( OpacRenewalAllowed ) %] + [% IF ( OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %] [% IF ( ISSUE.status ) %] [% IF ( canrenew ) %] @@ -234,12 +252,12 @@ [% END # /FOREACH ISSUES %] - [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] + [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %] [% END %] - [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] + [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %]
@@ -631,7 +649,7 @@ var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?"); var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended holds?"); - $(function() { + $(document).ready(function(){ $('#opac-user-views').tabs(); var dTables = $("#checkoutst,#holdst,#overduest"); @@ -667,8 +685,11 @@ $("#renewall_link").live('click',function(){ $("#renewall").submit(); }); - $("#checkoutst caption").append(""); + [% IF ( canrenew && !userdebarred && OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) ) %] + $("#checkoutst caption").append(""); + [% END %] [% END %] + $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future }); //]]> -- 1.8.5.3