From bebd7bcebbcd8a5068734272243b61f505faefc3 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 to prompt the cookies info dialogue into the opac
footer when the CookieConsent feature is enabled.
---
 .../opac-tmpl/bootstrap/css/src/opac.scss     | 18 +++++
 .../bootstrap/en/includes/masthead.inc        |  2 +-
 .../bootstrap/en/includes/opac-bottom.inc     | 75 +++++++++++--------
 .../opac-tmpl/bootstrap/js/cookieconsent.js   |  2 +-
 4 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index 33aaf5054bd..233a1c13ac2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -428,6 +428,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/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index 4f12b883076..0118401ad48 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -465,7 +465,7 @@
                         <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>
+                    <button type="button" class="btn btn-info consentMoreInfo" aria-label="Click to view more information about your cookie consents">More information</button>
                 </div>
             </div> <!-- /#cookieConsentBar -->
         <!-- Cookie consent modal -->
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 943c862eaba..4d9a2482f0c 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="cookie_consent" class="nav-item noprint consentMoreInfo">
+                                        <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 088d3ba2aa3..e1e64b390bd 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, #cookieConsentButton, #viewCookieConsents').on(
             'click',
             function (e) {
                 e.preventDefault();
-- 
2.41.0