From 465d806bc348fcd4002b1cf153cb8f1157754abb Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 16 Nov 2023 13:20:58 +0000
Subject: [PATCH] Bug 35346: Update template logic to display 'Essential'

This patch updates the cookie consent template logic to always display
the 'Accept essential cookies' button and only expose the 'Accept all
cookies' button when there are additional cookies to accept, i.e. when
JSConsents is populated.

Test plan
1) Enable CookieConsent
2) Note you see 'Accept essential cookies' in both OPAC and Staff client
   until you have accepted them
3) Add a cookie to ConsentJS
4) Note that you will now see 'Accept all cookies' as well as the 'Accept
   essential cookies' button.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc       | 4 ++--
 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 d266680ee2..0ddfa53c96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -93,10 +93,10 @@
                 </div>
             [% END %]
             <div id="consentButtons">
-                <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-primary consentAcceptAll">Accept all cookies</button>
                 [% END %]
+                <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
                 <button type="button" class="btn btn-info" id="consentMoreInfo">More information</button>
             </div>
         </div> <!-- /#cookieConsentBar -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index f87ec3696e..96e0294121 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -465,10 +465,10 @@
                     [% PROCESS koha_news_block news => CookieConsentBar %]
                 [% END %]
                 <div id="consentButtons">
-                    <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-primary consentAcceptAll">Accept all cookies</button>
                     [% END %]
+                    <button type="button" class="btn btn-primary consentAcceptEssential">Accept 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>
                 </div>
             </div> <!-- /#cookieConsentBar -->
-- 
2.43.0