Bugzilla – Attachment 154273 Details for
Bug 27378
Enable compliance with EU Cookie Legislation via cookie consent
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27378: (QA follow-up) Add cancel button to cookie modal
Bug-27378-QA-follow-up-Add-cancel-button-to-cookie.patch (text/plain), 3.74 KB, created by
Katrin Fischer
on 2023-08-04 13:09:16 UTC
(
hide
)
Description:
Bug 27378: (QA follow-up) Add cancel button to cookie modal
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-08-04 13:09:16 UTC
Size:
3.74 KB
patch
obsolete
>From 1dec1a63763ee77d6d3f8523fba0296f25fedb4c Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Tue, 11 Jul 2023 16:41:50 +0000 >Subject: [PATCH] Bug 27378: (QA follow-up) Add cancel button to cookie modal > >This patch adds a cancel button to the modal for reviewing cookie consents. Previously there was no way to exit without selecting one of the cookie options > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > .../intranet-tmpl/prog/en/includes/intranet-bottom.inc | 1 + > koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js | 7 +++++++ > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 1 + > koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js | 7 +++++++ > 4 files changed, 16 insertions(+) > >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 f9e1a27bc0..7627476516 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >@@ -137,6 +137,7 @@ > <button type="button" class="btn btn-primary consentAcceptEssential">Accept only essential cookies</button> > <button type="button" class="btn btn-success" id="consentAcceptSelected">Accept selected non-essential cookies</button> > [% END %] >+ <button type="button" class="btn btn-secondary consentCloseModal">Cancel</button> > </div> > </div> > </div> <!-- /.modal-content --> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js b/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js >index 9c1ffab0ee..1b6ca51530 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js >@@ -159,6 +159,13 @@ > runConsentedCode(); > }); > >+ // "Cancel" handler >+ $('.consentCloseModal').on('click', function(e) { >+ e.preventDefault(); >+ hideContainer(); >+ showConsentBar(); >+ }); >+ > // "More information" handler > $('#consentMoreInfo, #viewCookieConsents').on( > 'click', >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 0622ca323e..8098b87078 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -503,6 +503,7 @@ > <button type="button" class="btn btn-primary consentAcceptEssential">Accept only essential cookies</button> > <button type="button" class="btn btn-warning" id="consentAcceptSelected">Accept selected non-essential cookies</button> > [% END %] >+ <button type="button" class="btn btn-secondary consentCloseModal">Cancel</button> > </div> > </div> > </div> <!-- /.modal-content --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js b/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js >index 72bc87d624..088d3ba2aa 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js >+++ b/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js >@@ -175,6 +175,13 @@ > showYourCookies(); > }); > >+ // "Cancel" handler >+ $('.consentCloseModal').on('click', function(e) { >+ e.preventDefault(); >+ hideContainer(); >+ showConsentBar(); >+ }); >+ > // "More information" handler > $('#consentMoreInfo, #cookieConsentButton, #viewCookieConsents').on( > 'click', >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 27378
:
115544
|
115545
|
115546
|
115547
|
115548
|
115756
|
116397
|
116398
|
116399
|
116400
|
116401
|
116402
|
116403
|
116416
|
116417
|
116418
|
116419
|
116420
|
116421
|
116422
|
116423
|
116978
|
116979
|
116980
|
116981
|
116982
|
116983
|
116984
|
116985
|
116986
|
121728
|
121729
|
121730
|
121731
|
121732
|
121733
|
121734
|
121735
|
121995
|
121996
|
121997
|
121998
|
121999
|
122000
|
122001
|
122002
|
122635
|
122636
|
122637
|
122638
|
122639
|
122640
|
122641
|
122642
|
124957
|
124958
|
124959
|
124960
|
124961
|
124962
|
124963
|
124964
|
124965
|
130072
|
130073
|
130074
|
130075
|
130076
|
130077
|
130078
|
130079
|
130080
|
135309
|
135310
|
135311
|
135312
|
135313
|
135314
|
135315
|
135316
|
135317
|
135318
|
151735
|
151736
|
151737
|
151738
|
151739
|
151740
|
151741
|
151742
|
151743
|
151744
|
151745
|
151746
|
151747
|
151748
|
151749
|
151750
|
151751
|
151752
|
151753
|
151826
|
151827
|
151828
|
151829
|
151830
|
151831
|
151832
|
151833
|
151834
|
151835
|
151836
|
151837
|
151838
|
151839
|
151840
|
151841
|
151842
|
151843
|
151844
|
153326
|
153327
|
153328
|
153329
|
153330
|
153331
|
153332
|
153333
|
153334
|
153335
|
153336
|
154015
|
154016
|
154017
|
154018
|
154019
|
154020
|
154021
|
154022
|
154023
|
154024
|
154025
|
154093
|
154264
|
154265
|
154266
|
154267
|
154268
|
154269
|
154270
|
154271
|
154272
| 154273 |
154274
|
154275
|
154276