Skip to content

Commit e6dfff5

Browse files
UCjatamayoUCjatamayo
authored
Merge pull request #300 from CybotAS/june-updates
New June updates
2 parents c77f776 + 63519e5 commit e6dfff5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+28190
-56
lines changed

‎assets/css/backend/global/cookiebot_admin.css

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#cookiebot-popup {
1818
box-sizing: border-box;
1919
background: #ffffff;
20-
max-width: 520px;
20+
width: 565px;
2121
padding: 20px;
2222
border-radius: 25px;
2323
}
@@ -119,4 +119,31 @@
119119
#cb-review__form .cb-review__policy a {
120120
color: blue;
121121
text-decoration: none;
122+
}
123+
124+
.cb-review__form--item__custom {
125+
margin-bottom: 20px;
126+
}
127+
128+
129+
.consent-item {
130+
display: none;
131+
}
132+
133+
.consent-item.show-consent {
134+
display: block;
135+
}
136+
137+
.consent-item .cb-review__form--item {
138+
font-size: 13px;
139+
margin-bottom: 0;
140+
}
141+
142+
.consent-item .cb-review__form--item span b{
143+
color: #1032cf;
144+
}
145+
146+
.consent-item .cb-review__form--item span a{
147+
color: #1032cf;
148+
text-decoration: none;
122149
}

‎assets/js/backend/cookiebot-admin-script.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ function cbInit() {
99
jQuery( document ).on( 'click', 'tr[data-slug="cookiebot"] .cb-deactivate-action', event => deactivateCookiebot( event ) );
1010
jQuery( document ).on( 'click', '#cb-review__close', event => closeSurveyPopup( event ) );
1111
jQuery( document ).on( 'submit', '#cb-review__form', event => submitSurveyPopup( event ) );
12+
jQuery( document ).on( 'change', 'input[name="cookiebot-review-option"]', event => showOptionalConsent( event ) )
1213
}
1314

1415
/**
@@ -34,6 +35,25 @@ function closeSurveyPopup(e) {
3435
document.getElementById('cb-review__form').reset();
3536
}
3637

38+
/**
39+
* Shows optional consent.
40+
*/
41+
42+
function showOptionalConsent(e) {
43+
const option = e.target.value;
44+
const optionalConsentBox = jQuery('.consent-item');
45+
const optionalConsent = jQuery('#cb-review__debug-reason');
46+
47+
if(option!=='7'){
48+
optionalConsentBox.removeClass('show-consent');
49+
if(optionalConsent.checked){
50+
optionalConsent.checked = false;
51+
}
52+
}else{
53+
optionalConsentBox.addClass('show-consent');
54+
}
55+
}
56+
3757
/**
3858
* Popup submit
3959
*/
@@ -50,6 +70,7 @@ function submitSurveyPopup(e){
5070
return;
5171
}
5272
const otherReason = jQuery('#cb-review__other-description');
73+
const debugReason = jQuery('#cb-review__debug-reason');
5374
jQuery.ajax({
5475
url: cb_ajax.ajax_url,
5576
type: 'POST',
@@ -58,6 +79,7 @@ function submitSurveyPopup(e){
5879
reason_id: (0 === option.length) ? null : option.val(),
5980
reason_text: (0 === option.length) ? 'none' : option.closest('label').text(),
6081
reason_info: (0 !== otherReason.length) ? otherReason.val().trim() : '',
82+
reason_debug: (!debugReason) ? null : debugReason.val(),
6183
survey_nonce: cb_ajax.survey_nonce,
6284
survey_check: 'ODUwODA1'
6385
},

‎assets/js/backend/settings-page.js

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function init() {
1212
activeSettingsTab();
1313
closeSubmitMsg();
1414
submitEnable();
15-
googleConsentModeUrlPassthrough();
15+
googleConsentModeOptions();
1616
}
1717

1818
function language_toggle() {
@@ -63,19 +63,25 @@ function cookie_blocking_mode() {
6363
jQuery( 'input[type=radio][name=cookiebot-cookie-blocking-mode]' ).on( 'change', function () {
6464
if ( this.value === 'auto' && cookieBlockingMode !== this.value ) {
6565
jQuery( '#cookiebot-setting-async, #cookiebot-setting-hide-popup' ).css( 'opacity', 0.4 );
66-
jQuery( '#declaration-tag, #cookie-popup').addClass('disabled__item');
67-
jQuery( 'input[type=radio][name=cookiebot-script-tag-uc-attribute], input[name=cookiebot-nooutput]' ).prop( 'disabled', true )
66+
jQuery( '#declaration-tag, #cookie-popup, #gcm-cookie-categories, #gtm-cookie-categories').addClass('disabled__item');
67+
jQuery( 'input[type=radio][name=cookiebot-script-tag-uc-attribute], input[name=cookiebot-nooutput]' ).prop( 'disabled', true );
68+
jQuery( '#cb-settings__gtm__cookie-types input[type=checkbox]' ).prop( 'disabled', true );
69+
jQuery( '#cb-settings__gcm__cookie-types input[type=checkbox]' ).prop( 'disabled', true );
6870
}
6971
if ( this.value === 'manual' && cookieBlockingMode !== this.value ) {
7072
jQuery( '#cookiebot-setting-async, #cookiebot-setting-hide-popup' ).css( 'opacity', 1 );
71-
jQuery( '#declaration-tag, #cookie-popup').removeClass('disabled__item');
72-
jQuery( 'input[type=radio][name=cookiebot-script-tag-uc-attribute], input[name=cookiebot-nooutput]' ).prop( 'disabled', false )
73+
jQuery( '#declaration-tag, #cookie-popup, #gcm-cookie-categories, #gtm-cookie-categories').removeClass('disabled__item');
74+
jQuery( 'input[type=radio][name=cookiebot-script-tag-uc-attribute], input[name=cookiebot-nooutput]' ).prop( 'disabled', false );
75+
jQuery( '#cb-settings__gtm__cookie-types input[type=checkbox]' ).prop( 'disabled', false );
76+
jQuery( '#cb-settings__gcm__cookie-types input[type=checkbox]' ).prop( 'disabled', false );
7377
}
74-
cookieBlockingMode = this.value
78+
cookieBlockingMode = this.value;
7579
} )
7680
if ( cookieBlockingMode === 'auto' ) {
77-
jQuery( '#cookiebot-setting-async, #cookiebot-setting-hide-popup' ).css( 'opacity', 0.4 )
78-
jQuery( 'input[type=radio][name=cookiebot-script-tag-uc-attribute], input[name=cookiebot-nooutput]' ).prop( 'disabled', true )
81+
jQuery( '#cookiebot-setting-async, #cookiebot-setting-hide-popup' ).css( 'opacity', 0.4 );
82+
jQuery( 'input[type=radio][name=cookiebot-script-tag-uc-attribute], input[name=cookiebot-nooutput]' ).prop( 'disabled', true );
83+
jQuery( '#cb-settings__gtm__cookie-types input[type=checkbox]' ).prop( 'disabled', true );
84+
jQuery( '#cb-settings__gcm__cookie-types input[type=checkbox]' ).prop( 'disabled', true );
7985
}
8086
}
8187

@@ -131,27 +137,26 @@ function checkValues(initialValues){
131137
}
132138
}
133139

134-
function googleConsentModeUrlPassthrough() {
140+
function googleConsentModeOptions() {
135141
jQuery('input#gcm').on('change', function () {
136-
jQuery(this)
137-
.parents('#consent-mode')
138-
.find('.cb-settings__config__item:has(input#gcm-url-pasthrough)')
139-
.toggle()
140-
const input = jQuery('input#gcm-url-pasthrough');
141-
const label = input.parents('label.switch-checkbox')[0];
142-
if (!label || !label.childNodes.length)
142+
const parent = jQuery(this).parents('#consent-mode');
143+
parent.find('.cb-settings__config__item:has(input#gcm-url-pasthrough)').toggle();
144+
parent.find('.cb-settings__config__item:has(ul#cb-settings__gcm__cookie-types)').toggle();
145+
const passthroughInput = jQuery('input#gcm-url-pasthrough');
146+
const passthroughLabel = passthroughInput.parents('label.switch-checkbox')[0];
147+
if (!passthroughLabel || !passthroughLabel.childNodes.length)
143148
return;
144-
label.childNodes[label.childNodes.length - 1].textContent = 'URL passthrough' + ' ' +
145-
(input.is(':checked') ? 'enabled' : 'disabled');
149+
passthroughLabel.childNodes[passthroughLabel.childNodes.length - 1].textContent = 'URL passthrough' + ' ' +
150+
(passthroughInput.is(':checked') ? 'enabled' : 'disabled');
146151
});
147152
jQuery('input#gcm, input#gcm-url-pasthrough').on('change', function () {
148153
const input = jQuery(this);
149154
const label = input.parents('label.switch-checkbox')[0];
150155
if (!label || !label.childNodes.length)
151156
return;
152157
label.childNodes[label.childNodes.length - 1].textContent = (
153-
(input.attr('id') === 'gcm' ? 'Google Consent Mode' : 'URL passthrough') + ' ' +
154-
(input.is(':checked') ? 'enabled' : 'disabled')
158+
(input.attr('id') === 'gcm' ? 'Google Consent Mode' : 'URL passthrough') + ' ' +
159+
(input.is(':checked') ? 'enabled' : 'disabled')
155160
);
156161
});
157162
}

‎cookiebot.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Plugin URI: https://www.cookiebot.com/
66
Description: The Cookiebot CMP WordPress cookie banner and cookie policy help you comply with the major data protection laws (GDPR, ePrivacy, CCPA, LGPD, etc.) in a simple and fully automated way. Secure your website and get peace of mind.
77
Author: Usercentrics A/S
8-
Version: 4.2.11
8+
Version: 4.2.12
99
Author URI: https://www.cookiebot.com/
1010
Text Domain: cookiebot
1111
Domain Path: /langs

‎langs/cookiebot-cs_CZ.mo

1.12 KB
Binary file not shown.

‎langs/cookiebot-cs_CZ.po

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Cookiebot | GDPR/CCPA Compliant Cookie Consent and Control\n"
44
"POT-Creation-Date: 2023-02-15 13:52+0100\n"
5-
"PO-Revision-Date: 2023-04-24 18:38+0200\n"
5+
"PO-Revision-Date: 2023-06-23 14:06+0200\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: cs_CZ\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
1212
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n>=2 && n<=4 ? 1 : 2);\n"
13-
"X-Generator: Poedit 3.2.2\n"
13+
"X-Generator: Poedit 3.3.1\n"
1414
"X-Poedit-Basepath: ..\n"
1515
"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
1616
"X-Poedit-WPHeader: cookiebot.php\n"
@@ -1589,6 +1589,37 @@ msgstr "Jak najít název datové vrstvy"
15891589
msgid "Name of your Data Layer"
15901590
msgstr "Název datové vrstvy"
15911591

1592+
#: view/admin/settings/gtm-page.php:76
1593+
msgid "Google Tag Manager cookies"
1594+
msgstr "Cookies Google Tag Manager"
1595+
1596+
#: view/admin/settings/gtm-page.php:78
1597+
msgid "Select the cookie types that need to be consented for the Google Tag Manager script"
1598+
msgstr "Vyberte typy souborů cookie, které je třeba odsouhlasit pro skript Google Tag Manager"
1599+
1600+
#: view/admin/settings/gtm-page.php:80
1601+
#: view/admin/settings/gcm-page.php:93
1602+
msgid "This feature is only available when using Manual Blocking"
1603+
msgstr "Tato funkce je k dispozici pouze při použití manuálního blokování"
1604+
1605+
#: view/admin/settings/gtm-page.php:82
1606+
#: view/admin/settings/gcm-page.php:95
1607+
msgid "This option may affect the behaviour of your GTM Tags, as the script will run on the selected cookies consent."
1608+
msgstr "Tato možnost může ovlivnit chování vašich značek GTM, protože skript bude spuštěn na základě souhlasu se zvolenými soubory cookies."
1609+
1610+
#: view/admin/settings/gtm-page.php:84
1611+
#: view/admin/settings/gcm-page.php:97
1612+
msgid "Please make sure your Tags in Google Tag Manager are triggered correctly."
1613+
msgstr "Ujistěte se, že jsou značky ve Správci značek Google správně spuštěny."
1614+
1615+
#: view/admin/settings/gcm-page.php:89
1616+
msgid "Google Consent Mode cookies"
1617+
msgstr "Cookies Google Consent Mode"
1618+
1619+
#: view/admin/settings/gcm-page.php:91
1620+
msgid "Select the cookie types that need to be consented for the Google Consent Mode script"
1621+
msgstr "Vyberte typy souborů cookie, které je třeba odsouhlasit pro skript Google Consent Mode"
1622+
15921623
#: view/admin/settings/iab-page.php:3
15931624
msgid "IAB Integration:"
15941625
msgstr "Integrace řešení IAB:"

‎langs/cookiebot-de_DE.mo

1.14 KB
Binary file not shown.

‎langs/cookiebot-de_DE.po

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Cookiebot | GDPR/CCPA Compliant Cookie Consent and Control\n"
44
"POT-Creation-Date: 2022-06-10 11:05+0200\n"
5-
"PO-Revision-Date: 2023-05-23 12:41+0200\n"
5+
"PO-Revision-Date: 2023-06-23 14:06+0200\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: de_DE\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
1212
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
13-
"X-Generator: Poedit 3.2.2\n"
13+
"X-Generator: Poedit 3.3.1\n"
1414
"X-Poedit-Basepath: ..\n"
1515
"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
1616
"X-Poedit-WPHeader: cookiebot.php\n"
@@ -1593,6 +1593,37 @@ msgstr "So finden Sie den Data Layer Namen"
15931593
msgid "Name of your Data Layer"
15941594
msgstr "Name Ihres Data Layers"
15951595

1596+
#: view/admin/settings/gtm-page.php:76
1597+
msgid "Google Tag Manager cookies"
1598+
msgstr "Google Tag Manager-Cookie"
1599+
1600+
#: view/admin/settings/gtm-page.php:78
1601+
msgid "Select the cookie types that need to be consented for the Google Tag Manager script"
1602+
msgstr "Wählen Sie die Cookie-Typen aus, für die das Google Tag Manager-Skript eine Einwilligung benötigt"
1603+
1604+
#: view/admin/settings/gtm-page.php:80
1605+
#: view/admin/settings/gcm-page.php:93
1606+
msgid "This feature is only available when using Manual Blocking"
1607+
msgstr "Dieses Feature ist nur verfügbar, wenn Sie manuelles Blocking verwenden"
1608+
1609+
#: view/admin/settings/gtm-page.php:82
1610+
#: view/admin/settings/gcm-page.php:95
1611+
msgid "This option may affect the behaviour of your GTM Tags, as the script will run on the selected cookies consent."
1612+
msgstr "Diese Option kann sich auf das Verhalten Ihrer GTM-Tags auswirken, da das Skript bei der ausgewählten Cookie-Einwilligung ausgeführt wird."
1613+
1614+
#: view/admin/settings/gtm-page.php:84
1615+
#: view/admin/settings/gcm-page.php:97
1616+
msgid "Please make sure your Tags in Google Tag Manager are triggered correctly."
1617+
msgstr "Bitte stellen Sie sicher, dass Ihre Tags in Google Tag Manager korrekt ausgelöst werden."
1618+
1619+
#: view/admin/settings/gcm-page.php:89
1620+
msgid "Google Consent Mode cookies"
1621+
msgstr "Google Consent Mode-Cookie"
1622+
1623+
#: view/admin/settings/gcm-page.php:91
1624+
msgid "Select the cookie types that need to be consented for the Google Consent Mode script"
1625+
msgstr "Wählen Sie die Cookie-Typen aus, für die das Google Consent Mode-Skript eine Einwilligung benötigt"
1626+
15961627
#: view/admin/settings/iab-page.php:3
15971628
msgid "IAB Integration:"
15981629
msgstr "IAB-Integration:"

‎langs/cookiebot-es_AR.mo

47.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)