From 3327ecbe147b33ed285e02c94196f7b07ce56e3c Mon Sep 17 00:00:00 2001 From: Liz Rea 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. Also changes the layout of the table a bit to be a little more user friendly. Test Plan: 1) Set your CHECKOUT notice to the following ( with HTML Message checked ) :

The following items have been checked out:

----
<>
----

Thank you for visiting the <> of HMCPL.

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 --- koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 31d40ba..f5ad8c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -41,13 +41,13 @@

Sent notices for [% INCLUDE 'patron-title.inc' %]

[% IF ( QUEUED_MESSAGES ) %] - +
- - - - + + + + @@ -55,9 +55,9 @@
NoticeTypeStatusTimeNoticeTypeStatusTime
[% QUEUED_MESSAGE.subject %] -

+

[% QUEUED_MESSAGE.content FILTER html_line_break %] -

+
[% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email -- 1.9.1