diff --git a/composer.lock b/composer.lock index 7d27715ad..d36afd302 100644 --- a/composer.lock +++ b/composer.lock @@ -4675,16 +4675,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6" + "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/e8a7a7e74cd2f77d322c352d0778276df2bd1be6", - "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/a01a197d7dcef0dcd10935c41955b69c6d216385", + "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385", "shasum": "" }, "require": { @@ -4702,23 +4702,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-02-17T12:43:22+00:00" + "time": "2023-04-04T08:26:28+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.0.20", + "version": "3.0.21", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "adee6ff048849a42f01f78d539264b6e160482ac" + "reference": "5a854d585559fad66d74a905a43540e0017bc990" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/adee6ff048849a42f01f78d539264b6e160482ac", - "reference": "adee6ff048849a42f01f78d539264b6e160482ac", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5a854d585559fad66d74a905a43540e0017bc990", + "reference": "5a854d585559fad66d74a905a43540e0017bc990", "shasum": "" }, "require": { @@ -4820,10 +4820,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.20", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.21", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-04-04T07:00:17+00:00" + "time": "2023-04-04T08:38:26+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index f7cc619bc..332d6de51 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -55,7 +55,6 @@ module: helfi_media_chart: 0 helfi_media_map: 0 helfi_media_remote_video: 0 - helfi_navigation: 0 helfi_news_archive: 0 helfi_node_announcement: 0 helfi_node_landing_page: 0 @@ -164,6 +163,7 @@ module: views_rss: 0 views_rss_core: 0 views_ui: 0 + helfi_navigation: 1 pathauto: 1 content_translation: 10 views: 10 diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index dc9deba70..25bc6cbb9 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor _core: - default_config_hash: w_dt4BUk1J2csCeQd-yMvz54ANhBzvUDGbH_hpXw6pI + default_config_hash: mx77BnIuTY8Yrm6IkLsHnEOv6JJrHPMD_kKgjP0DVi4 format: full_html editor: ckeditor settings: diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml index 176ac7e1f..0fd1bfa47 100644 --- a/conf/cmi/editor.editor.minimal.yml +++ b/conf/cmi/editor.editor.minimal.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor _core: - default_config_hash: HEqlBl4yZwyvwM419DdClQNeHaD3d5x3pSB-0brI7oM + default_config_hash: UYVamJgeMVQeM3VYumbShc-tGJoYe4RhrXqiL_tJw4c format: minimal editor: ckeditor settings: diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 445ad25c3..048545ca8 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -40,6 +40,10 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: + front_page_latest_news: front_page_latest_news + front_page_top_news: front_page_top_news + current: current + event_list: event_list columns: columns list_of_links: list_of_links content_cards: content_cards @@ -50,14 +54,9 @@ settings: chart: chart remote_video: remote_video map: map - event_list: event_list phasing: phasing popular_services: popular_services target_group_links: target_group_links - front_page_latest_news: front_page_latest_news - front_page_top_news: front_page_top_news - current: current - news_list: news_list negate: 0 target_bundles_drag_drop: banner: @@ -99,9 +98,6 @@ settings: map: weight: 0 enabled: true - news_list: - weight: 0 - enabled: true phasing: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index ad0d6549b..e90ff9f7b 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -53,7 +53,6 @@ settings: chart: chart remote_video: remote_video map: map - news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -92,9 +91,6 @@ settings: map: weight: 0 enabled: true - news_list: - weight: 0 - enabled: true phasing: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index 94d1f3bea..647acdcd1 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -53,7 +53,6 @@ settings: phasing: phasing remote_video: remote_video map: map - news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -92,9 +91,6 @@ settings: map: weight: 0 enabled: true - news_list: - weight: 0 - enabled: true phasing: weight: 0 enabled: true diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index b0ace4bc9..e01a5aafc 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,7 @@ dependencies: - helfi_api_base - linkit _core: - default_config_hash: 6Mnys3fZa4E9hBevfCJqL49NBKWIijbh2ubAzUeCvTk + default_config_hash: nhRyMD2DLIUZvFqqCGT5FZbfF9HUbPbm_B7Uz8-6E_E name: HTML format: full_html weight: 0 @@ -24,7 +24,7 @@ filters: status: true weight: -50 settings: - allowed_html: '