From d937632840e08bf2b712b52acae5ca19a1e122e9 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
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 <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../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 %]
 
                 <div class="alert alert-error">
@@ -86,7 +85,7 @@
 
             [% END %]
 
-            [% UNLESS news_item %] <!-- If single news item -->
+            [% UNLESS news_item %] <!-- unless single news item -->
 
             <div id="rssnews-container">
                 <!-- Logged in users have a branch code or it could be explicitly set -->
@@ -105,31 +104,31 @@
                     [% END %]
                 [% END %]
             </div>
-            [% ELSE %]
-                [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
-                    <div id="news" class="newscontainer">
-                        <div class="newsitem">
-                            <div class="newsbody">No news to display.</div>
-                            <div class="newsfooter"></div>
-                        </div>
+
+            [% IF ( display_daily_quote && daily_quote ) %]
+                <div id="daily-quote">
+                    <h3>Quote of the day</h3>
+                    <div>
+                        <span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>
                     </div>
-                [% END %]
+                </div>
             [% END %]
 
-        [% IF ( display_daily_quote && daily_quote ) %]
-            <div id="daily-quote">
-                <h3>Quote of the day</h3>
-                <div>
-                    <span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>
+            [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock %]</div>[% END %]
+
+            [% END %] <!-- single news item -->
+        [% ELSE %] <!-- koha news -->
+            [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
+                <div id="news" class="newscontainer">
+                    <div class="newsitem">
+                        <div class="newsbody">No news to display.</div>
+                        <div class="newsfooter"></div>
+                    </div>
                 </div>
-            </div>
+            [% END %]
         [% END %]
-
-        [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock %]</div>[% END %]
         </div> <!-- / .span 7/9 -->
 
-        [% END %] <!-- If single news item -->
-
         [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
             <div class="span3">
                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-- 
2.1.4