From 64911d8f094916ccc0482a567c367e876ed5c302 Mon Sep 17 00:00:00 2001
From: Victor Grousset <victor.grousset@biblibre.com>
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 <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>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 418eae24ccdb6b85b70cb302735770ce986c3593)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../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 ) %]
                             <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 %]
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
                                         </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 %]
-- 
2.39.5