From 88ca9f57cb6999ca7d7ecfb087b3a23409fb0179 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 16 Nov 2023 13:14:39 +0000
Subject: [PATCH] Bug 35347: Display 'More information' button regardless of
 JSConsents

This patch moves the "More informatin" button outside of the JSConsents
block so that you are able to access the information modal regardless of
whether you have tracking cookies added to your configuration or not.

Test plan
1) Enable CookieConsent
2) Note that the 'More information' button now appears in the footer on
   both staff and opac until you have accepted cookies.

Signed-off-by: David Nind <david@davidnind.com>
---
 .../intranet-tmpl/prog/en/includes/intranet-bottom.inc      | 6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index f46b55d01e..47a0cdc77b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -96,8 +96,8 @@
                 <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
                 [% IF ( JSConsents.all('staffConsent').size ) %]
                     <button type="button" class="btn btn-primary consentAcceptEssential">Accept only essential cookies</button>
-                    <button type="button" class="btn btn-info" id="consentMoreInfo">More information</button>
                 [% END %]
+                <button type="button" class="btn btn-info" id="consentMoreInfo">More information</button>
             </div>
         </div> <!-- /#cookieConsentBar -->
         <!-- Cookie consent modal -->
@@ -132,9 +132,9 @@
                     </div>
                     <div class="modal-footer">
                         <div id="consentButtons">
-                            <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
+                            <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
                             [% IF ( JSConsents.all('staffConsent').size ) %]
-                                <button type="button" class="btn btn-primary consentAcceptEssential">Accept only essential cookies</button>
+                                <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
                                 <button type="button" class="btn btn-success" id="consentAcceptSelected">Accept selected non-essential cookies</button>
                             [% END %]
                             <a type="button" href="#" class="btn btn-secondary consentCloseModal">Cancel</a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index 58e58947a6..91258f364b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -464,8 +464,8 @@
                     <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
                     [% IF ( JSConsents.all('opacConsent').size ) %]
                         <button type="button" class="btn btn-primary consentAcceptEssential">Accept only essential cookies</button>
-                        <button type="button" class="btn btn-info" id="consentMoreInfo" aria-label="Click to view more information about your cookie consents">More information</button>
                     [% END %]
+                    <button type="button" class="btn btn-info" id="consentMoreInfo" aria-label="Click to view more information about your cookie consents">More information</button>
                 </div>
             </div> <!-- /#cookieConsentBar -->
         <!-- Cookie consent modal -->
-- 
2.30.2