Bug 19849: Minor fixes & refactor of opac-reserve.tt & opac-user.tt

- make next patch easely reviewable.
- fix lone quote. (Replace by <strong>
- add forgotten condition for 9999-12-31

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Victor Grousset 2017-12-20 15:15:49 +01:00 committed by Nick Clemens
parent e9f12b6baa
commit 9864b805f4
2 changed files with 27 additions and 10 deletions

View file

@ -42,16 +42,23 @@
[% IF ( debarred ) %]
<li id="debarred">
Your account has been frozen.
[% IF debarred_comment %] Comment: <span id="userdebarred_comment">"
[% IF debarred_comment.search('OVERDUES_PROCESS') %]
Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %]
[% ELSE %]
[% debarred_comment | html_line_break %]
[% IF debarred_comment %]
Comment:
<span id="userdebarred_comment">
<strong>
[% IF debarred_comment.search('OVERDUES_PROCESS') %]
Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %]
[% ELSE %]
[% debarred_comment | html_line_break %]
[% END %]
</strong>
</span>
[% END %]
</span>
[% END %]
[% IF debarred_date && debarred_date != '9999-12-31' %] End date: <span id="userdebarred_date">[% debarred_date | $KohaDates %]</span>[% END %]
[% IF debarred_date && debarred_date != '9999-12-31' %]
End date:
<span id="userdebarred_date">[% debarred_date | $KohaDates %]</span>
[% END %]
<br /><em>Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a>
</li>
[% END %]

View file

@ -98,8 +98,18 @@
</li>
[% ELSE %]
<li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
[% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]
[% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %]
[% IF ( BORROWER_INFO.debarredcomment ) %]
Comment:
<span id="userdebarred_comment">
<strong>
[% BORROWER_INFO.debarredcomment %]
</strong>
</span>
[% END %]
[% IF ( BORROWER_INFO.userdebarreddate && debarred_date != '9999-12-31' ) %]
End date:
<span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>
[% END %]
<em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li>
[% END %]
[% END %]