Bugzilla – Attachment 154271 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) Small fixes and tidy-ups
Bug-27378-QA-follow-up-Small-fixes-and-tidy-ups.patch (text/plain), 5.70 KB, created by
Katrin Fischer
on 2023-08-04 13:09:09 UTC
(
hide
)
Description:
Bug 27378: (QA follow-up) Small fixes and tidy-ups
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-08-04 13:09:09 UTC
Size:
5.70 KB
patch
obsolete
>From 12df912e5050961857df4350a790332e4a1a2ccb Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Tue, 11 Jul 2023 16:33:38 +0000 >Subject: [PATCH] Bug 27378: (QA follow-up) Small fixes and tidy-ups > >This patch does the following: >- Realphabetizes the lines in sysprefs.sql >- Fixes a formatting error in patrons.pref >- Adjusts the position of the cookie consent bar if the language selector is visible >- Fixes translatability on the syspref modal > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > installer/data/mysql/mandatory/sysprefs.sql | 2 +- > .../prog/en/modules/admin/preferences/patrons.pref | 8 ++++---- > koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js | 5 +++++ > koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js | 6 +++--- > koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js | 5 +++++ > 5 files changed, 18 insertions(+), 8 deletions(-) > >diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql >index 72cdcdcfc1..c9a1609f40 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -156,10 +156,10 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('ComponentSortField','title','call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'), > ('ComponentSortOrder','asc','asc|dsc|az|za','Specify the default sort order','Choice'), > ('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'), >-('CookieConsentedJS', '', NULL, 'Add Javascript code that will run if cookie consent is provided (e.g. tracking code).', 'Free'), > ('ConsiderOnSiteCheckoutsAsNormalCheckouts','1',NULL,'Consider on-site checkouts as normal checkouts','YesNo'), > ('ContentWarningField', '', NULL, 'MARC field to use for content warnings', 'Free'), > ('CookieConsent', '0', NULL, 'Require cookie consent to be displayed', 'YesNo'), >+('CookieConsentedJS', '', NULL, 'Add Javascript code that will run if cookie consent is provided (e.g. tracking code).', 'Free'), > ('CreateAVFromCataloguing', '1', '', 'Ability to create authorized values from the cataloguing module', 'YesNo'), > ('CronjobLog','0',NULL,'If ON, log information from cron jobs.','YesNo'), > ('CumulativeRestrictionPeriods',0,NULL,'Cumulate the restriction periods instead of keeping the highest','YesNo'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >index 8692e5e9e8..0adb1ae1d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >@@ -391,11 +391,11 @@ Patrons: > - > - pref: CookieConsent > choices: >- yes: Require >- no: "Don't require" >- - cookie consent to be displayed >+ 1: Require >+ 0: "Don't require" >+ - cookie consent to be displayed in the OPAC and staff interface. > - >- - Add Javascript code that will run if cookie consent is provided (e.g. tracking code). >+ - Run the following JavaScript if cookie consent is provided (e.g. tracking code). > - pref: CookieConsentedJS > type: modaljs > initiator: populateCookieConsentedJS >diff --git a/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js b/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js >index b74dba1066..3ed76ae272 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js >@@ -34,6 +34,11 @@ > > function showConsentBar() { > const consentBar = $('#cookieConsentBar'); >+ const langmenu = $('#changelanguage'); >+ if(langmenu) { >+ const height = langmenu.height(); >+ consentBar.css('bottom', height); >+ }; > consentBar.attr('aria-hidden', 'false'); > consentBar.show(); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js >index fc72beff92..da5ffcc466 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js >@@ -394,7 +394,7 @@ $( document ).ready( function () { > ' <a id="collapse_' + id + '" class="collapse-textarea" data-target="' + id + '" data-syntax="javascript" href="#" style="display:none">' + __('Click to collapse') + '</a>' + > ' </div >' + > ' </div>' + >- ' <a class="consentDelete" data-target="' + id + '" href="#">Delete</a>' + >+ ' <a class="consentDelete" data-target="' + id + '" href="#">' + __('Delete') + '</a>' + > '</div > '; > } > >@@ -419,8 +419,8 @@ $( document ).ready( function () { > cookieDomain: '', > cookiePath: '', > code: '', >- consentInOpac: false, >- consentInStaff: false >+ opacConsent: false, >+ staffConsent: false > }; > } > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js b/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js >index ec4372216c..72bc87d624 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js >+++ b/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js >@@ -36,6 +36,11 @@ > > function showConsentBar() { > const consentBar = $('#cookieConsentBar'); >+ const langmenu = $('#changelanguage'); >+ if(langmenu) { >+ const height = langmenu.height(); >+ consentBar.css('bottom', height); >+ }; > consentBar.attr('aria-hidden', 'false'); > consentBar.show(); > } >-- >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