From a0f2d96cf4da9f68d094aae50636ba7ae6e81e61 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 4 Sep 2019 17:42:02 +0000
Subject: [PATCH] Bug 22880: (follow-up) Define OpacHeader variable for
 conditional
Content-Type: text/plain; charset=utf-8

This follow-up uses the updates introduced by Bug 23253 as a model for
improving the display of opacheader. Adding the OpacHeader variable
allows the template to check for its existence and display some
container markup around opacheader if it exists. This will help ease the
transition for libraries who depend on the #opacheader id for styling.

To test, apply the patch and test the OPAC with an 'opacheader' item
defined. The content should be displayed on the page inside '<div
id="opacheader"></div>.'

Delete the 'opacheader' news item and reload the OPAC page. There should
no longer be an #opacheader div.

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

Signed-off-by: Lisette Scheer <lisettes@latahlibrary.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index 84d884a64a..af23e481ee 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -4,7 +4,7 @@
 [% USE Categories %]
 [% USE KohaNews %]
 [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
-[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
+[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => news_lang, library => branchcode, blocktitle => 0 ) %]
 <div id="wrap">
     <div id="header-region" class="noprint">
         <div class="navbar navbar-inverse navbar-static-top">
@@ -145,7 +145,15 @@
             </div> <!-- /navbar-inner -->
         </div> <!-- /navbar -->
 
-        [% PROCESS koha_news_block news => KohaNews.get( location => "opacheader", lang => news_lang, library => branchcode, blocktitle => 0 ) %]
+        [% IF ( OpacHeader ) %]
+            <div class="container-fluid">
+                <div class="row-fluid">
+                    <div id="opacheader">
+                        [% PROCESS koha_news_block news => OpacHeader %]
+                    </div>
+                </div>
+            </div>
+        [% END %]
 
     </div> <!-- / header-region -->
 
-- 
2.11.0