Attachment 159091 Details for Bug 35348 – Bug 35348: Add cookies link to opac footer

[patch] Bug 35348: Add cookies link to opac footer

Bug-35348-Add-cookies-link-to-opac-footer.patch (text/plain), 7.62 KB, created by Martin Renvoize (ashimema) on 2023-11-17 15:40:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-11-17 15:40:58 UTC

Size: 7.62 KB

patch

obsolete

>From 3ec3f3162fdc9a2b530c0175aaae6cc252e84b45 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.
>---
> .../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 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/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
>index 943c862eaba..d273390513c 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> 
>-                                    </div> 
>-                                [% END # /IF OpacKohaUrl %]
>-                            </div> 
>-                        </div> 
>-                    </div> 
>-                </div> 
>-            </div> 
>-        [% END # / OPACReportProblem || OpacKohaUrl %]
>     </div> 
> 
>+    [% 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> 
>+                                </div> 
>+                            [% END # /IF OpacKohaUrl %]
>+                        </div> 
>+                    </div> 
>+                </div> 
>+            </div> 
>+        </div> 
>+        </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..dab24fe1f04 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.42.0

Actions: View | Diff | Splinter Review

Attachments on bug 35348: 159059 | 159078 | 159079 | 159080 | 159091 | 159092 | 159093 | 159444 | 159445 | 159446 | 165568 | 165569 | 165570 | 165632 | 165633 | 165634