From ffbb1dd51900c88f71494b59b29695c096f1eeab Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Tue, 19 Jan 2021 08:42:02 +0000 Subject: [PATCH] Bug 22544: Use template plugin for news author display Content-Type: text/plain; charset=utf-8 Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy --- koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 4 ++-- 3 files changed, 4 insertions(+), 4 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 0af0cdf619..01ac044783 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -31,7 +31,7 @@ [% FOREACH koha_new IN koha_news %]

[% koha_new.title | html %]

[% koha_new.content | $raw %]
-

Posted on [% koha_new.published_on | $KohaDates %][% IF( show_author && koha_new.borrowernumber ) %] by [% koha_new.author.title | html %] [% koha_new.author.firstname | html %] [% koha_new.author.surname | html %]
[% END %] +

Posted on [% koha_new.published_on | $KohaDates %][% IF( show_author && koha_new.author ) %] by [% INCLUDE 'patron-title.inc' patron=koha_new.author %]
[% END %] [% IF ( CAN_user_tools ) %] Edit | Delete 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 26f1ef1893..ca7fa54df6 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 @@ -181,7 +181,7 @@ [% opac_new.published_on | $KohaDates %] [% opac_new.expirationdate | $KohaDates %] [% IF ( opac_new.is_expired ) %](expired)[% END %] [% opac_new.title | html %] - [% IF ( opac_new.author) %][% INCLUDE 'patron-title.inc' patron=opac_new.author hide_patron_infos_if_needed=1 %][% END %] + [% IF ( opac_new.author) %][% INCLUDE 'patron-title.inc' patron=opac_new.author %][% END %]

Preview content 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 67c8a3ff75..20fc7123f6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -109,8 +109,8 @@
[% koha_new.content | $raw %]
Published on [% koha_new.published_on | $KohaDates %] - [% IF ( show_author && koha_new.borrowernumber ) %] - by [% koha_new.author.title | html %] [% koha_new.author.firstname | html %] [% koha_new.author.surname | html %] + [% IF ( show_author && koha_new.author ) %] + by [% INCLUDE 'patron-title.inc' patron=koha_new.author %] [% END %] [% IF ( news_item ) %] • Show all news -- 2.20.1