From d937632840e08bf2b712b52acae5ca19a1e122e9 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 --- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 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 b1b6ef6..87e5752 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -64,7 +64,6 @@ [% IF ( koha_news ) %] - [% IF single_news_error %]
@@ -86,7 +85,7 @@ [% END %] - [% UNLESS news_item %] + [% UNLESS news_item %]
@@ -105,31 +104,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 %] ~ [% daily_quote.source %]
- [% END %] +
[% END %] - [% IF ( display_daily_quote && daily_quote ) %] -
-

Quote of the day

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