From 51cdcd91f744ff95b442bdb02f088d7d4c7642e7 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sat, 16 Jun 2012 14:18:36 +0200
Subject: [PATCH] Bug 7905: Follow up - Multi-line subscription notes

This patch adds the TT filter to other places where we are displaying the
subscription notes:

- OPAC detail page, subscription tab
- OPAC subscription brief history page
- Staff detail page, subscription tab

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tt      | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt         | 4 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt  | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index ce52040f35..df0ffe2641 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -478,7 +478,7 @@ function verify_images() {
     [% FOREACH subscription IN subscriptions %]
 	    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
 	    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
-            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes %] </p>[% END %]
+            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
             [% IF ( subscription.latestserials ) %]
             <p> The [% subscription.staffdisplaycount %] latest issues related to this subscription:</p>
             <table>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index a79eca3009..5e2b55edc7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -958,10 +958,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     [% FOREACH subscription IN subscriptions %]
     [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
     [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
-    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes %] </p>[% END %]
+    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
     <p>Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]</p>
     [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
-    [% IF ( subscription.opacnote ) %]<p>([% subscription.opacnote %])</p>[% END %]
+    [% IF ( subscription.opacnote ) %]<p>[% subscription.opacnote FILTER html_line_break %]</p>[% END %]
 [% IF ( subscription.latestserials ) %]
     <p> The [% subscription.opacdisplaycount %] latest issues for this subscription:</p>
     <table>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
index 790aa48877..b0d0db72cf 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
@@ -89,7 +89,10 @@
             <p>The subscription expired on [% subscription_LOO.histenddate %]</p>
         [% END %]
 		</p>
-    <h4>[% subscription_LOO.branchname %] [% subscription_LOO.notes %]</h4>
+    <h4>[% subscription_LOO.branchname %]</h4>
+    [% IF ( subscription_LOO.notes ) %]
+        <p>[% subscription_LOO.notes FILTER html_line_break %]</p>
+    [% END %]
   [% IF ( subscription_LOO.recievedlist ) %]
     <h5>Available issues</h5>
     <p>
@@ -105,7 +108,7 @@
     [% IF ( subscription_LOO.opacnote ) %]
         <h5>Issues summary</h5>
         <p>
-            [% subscription_LOO.opacnote %]
+            [% subscription_LOO.opacnote FILTER html_line_break %]
         </p>
     [% END %]
     [% IF ( subscription_LOO.letter ) %]
-- 
2.39.5