From ab2d2d2590fe4adf4adf6015f0ef441da8ad52a3 Mon Sep 17 00:00:00 2001
From: Liz Rea <liz@catalyst.net.nz>
Date: Tue, 25 Nov 2014 12:03:50 +1300
Subject: [PATCH] Bug 12123 - [Alternative patch] HTML notices can break the
 notice viewer

Depending on the content of an html notice, it can cause the notice to
either not be collapsible, be uncollapsible, or to be permanently
collapsed.

Test Plan:
1) Set your CHECKOUT notice to the following ( with HTML Message checked ) :
<p>The following items have been checked out:</p>

----
<blockquote> <<biblio.title>> </blockquote>
----

<p>Thank you for visiting the <<branches.branchname>> of HMCPL.</p>
2) Check out some items to a patron
3) View the patrn's notices
4) Note the notice viewer is broken ( message is not collapsed, and
   con't be collapsed ).
5) Apply this patch
6) Reload the page
7) Note the notice viewer is no longer broken

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

This patch appears to fix the problem with the minimum required change.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index 31d40bae9d..50c7d0efb0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -55,9 +55,9 @@
 	    <tr>
 		<td>
             <a class="notice-title" href="#">[% QUEUED_MESSAGE.subject %]</a>
-            <p class="notice">
+            <div class="notice">
                 [% QUEUED_MESSAGE.content FILTER html_line_break %]
-            </p>
+            </div>
         </td>
 		<td>
             [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email
-- 
2.39.5