From 8213250a7fc301886a7996c8f30ecb0d5b65a564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 7 Nov 2024 12:41:06 +0200 Subject: [PATCH 1/2] UHF-10944: Updated Helfi API base module to 2.7.14. --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index ec029a1f..03b8c97f 100644 --- a/composer.lock +++ b/composer.lock @@ -4206,16 +4206,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.13", + "version": "2.7.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "b64e17819c3d21a8372c1325252f2cc294064d2d" + "reference": "d149db10862c62980427c0ad124d0e54c7b97902" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/b64e17819c3d21a8372c1325252f2cc294064d2d", - "reference": "b64e17819c3d21a8372c1325252f2cc294064d2d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/d149db10862c62980427c0ad124d0e54c7b97902", + "reference": "d149db10862c62980427c0ad124d0e54c7b97902", "shasum": "" }, "require": { @@ -4245,10 +4245,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.13", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.14", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-11-06T09:24:38+00:00" + "time": "2024-11-07T10:23:06+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -19569,6 +19569,6 @@ "ext-dom": "*", "ext-libxml": "*" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } From 36e558ba661385c39fa3fa7f4f63ee12ef85e83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 19 Nov 2024 16:48:45 +0200 Subject: [PATCH 2/2] UHF-9680: Reverted the cookie banner installation (properly). --- .../block.block.eucookiecomplianceblock.yml | 31 +++++++++++++++++++ ....hdbt_subtheme_eucookiecomplianceblock.yml | 31 +++++++++++++++++++ ...cookie_compliance.cookie_category.chat.yml | 2 +- ...e_compliance.cookie_category.essential.yml | 2 +- ..._compliance.cookie_category.preference.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 2 +- conf/cmi/eu_cookie_compliance.settings.yml | 5 ++- ..._compliance.cookie_category.statistics.yml | 1 + .../ru/eu_cookie_compliance.settings.yml | 12 +++++++ 9 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 conf/cmi/block.block.eucookiecomplianceblock.yml create mode 100644 conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml create mode 100644 conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml create mode 100644 conf/cmi/language/ru/eu_cookie_compliance.settings.yml diff --git a/conf/cmi/block.block.eucookiecomplianceblock.yml b/conf/cmi/block.block.eucookiecomplianceblock.yml new file mode 100644 index 00000000..66591fcb --- /dev/null +++ b/conf/cmi/block.block.eucookiecomplianceblock.yml @@ -0,0 +1,31 @@ +uuid: d66f67da-a1de-4526-b561-810e937c1bcc +langcode: en +status: true +dependencies: + module: + - eu_cookie_compliance + - system + theme: + - hdbt +_core: + default_config_hash: Ofp5Nv8E3DryORBw9DXtbN860LdYomjt-klGkC0fCHs +id: eucookiecomplianceblock +theme: hdbt +region: after_content +weight: -10 +provider: null +plugin: eu_cookie_compliance_block +settings: + id: eu_cookie_compliance_block + label: 'EU Cookie Compliance Block' + label_display: '0' + provider: eu_cookie_compliance + eu_cookie_compliance_block_settings: + description: + value: '' + format: full_html +visibility: + request_path: + id: request_path + negate: false + pages: /cookie-information-and-settings diff --git a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml new file mode 100644 index 00000000..eb57f3a0 --- /dev/null +++ b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml @@ -0,0 +1,31 @@ +uuid: 5873908f-9f16-4d4d-becf-7eb0e1d2ca98 +langcode: en +status: true +dependencies: + module: + - eu_cookie_compliance + - system + theme: + - hdbt_subtheme +_core: + default_config_hash: Ofp5Nv8E3DryORBw9DXtbN860LdYomjt-klGkC0fCHs +id: hdbt_subtheme_eucookiecomplianceblock +theme: hdbt_subtheme +region: after_content +weight: -10 +provider: null +plugin: eu_cookie_compliance_block +settings: + id: eu_cookie_compliance_block + label: 'EU Cookie Compliance Block' + label_display: '0' + provider: eu_cookie_compliance + eu_cookie_compliance_block_settings: + description: + value: '' + format: full_html +visibility: + request_path: + id: request_path + negate: false + pages: /cookie-information-and-settings diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml index 610c513d..be70027a 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml @@ -1,4 +1,4 @@ -uuid: ca0f6ab6-8ce2-4226-948c-093bb80c95bd +uuid: 8dc5c2c3-94e7-45f3-abf2-afb2277360cc langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml index 729cda24..bd641c1d 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml @@ -1,4 +1,4 @@ -uuid: 55e23022-9124-46f3-85e7-fc51d46c5aa2 +uuid: 7ec46403-3e1d-4c02-b4e3-ecbc635a9bab langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml index dcc0db80..dd43bbd8 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml @@ -1,4 +1,4 @@ -uuid: e9f7b85e-579d-4203-8485-962bd138c785 +uuid: 29ab66ef-81dd-4947-91eb-bfaf581d235c langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml index 9edf6f32..d91217e0 100644 --- a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml +++ b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml @@ -1,4 +1,4 @@ -uuid: 0d9129e2-affc-4f3f-b300-f92bf16b7242 +uuid: 5fd96091-6fd1-4392-a672-08f29331910b langcode: en status: true dependencies: { } diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml index ff0a6a84..21bde9e3 100644 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -1,14 +1,13 @@ _core: - default_config_hash: zmkyvoZ03LGqfVeB0mtslC-pkWMOrGIU9lJl9_jqUkc + default_config_hash: hQ7DNLHTlQh0_X_bDls8Gwa7MA_vHoOePmKn2NASjM4 langcode: en dependencies: config: - filter.format.full_html -uuid: f1c1c3e6-b187-4f9b-ba72-702a7d057983 +uuid: 794fc11b-a1b4-41a7-a351-aaa84516c2c5 popup_enabled: true popup_clicking_confirmation: false popup_scrolling_confirmation: false -eu_countries: { } eu_only: false eu_only_js: false popup_position: false diff --git a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml new file mode 100644 index 00000000..298e3d7c --- /dev/null +++ b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml @@ -0,0 +1 @@ +label: Statistics diff --git a/conf/cmi/language/ru/eu_cookie_compliance.settings.yml b/conf/cmi/language/ru/eu_cookie_compliance.settings.yml new file mode 100644 index 00000000..315eded2 --- /dev/null +++ b/conf/cmi/language/ru/eu_cookie_compliance.settings.yml @@ -0,0 +1,12 @@ +popup_agreed: + value: "

Thank you for accepting cookies

\r\n\r\n

You can now hide this message or find out more about cookies.

\r\n" +popup_agree_button_message: Принять +popup_more_info_button_message: 'Show cookies' +popup_find_more_button_message: 'Show cookies' +popup_hide_button_message: Скрыть +popup_info: + value: "

Hel.fi uses cookies 

\r\n\r\n

We use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.

\r\n" +popup_link: /node/1 +withdraw_message: + value: "

Hel.fi uses cookies

\r\n\r\n

You have given your consent for us to set cookies.

\r\n" +save_preferences_button_label: 'Accept selected cookies'