From ff9e79a703eb55a09c3bc9cb2f95bae8491485fe Mon Sep 17 00:00:00 2001 From: Katrin Fischer 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 --- .../prog/en/modules/catalogue/detail.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 4 ++-- .../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 ce52040..df0ffe2 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 ) %]

At library: [% subscription.branchname %]

[% ELSE %] [% IF ( subscription.branchcode ) %]

At library: [% subscription.branchcode %]

[% END %][% END %] - [% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes %]

[% END %] + [% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes FILTER html_line_break %]

[% END %] [% IF ( subscription.latestserials ) %]

The [% subscription.staffdisplaycount %] latest issues related to this subscription:

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 776f82f..1d00422 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -956,10 +956,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% FOREACH subscription IN subscriptions %] [% IF ( subscription.branchname ) %]

At library: [% subscription.branchname %]

[% ELSE %] [% IF ( subscription.branchcode ) %]

At library: [% subscription.branchcode %]

[% END %][% END %] - [% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes %]

[% END %] + [% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes FILTER html_line_break %]

[% END %]

Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]

[% IF ( subscription.missinglist ) %]

Missing issues: [% subscription.missinglist %]

[% END %] - [% IF ( subscription.opacnote ) %]

([% subscription.opacnote %])

[% END %] + [% IF ( subscription.opacnote ) %]

[% subscription.opacnote FILTER html_line_break %]

[% END %] [% IF ( subscription.latestserials ) %]

The [% subscription.opacdisplaycount %] latest issues for this subscription:

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 790aa48..b0d0db7 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 @@

The subscription expired on [% subscription_LOO.histenddate %]

[% END %]

-

[% subscription_LOO.branchname %] [% subscription_LOO.notes %]

+

[% subscription_LOO.branchname %]

+ [% IF ( subscription_LOO.notes ) %] +

[% subscription_LOO.notes FILTER html_line_break %]

+ [% END %] [% IF ( subscription_LOO.recievedlist ) %]
Available issues

@@ -105,7 +108,7 @@ [% IF ( subscription_LOO.opacnote ) %]

Issues summary

- [% subscription_LOO.opacnote %] + [% subscription_LOO.opacnote FILTER html_line_break %]

[% END %] [% IF ( subscription_LOO.letter ) %] -- 1.7.9.5