Bugzilla – Attachment 10319 Details for
Bug 7905
Multi-line notes are displayed on one line in Staff Serials page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7905: Follow up - Multi-line subscription notes
Bug-7905-Follow-up---Multi-line-subscription-notes.patch (text/plain), 4.14 KB, created by
Katrin Fischer
on 2012-06-16 12:20:43 UTC
(
hide
)
Description:
Bug 7905: Follow up - Multi-line subscription notes
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2012-06-16 12:20:43 UTC
Size:
4.14 KB
patch
obsolete
>From ff9e79a703eb55a09c3bc9cb2f95bae8491485fe 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 >--- > .../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 ) %]<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 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 ) %]<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 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 @@ > <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 ) %] >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7905
:
8924
|
10317
| 10319