From e5a78261b58800930354858a28163467de052bbb Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Mon, 30 Aug 2021 20:59:27 -1000
Subject: [PATCH] Bug 28927: Fix id opacmainuserblock used twice in OPAC

Since preference OpacMainUserBlock is now an HTML customization,
there is actually an HTML tags with id="opacmainuserblock" and one with id="OpacMainUserBlock".
Same for OPACNavRight in opac-registration-confirmation.tt

This patch removed id from page to keep the one comming from HTML customization include.

Test plan :
1) Create an HTML customization for OpacMainUserBlock with some text
2) Go to OPAC main page
3) Check HTML code of the page
4) Check you see id="OpacMainUserBlock" once and not id="opacmainuserblock"
5) Same for id="opacnavright" in opac-registration-confirmation.tt

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt         | 4 +---
 .../bootstrap/en/modules/opac-registration-confirmation.tt    | 4 +---
 2 files changed, 2 insertions(+), 6 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 d46100fcbe..5e0c99f229 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -167,9 +167,7 @@
             [% END %]
 
             [% IF ( OpacMainUserBlock ) %]
-                <div id="opacmainuserblock">
-                    [% PROCESS koha_news_block news => OpacMainUserBlock %]
-                </div>
+                [% PROCESS koha_news_block news => OpacMainUserBlock %]
             [% END %]
         [% END %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
index b688de43d1..d2ab28b68f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
@@ -106,9 +106,7 @@
                         [% END # /casAuthentication %]
                     [% END # / loggedinusername %]
                     [% IF ( OpacNavRight ) %]
-                        <div id="opacnavright">
-                            [% PROCESS koha_news_block news => OpacNavRight %]
-                        </div>
+                        [% PROCESS koha_news_block news => OpacNavRight %]
                     [% END # /OpacNavRight %]
                 </div> <!-- / .col-lg-3 -->
 
-- 
2.39.5