From 14e8f5bb713bd4f45a85f028e0c9b5738f3eefd5 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Sat, 29 Apr 2017 17:14:10 +0000
Subject: [PATCH] Bug 13913 - Renewal error message in OPAC is confusing

This patch adds some formatting to the error message a patron receives
when there are renewal failures in the OPAC.

This is pretty much the least which could be done to address this
problem. However, I don't think the issue can be fixed without
re-thinking how renewals are processed. Sending error messages back to
opac-user.pl via URL parameter isn't flexible enough.

To test, apply the patch and attempt to renew multiple items in the OPAC
which cannot be renewed for some reason, for instance because they have
been renewed too many times. The error messages should appear in a list
rather than strung together in one long block of text.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 281e1253777d2bd635610075fe610bedb2d47360)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../bootstrap/en/modules/opac-user.tt         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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 34c580fb66..074b9c576b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -81,20 +81,20 @@ Using this account is not recommended because some parts of Koha will not functi
                     [% IF ( RENEW_ERROR ) %]
                         <div class="dialog alert">
                             <strong>Please note:</strong>
-                            <span>
                                 Your loan renewal failed because of the following reason(s):
-                                [% 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' %]
-                                        You have renewed this item the maximum number of times allowed.
-                                    [% ELSIF error == 'too_soon' %]
-                                        It is too soon after the checkout date for this item to be renewed.
-                                    [% ELSIF error == 'on_reserve' %]
-                                        This item is on hold for another borrower.
+                                <ul>
+                                    [% FOREACH error IN RENEW_ERROR.split('\|') %]
+                                        [% IF error == 'card_expired' %]
+                                            <li>Your account has expired. Please contact the library for more information.</li>
+                                        [% ELSIF error == 'too_many' %]
+                                            <li>You have renewed this item the maximum number of times allowed.</li>
+                                        [% ELSIF error == 'too_soon' %]
+                                            <li>It is too soon after the checkout date for this item to be renewed.</li>
+                                        [% ELSIF error == 'on_reserve' %]
+                                            <li>This item is on hold for another borrower.</li>
+                                        [% END %]
                                     [% END %]
-                                [% END %]
-                            </span>
+                                </ul>
                         </div>
                     [% END %]
 
-- 
2.39.5