@@ -, +, @@ column in the OPAC --- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 82 ++++++++++++---------- 1 file changed, 43 insertions(+), 39 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -244,7 +244,7 @@ [% END %] Call no. [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] - Renew + Renew [% END %] [% IF ( OPACFinesTab ) %] Fines @@ -345,45 +345,49 @@ [% ISSUE.itemcallnumber | html %] [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %] - - [% IF ISSUE.renewed %]Renewed!
[% END %] - [% IF ( ISSUE.status ) %] - [% IF ( canrenew ) %] - Renew - [% END %] - [% IF ISSUE.renewalfee > 0 %] - Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %] - [% END %] - [% IF ISSUE.itemtype_object.rentalcharge_daily > 0 %] - [% ISSUE.itemtype_object.rentalcharge_daily | $Price %] per day - [% END %] - [% IF ISSUE.itemtype_object.rentalcharge_hourly > 0 %] - [% ISSUE.itemtype_object.rentalcharge_hourly | $Price %] per hour - [% END %] - ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) - [% ELSIF ( ISSUE.on_reserve ) %] - Not renewable (on hold) - [% ELSIF ( ISSUE.too_many ) %] - Not renewable - [% ELSIF ( ISSUE.norenew_overdue ) %] - Not allowed (overdue) - [% ELSIF ( ISSUE.auto_too_late ) %] - No longer renewable - [% ELSIF ISSUE.auto_too_much_oweing %] - Automatic renewal failed, you have unpaid fines. - ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) - [% ELSIF ISSUE.auto_account_expired %] - Automatic renewal failed, your account is expired. - ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) - [% ELSIF ( ISSUE.too_soon ) %] - No renewal before [% ISSUE.soonestrenewdate | html %] - ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) - [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %] - Automatic renewal - ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) - [% ELSIF ( ISSUE.item_denied_renewal ) %] - Renewal not allowed + [% IF ( ISSUE.status && canrenew ) %] + + [% ELSE %] + [% END %] + [% IF ISSUE.renewed %]Renewed!
[% END %] + [% IF ( ISSUE.status ) %] + [% IF ( canrenew ) %] + Renew + [% END %] + [% IF ISSUE.renewalfee > 0 %] + Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %] + [% END %] + [% IF ISSUE.itemtype_object.rentalcharge_daily > 0 %] + [% ISSUE.itemtype_object.rentalcharge_daily | $Price %] per day + [% END %] + [% IF ISSUE.itemtype_object.rentalcharge_hourly > 0 %] + [% ISSUE.itemtype_object.rentalcharge_hourly | $Price %] per hour + [% END %] + ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) + [% ELSIF ( ISSUE.on_reserve ) %] + Not renewable (on hold) + [% ELSIF ( ISSUE.too_many ) %] + Not renewable + [% ELSIF ( ISSUE.norenew_overdue ) %] + Not allowed (overdue) + [% ELSIF ( ISSUE.auto_too_late ) %] + No longer renewable + [% ELSIF ISSUE.auto_too_much_oweing %] + Automatic renewal failed, you have unpaid fines. + ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) + [% ELSIF ISSUE.auto_account_expired %] + Automatic renewal failed, your account is expired. + ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) + [% ELSIF ( ISSUE.too_soon ) %] + No renewal before [% ISSUE.soonestrenewdate | html %] + ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) + [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %] + Automatic renewal + ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) + [% ELSIF ( ISSUE.item_denied_renewal ) %] + Renewal not allowed + [% END %] [% END %] [% IF ( OPACFinesTab ) %] --