diff --git a/composer.json b/composer.json index 4d963b31..645244ce 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "drupal/helfi_tunnistamo": "^2.0", "drupal/redis": "^1.5", "drupal/stage_file_proxy": "^1.2", - "drush/drush": "^10.4 || ^11" + "drush/drush": "^10.4 || ^11", + "twig/twig": "v2.15.2" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", diff --git a/composer.lock b/composer.lock index 033243f8..43c1b786 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ac6fc2a67e66b98668a3821cf9782919", + "content-hash": "19705048a472455872dc1ff0528020ee", "packages": [ { "name": "asm89/stack-cors", @@ -3921,16 +3921,16 @@ }, { "name": "drupal/hdbt", - "version": "4.0.0-rc8", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "30f157ff5d8500975025bafadc6f7530f4fef5fb" + "reference": "a2bae6fc4a6f53213dda065884ef2b622e531929" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/30f157ff5d8500975025bafadc6f7530f4fef5fb", - "reference": "30f157ff5d8500975025bafadc6f7530f4fef5fb", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/a2bae6fc4a6f53213dda065884ef2b622e531929", + "reference": "a2bae6fc4a6f53213dda065884ef2b622e531929", "shasum": "" }, "require": { @@ -3945,10 +3945,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.0.0-rc8", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.0.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-09-27T07:30:07+00:00" + "time": "2022-09-28T08:34:31+00:00" }, { "name": "drupal/hdbt_admin", @@ -4311,16 +4311,16 @@ }, { "name": "drupal/helfi_proxy", - "version": "2.2.6", + "version": "2.2.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "3ca44d35bcd55b3c5d3ddb644edda85b5be2c85e" + "reference": "be69a56c6f4019110d3c0c68d9475827286fa6ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/3ca44d35bcd55b3c5d3ddb644edda85b5be2c85e", - "reference": "3ca44d35bcd55b3c5d3ddb644edda85b5be2c85e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/be69a56c6f4019110d3c0c68d9475827286fa6ab", + "reference": "be69a56c6f4019110d3c0c68d9475827286fa6ab", "shasum": "" }, "require": { @@ -4343,10 +4343,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-09-20T05:27:26+00:00" + "time": "2022-09-28T05:57:53+00:00" }, { "name": "drupal/helfi_tpr", @@ -4734,26 +4734,26 @@ }, { "name": "drupal/media_entity_soundcloud", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/media_entity_soundcloud.git", - "reference": "3.0.0" + "reference": "3.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/media_entity_soundcloud-3.0.0.zip", - "reference": "3.0.0", - "shasum": "b1f3a1d12132d22eaa45f04eb6650b3a4974d1fc" + "url": "https://ftp.drupal.org/files/projects/media_entity_soundcloud-3.1.0.zip", + "reference": "3.1.0", + "shasum": "e67a3535c51cdae2f4dc217d5d72c66dd6484aa1" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.3 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0", - "datestamp": "1603867629", + "version": "3.1.0", + "datestamp": "1664284259", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4783,8 +4783,12 @@ "homepage": "https://www.drupal.org/user/210762" }, { - "name": "jcisio", - "homepage": "https://www.drupal.org/user/210762" + "name": "Rajeshreeputra", + "homepage": "https://www.drupal.org/user/3418561" + }, + { + "name": "shadcn", + "homepage": "https://www.drupal.org/user/571032" } ], "description": "Soundcloud integration for the Media Entity module", @@ -6583,20 +6587,20 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.1.5", + "version": "4.1.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.1.5" + "reference": "4.1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.1.5.zip", - "reference": "4.1.5", - "shasum": "4a85fa401dae71d5ba8f116fac5d920a5260c631" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.1.6.zip", + "reference": "4.1.6", + "shasum": "79d7ef0260c507af066cb8c06fdbf4321b840d8a" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^8 || ^9" }, "require-dev": { "drush/drush": "^10" @@ -6607,8 +6611,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.5", - "datestamp": "1663950843", + "version": "4.1.6", + "datestamp": "1664354501", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/block.block.external_fallback_menu.yml b/conf/cmi/block.block.external_fallback_menu.yml new file mode 100644 index 00000000..dc75b259 --- /dev/null +++ b/conf/cmi/block.block.external_fallback_menu.yml @@ -0,0 +1,23 @@ +uuid: 0b727728-7802-472b-ad0e-b84ed9fc2260 +langcode: en +status: true +dependencies: + module: + - helfi_navigation + theme: + - hdbt +id: external_fallback_menu +theme: hdbt +region: header_branding +weight: 0 +provider: null +plugin: external_menu_block_fallback +settings: + id: external_menu_block_fallback + label: 'External - Fallback menu' + label_display: '0' + provider: helfi_navigation + level: 1 + expand_all_items: true + depth: 0 +visibility: { } diff --git a/conf/cmi/block.block.external_footer_bottom_navigation.yml b/conf/cmi/block.block.external_footer_bottom_navigation.yml new file mode 100644 index 00000000..623fd1a3 --- /dev/null +++ b/conf/cmi/block.block.external_footer_bottom_navigation.yml @@ -0,0 +1,23 @@ +uuid: e68e887e-105a-40ce-b219-fe184ec4f82c +langcode: en +status: true +dependencies: + module: + - helfi_navigation + theme: + - hdbt +id: external_footer_bottom_navigation +theme: hdbt +region: footer_bottom +weight: 0 +provider: null +plugin: 'external_menu_block:footer-bottom-navigation' +settings: + id: 'external_menu_block:footer-bottom-navigation' + label: 'External - Footer bottom navigation' + label_display: '0' + provider: helfi_navigation + level: 1 + expand_all_items: false + depth: 1 +visibility: { } diff --git a/conf/cmi/block.block.external_footer_top_navigation.yml b/conf/cmi/block.block.external_footer_top_navigation.yml new file mode 100644 index 00000000..85f66ef3 --- /dev/null +++ b/conf/cmi/block.block.external_footer_top_navigation.yml @@ -0,0 +1,23 @@ +uuid: 4a55a712-de1f-4f75-9836-3ff6a4f71701 +langcode: en +status: true +dependencies: + module: + - helfi_navigation + theme: + - hdbt +id: external_footer_top_navigation +theme: hdbt +region: footer_top +weight: 1 +provider: null +plugin: 'external_menu_block:footer-top-navigation' +settings: + id: 'external_menu_block:footer-top-navigation' + label: 'City of Helsinki' + label_display: visible + provider: helfi_navigation + level: 1 + expand_all_items: false + depth: 1 +visibility: { } diff --git a/conf/cmi/block.block.external_footer_top_navigation_2.yml b/conf/cmi/block.block.external_footer_top_navigation_2.yml new file mode 100644 index 00000000..8b6cbdc0 --- /dev/null +++ b/conf/cmi/block.block.external_footer_top_navigation_2.yml @@ -0,0 +1,23 @@ +uuid: dfae8130-7c0f-4c59-9b52-c4abbda3b10e +langcode: en +status: true +dependencies: + module: + - helfi_navigation + theme: + - hdbt +id: external_footer_top_navigation_2 +theme: hdbt +region: footer_top +weight: 2 +provider: null +plugin: 'external_menu_block:footer-top-navigation-2' +settings: + id: 'external_menu_block:footer-top-navigation-2' + label: Connect + label_display: visible + provider: helfi_navigation + level: 1 + expand_all_items: false + depth: 1 +visibility: { } diff --git a/conf/cmi/block.block.external_header_language_links.yml b/conf/cmi/block.block.external_header_language_links.yml new file mode 100644 index 00000000..4081ca63 --- /dev/null +++ b/conf/cmi/block.block.external_header_language_links.yml @@ -0,0 +1,23 @@ +uuid: 849ea602-8e1e-456e-ab3c-f863f4c0804d +langcode: en +status: true +dependencies: + module: + - helfi_navigation + theme: + - hdbt +id: external_header_language_links +theme: hdbt +region: header_branding +weight: 0 +provider: null +plugin: 'external_menu_block:header-language-links' +settings: + id: 'external_menu_block:header-language-links' + label: 'External - Header language links' + label_display: '0' + provider: helfi_navigation + level: 1 + expand_all_items: false + depth: 1 +visibility: { } diff --git a/conf/cmi/block.block.external_header_top_navigation.yml b/conf/cmi/block.block.external_header_top_navigation.yml new file mode 100644 index 00000000..4625b5d2 --- /dev/null +++ b/conf/cmi/block.block.external_header_top_navigation.yml @@ -0,0 +1,23 @@ +uuid: ec6b5d6e-5852-4a93-9c23-904928590be8 +langcode: en +status: true +dependencies: + module: + - helfi_navigation + theme: + - hdbt +id: external_header_top_navigation +theme: hdbt +region: header_top +weight: 0 +provider: null +plugin: 'external_menu_block:header-top-navigation' +settings: + id: 'external_menu_block:header-top-navigation' + label: 'External - Header top navigation' + label_display: '0' + provider: helfi_navigation + level: 1 + expand_all_items: false + depth: 1 +visibility: { } diff --git a/conf/cmi/block.block.external_menu_mega_menu.yml b/conf/cmi/block.block.external_menu_mega_menu.yml new file mode 100644 index 00000000..33ab05b8 --- /dev/null +++ b/conf/cmi/block.block.external_menu_mega_menu.yml @@ -0,0 +1,23 @@ +uuid: 2e873e53-3792-48f6-b265-c320fafd6a3f +langcode: en +status: true +dependencies: + module: + - helfi_navigation + theme: + - hdbt +id: external_menu_mega_menu +theme: hdbt +region: header_branding +weight: 0 +provider: null +plugin: external_menu_block_main_navigation +settings: + id: external_menu_block_main_navigation + label: 'External - Mega menu' + label_display: '0' + provider: helfi_navigation + level: 1 + depth: 2 + expand_all_items: true +visibility: { } diff --git a/conf/cmi/block.block.footerbottomnavigation.yml b/conf/cmi/block.block.footerbottomnavigation.yml deleted file mode 100644 index 3889213f..00000000 --- a/conf/cmi/block.block.footerbottomnavigation.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: a564eeea-5e66-4453-aa12-81f2484b899b -langcode: en -status: true -dependencies: - config: - - system.menu.footer-bottom-navigation - module: - - menu_block_current_language - theme: - - hdbt -_core: - default_config_hash: Lq0uz6Wcg4xRo7w6BmzuzPTwOXtY8Q4qmYGUcGCvBLA -id: footerbottomnavigation -theme: hdbt -region: footer_bottom -weight: 0 -provider: null -plugin: 'menu_block_current_language:footer-bottom-navigation' -settings: - id: 'menu_block_current_language:footer-bottom-navigation' - label: 'Footer - Bottom navigation' - label_display: '0' - provider: menu_block_current_language - level: 1 - expand_all_items: false - depth: 1 - translation_providers: - views: views - menu_link_content: menu_link_content - default: '0' -visibility: { } diff --git a/conf/cmi/block.block.footertopblock.yml b/conf/cmi/block.block.footertopblock.yml deleted file mode 100644 index fda94ad7..00000000 --- a/conf/cmi/block.block.footertopblock.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 423292a8-198d-4efe-baa1-334771dff08b -langcode: en -status: true -dependencies: - module: - - hdbt_content - theme: - - hdbt -_core: - default_config_hash: IsZxrQIR5fs_5xZDQ1BJ8K5LXwiaRAM3Gk-HY4vuVb4 -id: footertopblock -theme: hdbt -region: footer_top -weight: -3 -provider: null -plugin: footer_top_block -settings: - id: footer_top_block - label: 'Footer top block' - label_display: '0' - provider: hdbt_content -visibility: { } diff --git a/conf/cmi/block.block.footertopnavigation.yml b/conf/cmi/block.block.footertopnavigation.yml deleted file mode 100644 index 87614c56..00000000 --- a/conf/cmi/block.block.footertopnavigation.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 78948dc5-58eb-4b13-b663-94139eba1818 -langcode: en -status: true -dependencies: - config: - - system.menu.footer-top-navigation - module: - - menu_block_current_language - theme: - - hdbt -_core: - default_config_hash: H8-yOi39s_dKYpBonaOzmvt4y2lTSdbqFN5Enb0T9QQ -id: footertopnavigation -theme: hdbt -region: footer_top -weight: -4 -provider: null -plugin: 'menu_block_current_language:footer-top-navigation' -settings: - id: 'menu_block_current_language:footer-top-navigation' - label: 'City of Helsinki' - label_display: visible - provider: menu_block_current_language - level: 1 - expand_all_items: false - depth: 1 - translation_providers: - views: views - menu_link_content: menu_link_content - default: '0' -visibility: { } diff --git a/conf/cmi/block.block.headertopnavigation.yml b/conf/cmi/block.block.headertopnavigation.yml deleted file mode 100644 index 425d98e9..00000000 --- a/conf/cmi/block.block.headertopnavigation.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 9f22a0a7-3170-4dbb-9cf6-862a0b111504 -langcode: en -status: true -dependencies: - config: - - system.menu.header-top-navigation - module: - - menu_block_current_language - theme: - - hdbt -_core: - default_config_hash: TqKhplHg19l9TlmwIC4Uta9DJOMllkU8lkKEEmvyTRc -id: headertopnavigation -theme: hdbt -region: header_top -weight: 0 -provider: null -plugin: 'menu_block_current_language:header-top-navigation' -settings: - id: 'menu_block_current_language:header-top-navigation' - label: 'Header - Top navigation' - label_display: '0' - provider: menu_block_current_language - level: 1 - expand_all_items: false - depth: 1 - translation_providers: - views: views - menu_link_content: menu_link_content - default: '0' -visibility: { } diff --git a/conf/cmi/block.block.mobile_navigation.yml b/conf/cmi/block.block.mobile_navigation.yml deleted file mode 100644 index 160e216b..00000000 --- a/conf/cmi/block.block.mobile_navigation.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 273823a8-ad6a-4298-a30e-dc4cf2812f9b -langcode: en -status: true -dependencies: - config: - - system.menu.main - module: - - menu_block_current_language - theme: - - hdbt -_core: - default_config_hash: zSvqGMlhIHfM1eegCM8Ac0GLT1dhK62SG6upu3PiS2c -id: mobile_navigation -theme: hdbt -region: header_branding -weight: 4 -provider: null -plugin: 'menu_block_current_language:main' -settings: - id: 'menu_block_current_language:main' - label: 'Mobile navigation' - label_display: '0' - provider: menu_block_current_language - level: 1 - expand_all_items: true - depth: 0 - translation_providers: - views: views - menu_link_content: menu_link_content - default: '0' -visibility: { } diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 46b651af..fbc59b66 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -53,6 +53,7 @@ module: helfi_gdpr_compliance: 0 helfi_languages: 0 helfi_media: 0 + helfi_navigation: 0 helfi_media_map: 0 helfi_media_map_config: 0 helfi_platform_config: 0 diff --git a/conf/cmi/language/fi/block.block.external_footer_top_navigation.yml b/conf/cmi/language/fi/block.block.external_footer_top_navigation.yml new file mode 100644 index 00000000..f5e42c0f --- /dev/null +++ b/conf/cmi/language/fi/block.block.external_footer_top_navigation.yml @@ -0,0 +1,2 @@ +settings: + label: 'Helsingin kaupunki' diff --git a/conf/cmi/language/fi/block.block.external_footer_top_navigation_2.yml b/conf/cmi/language/fi/block.block.external_footer_top_navigation_2.yml new file mode 100644 index 00000000..5dc708ff --- /dev/null +++ b/conf/cmi/language/fi/block.block.external_footer_top_navigation_2.yml @@ -0,0 +1,2 @@ +settings: + label: 'Ota yhteyttä' diff --git a/conf/cmi/language/sv/block.block.external_footer_top_navigation.yml b/conf/cmi/language/sv/block.block.external_footer_top_navigation.yml new file mode 100644 index 00000000..3a8ea0d7 --- /dev/null +++ b/conf/cmi/language/sv/block.block.external_footer_top_navigation.yml @@ -0,0 +1,2 @@ +settings: + label: 'Helsingfors stad' diff --git a/conf/cmi/language/sv/block.block.external_footer_top_navigation_2.yml b/conf/cmi/language/sv/block.block.external_footer_top_navigation_2.yml new file mode 100644 index 00000000..ec835956 --- /dev/null +++ b/conf/cmi/language/sv/block.block.external_footer_top_navigation_2.yml @@ -0,0 +1,2 @@ +settings: + label: 'Ta kontakt'