From 971bcfd9b58dcf25ccfca4529f5bdd534182cf33 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 6 Nov 2023 19:40:06 +0000
Subject: [PATCH] Bug 35262: Improve OPAC self registration confirmation page

This patch corrects logic in the OPAC self registration confirmation
template so that the right column markup is shown when various
combinations of OpacNav, OpacNavBottom, and OpacNavRight are displayed.

To test, apply the patch and enable the PatronSelfRegistration system
preference, and deactivate the PatronSelfRegistrationVerifyByEmail
preference.

- Go to the OPAC and start the process of registering online.
- Fill in the form and submit it.
- On the registration confirmation page, check that the layout looks
  correct.
- Test with the presence of various combinations of OpacNav,
  OpacNavBottom, and OpacNavRight HTML customizations.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 64edb692458262133818553c4cbfa86ca3612260)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 4e34b92112df0e97d7a4fcc72c5bd95ca7c202dd)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
---
 .../en/modules/opac-registration-confirmation.tt          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 3c7baae16a..88c246fe73 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
@@ -34,15 +34,19 @@
                 </div>
             [% END %]
 
-            [% IF ( OpacNav || OpacNavBottom  ) %]
+            [% IF ( OpacNav ||  OpacNavBottom && OpacNavRight ) %]
                 [% #  Three-column layout with right and left sidebars %]
                 <div class="col-12 col-lg-7 order-md-1 maincontent">
             [% ELSIF ( OpacNavRight ) %]
                 [% #  Two-column layout with right sidebar %]
                 <div class="col-12 col-lg-9 order-md-1 maincontent">
+            [% ELSIF ( OpacNav ||  OpacNavBottom  ) %]
+                <div class="col-12 col-lg-10 order-md-1 maincontent">
+            [% ELSE %]
+                <div class="col order-md-1 maincontent">
             [% END %]
 
-                    <div id="registration-complete" class="maincontent">
+                    <div id="registration-complete">
                         <h1>Registration complete!</h1>
 
                         <p>You have successfully registered your new account.</p>
-- 
2.39.5