From 1d0a023b6f5cb09a9fcef46ee9bd0fac5b07b903 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Fri, 24 Sep 2021 20:38:46 -1000
Subject: [PATCH] Bug 24223: (follow-up) Do not add id 'opacnav' in
 navigation.inc

Id attribut will be defined by 'koha_news_block'.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc      | 4 +---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
index 86e1f677f1..8672c095ea 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc
@@ -1,9 +1,7 @@
 [% USE raw %]
 
 [% IF ( OpacNav ) %]
-    <div id="opacnav">
-        [% PROCESS koha_news_block news => OpacNav %]
-    </div>
+    [% PROCESS koha_news_block news => OpacNav %]
 [% END %]
 
 [% IF IsPatronPage %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
index 31279d3d8f..6db97803af 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
@@ -4,6 +4,8 @@
 [% USE KohaDates %]
 [% USE TablesSettings %]
 [% USE ItemTypes %]
+[% USE AdditionalContents %]
+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Your holds history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
 [% INCLUDE 'doc-head-close.inc' %]
-- 
2.20.1