From 64911d8f094916ccc0482a567c367e876ed5c302 Mon Sep 17 00:00:00 2001 From: Victor Grousset Date: Wed, 20 Dec 2017 15:15:49 +0100 Subject: [PATCH] Bug 19849: Minor fixes & refactor of opac-reserve.tt & opac-user.tt - make next patch easely reviewable. - fix lone quote. (Replace by - add forgotten condition for 9999-12-31 Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize (cherry picked from commit 418eae24ccdb6b85b70cb302735770ce986c3593) Signed-off-by: Fridolin Somers --- .../bootstrap/en/modules/opac-reserve.tt | 23 ++++++++++++------- .../bootstrap/en/modules/opac-user.tt | 14 +++++++++-- 2 files changed, 27 insertions(+), 10 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 0f2f4eb697..359e1f6ff4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -42,16 +42,23 @@ [% IF ( debarred ) %]
  • Your account has been frozen. - [% IF debarred_comment %] 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: + + + [% 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 %] + + [% END %] - - [% END %] - [% IF debarred_date && debarred_date != '9999-12-31' %] End date: [% debarred_date | $KohaDates %][% END %] + [% IF debarred_date && debarred_date != '9999-12-31' %] + End date: + [% debarred_date | $KohaDates %] + [% END %]
    Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library. Go to your account page
  • [% END %] 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 bfe62f1d24..9997ccf7dd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -108,8 +108,18 @@ Using this account is not recommended because some parts of Koha will not functi [% ELSE %]
  • Please note: Your account has been frozen. - [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: "[% BORROWER_INFO.debarredcomment %]"[% END %] - [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: [% BORROWER_INFO.userdebarreddate | $KohaDates %][% END %] + [% IF ( BORROWER_INFO.debarredcomment ) %] + Comment: + + + [% BORROWER_INFO.debarredcomment %] + + + [% END %] + [% IF ( BORROWER_INFO.userdebarreddate && debarred_date != '9999-12-31' ) %] + End date: + [% BORROWER_INFO.userdebarreddate | $KohaDates %] + [% END %] Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library. Go to your account page
  • [% END %] [% END %] -- 2.39.5