From 8afb6f45b614979c3190a83dbb60cb57e9bc9c36 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 28 Aug 2018 22:32:28 +0000 Subject: [PATCH] Bug 14272: (follow-up) Fixing layout issues and expiration date hint Misunderstood the first time. I've added the hint to the news form on staff side. I've fixed the layout on OPAC. The RSS feed shows on the main page, but is hidden if there is no news and if viewing one news item. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/en/modules/tools/koha-news.tt | 5 +++- .../bootstrap/en/modules/opac-main.tt | 26 ++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) 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 be90763a1d..02875226f3 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 @@ -98,7 +98,10 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]
  • -
    [% INCLUDE 'date-format.inc' %]
    +
    + [% INCLUDE 'date-format.inc' %] +
    News will still be accessible by direct URL if expired. +
  • 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 8df87091d7..17f5b6f6d8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -79,7 +79,7 @@

    [% koha_new.title | html %]

    [% koha_new.content | $raw %]
    -
    (published on [% koha_new.timestamp | $KohaDates with_hours = 1 | html %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by [% koha_new.author_title | html %] [% koha_new.author_firstname | html %] [% koha_new.author_surname | html %][% END %][% IF ( koha_new.expirationdate ) %], expiry on [% koha_new.expirationdate %][% END %])
    +
    (published on [% koha_new.timestamp | $KohaDates with_hours = 1 | html %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by [% koha_new.author_title | html %] [% koha_new.author_firstname | html %] [% koha_new.author_surname | html %][% END %])
    [% END %] @@ -106,6 +106,18 @@ [% END %] + [% END %] + + [% ELSE %] + [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] +
    +
    +
    No news to display.
    +
    +
    +
    + [% END %] + [% IF ( display_daily_quote && daily_quote ) %]

    Quote of the day

    @@ -117,17 +129,7 @@ [% IF ( OpacMainUserBlock ) %]
    [% OpacMainUserBlock | $raw %]
    [% END %] - [% END %] - [% ELSE %] - [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] -
    -
    -
    No news to display.
    -
    -
    -
    - [% END %] - [% END %] + [% END %]
    [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %] -- 2.20.1