From 764675e06c3c249bf75584dc06d26ae67c1054ee Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 17 Nov 2023 11:18:27 +0000
Subject: [PATCH] Bug 35348: Remove cookie consents link from opac consents

The cookies details modal is now visible for all users from a footer
link, we no longer need it under the 'Consents' tab for logged in users.

Test plan
1) Enable CookieConsent and add a placholder tracker cookie to
   CookieConsentedJS preference
2) Log into the OPAC
3) Note that the 'Consents' link no longer appears in the users page.
4) Enable 'PrivacyPolicyConsent'
5) Note that the 'Consents' link now appears but on navigating to it
   there is no link for Cookie consents.

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss             | 4 ----
 koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc      | 2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt   | 6 ------
 koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js           | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index 023d3bbb34..753d5775e3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -2955,10 +2955,6 @@ $star-selected: #EDB867;
     }
 }
 
-#viewCookieConsents {
-    margin-top: 10px;
-}
-
 #patronconsents h2 {
     margin-top: 30px;
     font-size: 1.1rem;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
index 37ec40ffe0..87268831fc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -25,7 +25,7 @@
             [% END %]
                 <a href="/cgi-bin/koha/opac-memberentry.pl">Personal details</a></li>
 
-            [% IF Koha.Preference('PrivacyPolicyConsent') || Koha.Preference('CookieConsent') || KohaPlugins.feature_enabled('patron_consent_type') %]
+            [% IF Koha.Preference('PrivacyPolicyConsent') || KohaPlugins.feature_enabled('patron_consent_type') %]
                 [% IF consentview %]<li class="active">[% ELSE %]<li>[% END %]
                     <a href="/cgi-bin/koha/opac-patron-consent.pl">Consents</a>
                 </li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
index e75217566e..7b766c37d7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
@@ -78,12 +78,6 @@
                             <input id="saveconsent" type="submit" value="Save" class="btn btn-primary" />
                         </fieldset>
                     </form>
-
-                    [% IF Koha.Preference('CookieConsent') %]
-                        <h2>Cookies policy</h2>
-                        <button id="viewCookieConsents" type="button" class="btn btn-success">View your cookie consents</button>
-                    [% END %]
-
                 </div> <!-- / #patronconsents -->
             </div> <!-- / .col-lg-10 -->
         </div> <!-- / .row -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js b/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js
index dab24fe1f0..0d44f11140 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js
+++ b/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js
@@ -183,7 +183,7 @@
         });
 
         // "More information" handler
-        $('#consentMoreInfo, #cookieConsentFooter, #cookieConsentButton, #viewCookieConsents').on(
+        $('#consentMoreInfo, #cookieConsentFooter, #cookieConsentButton').on(
             'click',
             function (e) {
                 e.preventDefault();
-- 
2.39.5