From 454ccc3aa56d2201bbf1091c85c71617e1d4ec69 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 1 Sep 2015 08:55:10 +0100 Subject: [PATCH] Bug 13618: Fix for news MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 74875ec..59a28d6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -174,7 +174,7 @@ [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %] [% FOREACH koha_new IN koha_news %]

[% koha_new.title %]

-

[% koha_new.new %]

+

[% koha_new.new.raw %]

Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by [% koha_new.author_title %] [% koha_new.author_firstname %] [% koha_new.author_surname %]
[% END %] [% IF ( CAN_user_tools ) %] Edit diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt index f57053a..81ae05b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -61,7 +61,7 @@ Date due: [% issueloo.date_due %]

[% FOREACH koha_new IN koha_news %]
[% koha_new.title %]
-

[% koha_new.new %]

+

[% koha_new.new.raw %]

Posted on [% koha_new.newdate %]


diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index 38a3598..21bec07 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -145,7 +145,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]
[% END %]
  • - +
  • @@ -247,7 +247,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %] [% opac_new.title %] [% opac_new.author_title %] [% opac_new.author_firstname %] [% opac_new.author_surname %] - [% opac_new.new %] + [% opac_new.new.raw %] Edit diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index 6280639..10c27bb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -44,7 +44,7 @@ [% FOREACH koha_new IN koha_news %]

    [% koha_new.title %]

    -
    [% koha_new.new %]
    +
    [% koha_new.new.raw %]
    (published on [% koha_new.newdate %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by [% koha_new.author_title %] [% koha_new.author_firstname %] [% koha_new.author_surname %][% END %])
    [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt index 6bdb1e4..806fd04 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt @@ -8,7 +8,7 @@ [% FOREACH newsitem IN koha_news %] [% newsitem.title %] - [% newsitem.new %] + [% newsitem.new.raw %] [% OPACBaseURL %]/cgi-bin/koha/opac-main.pl#newsitem[% newsitem.idnew %] [% END %] -- 2.1.0