View | Details | Raw Unified | Return to bug 27378
Collapse All | Expand All

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
Lines 156-165 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
156
('ComponentSortField','title','call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
156
('ComponentSortField','title','call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
157
('ComponentSortOrder','asc','asc|dsc|az|za','Specify the default sort order','Choice'),
157
('ComponentSortOrder','asc','asc|dsc|az|za','Specify the default sort order','Choice'),
158
('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),
158
('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),
159
('CookieConsentedJS', '', NULL, 'Add Javascript code that will run if cookie consent is provided (e.g. tracking code).', 'Free'),
160
('ConsiderOnSiteCheckoutsAsNormalCheckouts','1',NULL,'Consider on-site checkouts as normal checkouts','YesNo'),
159
('ConsiderOnSiteCheckoutsAsNormalCheckouts','1',NULL,'Consider on-site checkouts as normal checkouts','YesNo'),
161
('ContentWarningField', '', NULL, 'MARC field to use for content warnings', 'Free'),
160
('ContentWarningField', '', NULL, 'MARC field to use for content warnings', 'Free'),
162
('CookieConsent', '0', NULL, 'Require cookie consent to be displayed', 'YesNo'),
161
('CookieConsent', '0', NULL, 'Require cookie consent to be displayed', 'YesNo'),
162
('CookieConsentedJS', '', NULL, 'Add Javascript code that will run if cookie consent is provided (e.g. tracking code).', 'Free'),
163
('CreateAVFromCataloguing', '1', '', 'Ability to create authorized values from the cataloguing module', 'YesNo'),
163
('CreateAVFromCataloguing', '1', '', 'Ability to create authorized values from the cataloguing module', 'YesNo'),
164
('CronjobLog','0',NULL,'If ON, log information from cron jobs.','YesNo'),
164
('CronjobLog','0',NULL,'If ON, log information from cron jobs.','YesNo'),
165
('CumulativeRestrictionPeriods',0,NULL,'Cumulate the restriction periods instead of keeping the highest','YesNo'),
165
('CumulativeRestrictionPeriods',0,NULL,'Cumulate the restriction periods instead of keeping the highest','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-4 / +4 lines)
Lines 391-401 Patrons: Link Here
391
     -
391
     -
392
         - pref: CookieConsent
392
         - pref: CookieConsent
393
           choices:
393
           choices:
394
               yes: Require
394
               1: Require
395
               no: "Don't require"
395
               0: "Don't require"
396
         - cookie consent to be displayed
396
         - cookie consent to be displayed in the OPAC and staff interface.
397
     -
397
     -
398
         - Add Javascript code that will run if cookie consent is provided (e.g. tracking code).
398
         - Run the following JavaScript if cookie consent is provided (e.g. tracking code).
399
         - pref: CookieConsentedJS
399
         - pref: CookieConsentedJS
400
           type: modaljs
400
           type: modaljs
401
           initiator: populateCookieConsentedJS
401
           initiator: populateCookieConsentedJS
(-)a/koha-tmpl/intranet-tmpl/prog/js/cookieconsent.js (+5 lines)
Lines 34-39 Link Here
34
34
35
    function showConsentBar() {
35
    function showConsentBar() {
36
        const consentBar = $('#cookieConsentBar');
36
        const consentBar = $('#cookieConsentBar');
37
        const langmenu = $('#changelanguage');
38
        if(langmenu) {
39
            const height = langmenu.height();
40
            consentBar.css('bottom', height);
41
        };
37
        consentBar.attr('aria-hidden', 'false');
42
        consentBar.attr('aria-hidden', 'false');
38
        consentBar.show();
43
        consentBar.show();
39
    }
44
    }
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js (-3 / +3 lines)
Lines 394-400 $( document ).ready( function () { Link Here
394
               '            <a id="collapse_' + id + '" class="collapse-textarea" data-target="' + id + '" data-syntax="javascript" href="#" style="display:none">' + __('Click to collapse') + '</a>' +
394
               '            <a id="collapse_' + id + '" class="collapse-textarea" data-target="' + id + '" data-syntax="javascript" href="#" style="display:none">' + __('Click to collapse') + '</a>' +
395
               '        </div >' +
395
               '        </div >' +
396
               '    </div>' +
396
               '    </div>' +
397
               '    <a class="consentDelete" data-target="' + id + '" href="#">Delete</a>' +
397
               '    <a class="consentDelete" data-target="' + id + '" href="#">' + __('Delete') + '</a>' +
398
               '</div > ';
398
               '</div > ';
399
    }
399
    }
400
400
Lines 419-426 $( document ).ready( function () { Link Here
419
            cookieDomain: '',
419
            cookieDomain: '',
420
            cookiePath: '',
420
            cookiePath: '',
421
            code: '',
421
            code: '',
422
            consentInOpac: false,
422
            opacConsent: false,
423
            consentInStaff: false
423
            staffConsent: false
424
        };
424
        };
425
    }
425
    }
426
426
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/cookieconsent.js (-1 / +5 lines)
Lines 36-41 Link Here
36
36
37
    function showConsentBar() {
37
    function showConsentBar() {
38
        const consentBar = $('#cookieConsentBar');
38
        const consentBar = $('#cookieConsentBar');
39
        const langmenu = $('#changelanguage');
40
        if(langmenu) {
41
            const height = langmenu.height();
42
            consentBar.css('bottom', height);
43
        };
39
        consentBar.attr('aria-hidden', 'false');
44
        consentBar.attr('aria-hidden', 'false');
40
        consentBar.show();
45
        consentBar.show();
41
    }
46
    }
42
- 

Return to bug 27378