From f402ece344ca2bd08defc3ca833651ce04bdea40 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 2 May 2013 14:16:51 -0400 Subject: [PATCH 3/5] Bug 6739 - expired patrons not blocked from opac actions - Followup 2 * Hide renewal column, buttons and links * Fixes minor bug where upper-right table links would show even if renewal impossible * Cleans up some of the template formatting ( whitespace changes only ) Signed-off-by: Owen Leonard --- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 173 ++++++++++++++-------- opac/opac-user.pl | 1 + 2 files changed, 109 insertions(+), 65 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt index df2db1b..0b99fc6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -8,49 +8,74 @@ @@ -107,7 +132,7 @@ $.tablesorter.addParser({ Please note: Your account renewal failed because of the following: - [% FOREACH error IN RENEW_ERROR.split('|') %] + [% 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' %] @@ -153,27 +178,45 @@ $.tablesorter.addParser({
[% IF ( issues_count ) %]
- - - - - - [% IF ( JacketImages ) %][% END %] - - - [% UNLESS ( item_level_itypes ) %] [% END %] - [% IF ( show_barcode ) %][% END %] - - [% IF ( OpacRenewalAllowed ) %] - - [% END %] -[% IF ( OPACFinesTab ) %] - -[% END %] - [% IF ( OPACMySummaryHTML ) %] - - [% END %] - + + + +
[% issues_count %] Item(s) checked out
 TitleDueItem typeBarcodeCall No.RenewFinesLinks
+ + + + + [% IF ( JacketImages ) %] + + [% END %] + + + + + + [% UNLESS ( item_level_itypes ) %] + + [% END %] + + [% IF ( show_barcode ) %] + + [% END %] + + + + [% IF OpacRenewalAllowed && !( borrower.is_expired && borrower.BlockExpiredPatronOpacActions ) %] + + [% END %] + + [% IF ( OPACFinesTab ) %] + + [% END %] + + [% IF ( OPACMySummaryHTML ) %] + + [% END %] + +
[% issues_count %] Item(s) checked out
 TitleDueItem typeBarcodeCall No.RenewFinesLinks