From f00879c0f65e916cab60579a571d40a449693859 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 16 Nov 2023 17:24:27 +0000
Subject: [PATCH] Bug 35348: Add cookies link to opac footer

This patch adds a link that opens the cookies info dialogue to the opac
footer when the CookieConsent feature is enabled.

Test plan
1) Enable CookieConsent
2) On the OPAC you should now see a 'Cookies' link at the bottom of the
   page.
3) Clicking the link should open the "Cookie consent" modal where you
   can see the details of the cookies you have accepted and change your
   choices.
4) Bonus points: Enable 'OpacProblemReports' and note it aligns left of
   'Cookies' in the same footer bar.

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>
---
 .../opac-tmpl/bootstrap/css/src/opac.scss     | 18 +++++
 .../bootstrap/en/includes/opac-bottom.inc     | 75 +++++++++++--------
 .../opac-tmpl/bootstrap/js/cookieconsent.js   |  2 +-
 3 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index 7d0cc68aff..023d3bbb34 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -431,6 +431,24 @@ th {
     }
 }
 
+#footernav {
+    li {
+        display: inline-block;
+        padding-right: 5px;
+        white-space: nowrap;
+
+        &::after {
+            content: " | ";
+        }
+
+        &:last-child {
+            &::after {
+                content: "";
+            }
+        }
+    }
+}
+
 #news {
     margin: .5em 0;
     padding: 1em;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index ee4ea72757..937cad9a61 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -20,40 +20,51 @@
                 </div>
             </div>
         [% END #/ opaccredits %]
-
-        [% IF ( Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') ) || OpacKohaUrl %]
-            <div class="container-fluid">
-                <div class="row">
-                    <div class="col">
-                        <div id="report-koha-url">
-                            <div class="row justify-content-between">
-                                [% IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
-                                    <div class="col">
-                                        <div id="report_a_problem" class="noprint">
-                                            <a class="koha-url" href="/cgi-bin/koha/opac-reportproblem.pl">Report a problem</a>
-                                        </div>
-                                    </div>
-                                [% END # / IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
-                                [% IF OpacKohaUrl %]
-                                    <div class="col">
-                                        <div id="koha_url" class="clearfix noprint">
-                                            <p>Powered by
-                                            [% IF template.name.match('opac-main.tt') %]
-                                                <a class="koha_url" href="http://koha-community.org">Koha</a>
-                                            [% ELSE %]
-                                                <a class="koha_url" rel="nofollow" href="http://koha-community.org">Koha</a>
-                                            [% END %]</p>
-                                        </div> <!-- /#koha_url -->
-                                    </div> <!-- /.col -->
-                                [% END # /IF OpacKohaUrl %]
-                            </div> <!-- /.row.justify-content-between -->
-                        </div> <!-- /#report-koha-url -->
-                    </div> <!-- /.col -->
-                </div> <!-- /.row -->
-            </div> <!-- /.container-fluid -->
-        [% END # / OPACReportProblem || OpacKohaUrl %]
     </div> <!-- / #wrapper in masthead.inc -->
 
+    [% IF ( Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') ) || Koha.Preference( 'CookieConsent' ) || OpacKohaUrl %]
+        <footer>
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col">
+                    <div id="report-koha-url">
+                        <div class="row justify-content-between">
+                            [% IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') || Koha.Preference( 'CookieConsent' ) %]
+                                <div class="col">
+                                    <ul class="nav" id="footernav">
+                                    [% IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
+                                    <li id="report_a_problem" class="nav-item noprint">
+                                        <a href="/cgi-bin/koha/opac-reportproblem.pl">Report a problem</a>
+                                    </li>
+                                    [% END %]
+                                    [% IF Koha.Preference( 'CookieConsent' ) %]
+                                    <li id="cookieConsentFooter" class="nav-item noprint">
+                                        <a href="#">Cookies</a>
+                                    </li>
+                                    [% END %]
+                                    </ul>
+                                </div>
+                            [% END # / IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
+                            [% IF OpacKohaUrl %]
+                                <div class="col">
+                                    <div id="koha_url" class="clearfix noprint">
+                                        <p>Powered by
+                                        [% IF template.name.match('opac-main.tt') %]
+                                            <a class="koha_url" href="http://koha-community.org">Koha</a>
+                                        [% ELSE %]
+                                            <a class="koha_url" rel="nofollow" href="http://koha-community.org">Koha</a>
+                                        [% END %]</p>
+                                    </div> <!-- /#koha_url -->
+                                </div> <!-- /.col -->
+                            [% END # /IF OpacKohaUrl %]
+                        </div> <!-- /.row.justify-content-between -->
+                    </div> <!-- /#report-koha-url -->
+                </div> <!-- /.col -->
+            </div> <!-- /.row -->
+        </div> <!-- /.container-fluid -->
+        </footer>
+    [% END # / OPACReportProblem || OpacKohaUrl %]
+
     [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
         [% IF ( Koha.Preference('opaclanguagesdisplay') ) %]
             [% IF ( languages_loop ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js b/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js
index 088d3ba2aa..dab24fe1f0 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, #cookieConsentButton, #viewCookieConsents').on(
+        $('#consentMoreInfo, #cookieConsentFooter, #cookieConsentButton, #viewCookieConsents').on(
             'click',
             function (e) {
                 e.preventDefault();
-- 
2.39.5