From bbf8facf93bd71b8828edc5cbf10ee969a3d0239 Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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. --- 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 47a0cdc77b9..1573e48f046 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 @@ [% END %]
- [% IF ( JSConsents.all('staffConsent').size ) %] - + [% END %] +
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 50dba8dc2b4..4f12b883076 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -461,10 +461,10 @@ [% PROCESS koha_news_block news => CookieConsentBar %] [% END %]
- [% IF ( JSConsents.all('opacConsent').size ) %] - + [% END %] +
-- 2.41.0