From ef706f9c9770e0922e79575948fc4e5b0aa2821d Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 4 Jul 2018 01:08:17 +0000 Subject: [PATCH] Bug 14272: (follow-up) Fixing template error and layout To test, confirm that OpacMainUserBlock and Quote of the Day do not show if viewing a single news item, but do show otherwise. Confirm user dashboard shows where expected Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer UPDATE 24/Aug: Add expiration date text Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../bootstrap/en/modules/opac-main.tt | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) 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 f3378eb70a..8df87091d7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -65,7 +65,6 @@ [% IF ( koha_news ) %] - [% IF single_news_error %]
@@ -80,14 +79,14 @@

[% 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 %])
+
(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 %])
[% END %]
[% END %] - [% UNLESS news_item %] + [% UNLESS news_item %]
@@ -106,31 +105,31 @@ [% END %] [% END %]
- [% ELSE %] - [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] -
-
-
No news to display.
-
-
+ + [% IF ( display_daily_quote && daily_quote ) %] +
+

Quote of the day

+
+ [% daily_quote.text | html %] ~ [% daily_quote.source | html %]
- [% END %] +
[% END %] - [% IF ( display_daily_quote && daily_quote ) %] -
-

Quote of the day

-
- [% daily_quote.text | html %] ~ [% daily_quote.source | html %] + [% IF ( OpacMainUserBlock ) %]
[% OpacMainUserBlock | $raw %]
[% END %] + + [% END %] + [% ELSE %] + [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] +
+
+
No news to display.
+
+
-
+ [% END %] [% END %] - - [% IF ( OpacMainUserBlock ) %]
[% OpacMainUserBlock | $raw %]
[% END %]
- [% END %] - [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %] -- 2.20.1