From 3ae710ba25be148250ac2892d7437f4dcaf0a0b8 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 17:47:27 +0300 Subject: [PATCH 01/26] ISAICP-6694: Include default content in the project. --- composer.json | 1 + composer.lock | 81 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8701e77872..7cf5bf01cd 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "drupal/config_readonly": "^1.0", "drupal/core": "~8.9", "drupal/core-composer-scaffold": "~8.9", + "drupal/default_content": "^2.0@alpha", "drupal/diff": "~1.0", "drupal/digital_size_formatter": "~2.0", "drupal/dynamic_entity_reference": "~2.0", diff --git a/composer.lock b/composer.lock index fda1fadf83..e66268629d 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": "02b2d4ee27172c0331df5b65738eb035", + "content-hash": "10da38ab4e79efbf9a5d2d9e635ec91c", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -3176,6 +3176,82 @@ "issues": "https://www.drupal.org/project/issues/ctools" } }, + { + "name": "drupal/default_content", + "version": "2.0.0-alpha1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/default_content.git", + "reference": "2.0.0-alpha1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/default_content-2.0.0-alpha1.zip", + "reference": "2.0.0-alpha1", + "shasum": "0d534ab8e44786a352e24c7cec3dc06bef155f66" + }, + "require": { + "drupal/core": "^8.7.7 || ^9" + }, + "require-dev": { + "drupal/paragraphs": "^1" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0-alpha1", + "datestamp": "1595072288", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + }, + "drush": { + "services": { + "drush.services.yml": "^9" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Berdir", + "homepage": "https://www.drupal.org/user/214652" + }, + { + "name": "Sam152", + "homepage": "https://www.drupal.org/user/1485048" + }, + { + "name": "andypost", + "homepage": "https://www.drupal.org/user/118908" + }, + { + "name": "benjy", + "homepage": "https://www.drupal.org/user/1852732" + }, + { + "name": "dawehner", + "homepage": "https://www.drupal.org/user/99340" + }, + { + "name": "jibran", + "homepage": "https://www.drupal.org/user/1198144" + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + } + ], + "description": "Imports default content when a module is enabled", + "homepage": "https://www.drupal.org/project/default_content", + "support": { + "source": "https://git.drupalcode.org/project/default_content" + } + }, { "name": "drupal/diff", "version": "1.0.0", @@ -11206,7 +11282,7 @@ "reference": "master" }, "type": "library", - "time": "2020-08-03T19:59:39+00:00" + "time": "2020-11-25T21:59:37+00:00" }, { "name": "stack/builder", @@ -20268,6 +20344,7 @@ "dkarv/mdl-chip-input": 20, "drupal/cas_attributes": 20, "drupal/config_ignore": 20, + "drupal/default_content": 15, "drupal/menu_link_destination": 20, "drupal/og": 20, "drupal/page_manager": 10, From 9b99e62c1bd841b5902e652cb00e07ecd7aac1ac Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 17:50:17 +0300 Subject: [PATCH 02/26] ISAICP-6694: Export configuration. --- .../sync/block.block.europeancommission.yml | 25 +++++ config/sync/block.block.followus.yml | 25 +++++ ...ter.yml => block.block.helpandsupport.yml} | 12 +-- config/sync/block.block.socialmedia.yml | 25 +++++ .../sync/block.block.ventuno_footer_menu.yml | 2 +- config/sync/filter.format.simple_html.yml | 98 +++++++++---------- config/sync/system.menu.footer-about-us.yml | 8 ++ ...system.menu.footer-european-commission.yml | 8 ++ config/sync/system.menu.footer-follow-us.yml | 8 ++ .../system.menu.footer-help-and-support.yml | 8 ++ .../sync/system.menu.footer-social-media.yml | 8 ++ config/sync/tour.tour.joinup_homepage.yml | 10 +- .../templates/layout/page--home.html.twig | 30 ------ .../ventuno/templates/layout/page.html.twig | 30 ------ 14 files changed, 176 insertions(+), 121 deletions(-) create mode 100644 config/sync/block.block.europeancommission.yml create mode 100644 config/sync/block.block.followus.yml rename config/sync/{block.block.help_and_support_footer.yml => block.block.helpandsupport.yml} (56%) create mode 100644 config/sync/block.block.socialmedia.yml create mode 100644 config/sync/system.menu.footer-about-us.yml create mode 100644 config/sync/system.menu.footer-european-commission.yml create mode 100644 config/sync/system.menu.footer-follow-us.yml create mode 100644 config/sync/system.menu.footer-help-and-support.yml create mode 100644 config/sync/system.menu.footer-social-media.yml diff --git a/config/sync/block.block.europeancommission.yml b/config/sync/block.block.europeancommission.yml new file mode 100644 index 0000000000..2809386c70 --- /dev/null +++ b/config/sync/block.block.europeancommission.yml @@ -0,0 +1,25 @@ +uuid: d516d818-3d5b-4165-9c28-097f3d30a5a4 +langcode: en +status: true +dependencies: + config: + - system.menu.footer-european-commission + module: + - system + theme: + - ventuno +id: europeancommission +theme: ventuno +region: footer +weight: -25 +provider: null +plugin: 'system_menu_block:footer-european-commission' +settings: + id: 'system_menu_block:footer-european-commission' + label: 'European Commission' + provider: system + label_display: visible + level: 1 + depth: 0 + expand_all_items: false +visibility: { } diff --git a/config/sync/block.block.followus.yml b/config/sync/block.block.followus.yml new file mode 100644 index 0000000000..faef3da44d --- /dev/null +++ b/config/sync/block.block.followus.yml @@ -0,0 +1,25 @@ +uuid: 3c616799-451c-4e41-a80f-53005908a1e2 +langcode: en +status: true +dependencies: + config: + - system.menu.footer-follow-us + module: + - system + theme: + - ventuno +id: followus +theme: ventuno +region: footer +weight: -24 +provider: null +plugin: 'system_menu_block:footer-follow-us' +settings: + id: 'system_menu_block:footer-follow-us' + label: 'Follow us' + provider: system + label_display: visible + level: 1 + depth: 0 + expand_all_items: false +visibility: { } diff --git a/config/sync/block.block.help_and_support_footer.yml b/config/sync/block.block.helpandsupport.yml similarity index 56% rename from config/sync/block.block.help_and_support_footer.yml rename to config/sync/block.block.helpandsupport.yml index 2d86b9257c..6b53cd1a79 100644 --- a/config/sync/block.block.help_and_support_footer.yml +++ b/config/sync/block.block.helpandsupport.yml @@ -1,21 +1,21 @@ -uuid: d6b3e8ba-af9b-417a-a18e-861ab66e1292 +uuid: eefc933f-d7e0-4283-940b-0bf08b427977 langcode: en status: true dependencies: config: - - system.menu.support + - system.menu.footer-help-and-support module: - system theme: - ventuno -id: help_and_support_footer +id: helpandsupport theme: ventuno region: footer -weight: 0 +weight: -26 provider: null -plugin: 'system_menu_block:support' +plugin: 'system_menu_block:footer-help-and-support' settings: - id: 'system_menu_block:support' + id: 'system_menu_block:footer-help-and-support' label: 'Help and support' provider: system label_display: visible diff --git a/config/sync/block.block.socialmedia.yml b/config/sync/block.block.socialmedia.yml new file mode 100644 index 0000000000..4ffba7662c --- /dev/null +++ b/config/sync/block.block.socialmedia.yml @@ -0,0 +1,25 @@ +uuid: 7202a38b-0b30-4f16-b17e-5adbd97924c1 +langcode: en +status: true +dependencies: + config: + - system.menu.footer-social-media + module: + - system + theme: + - ventuno +id: socialmedia +theme: ventuno +region: footer +weight: -23 +provider: null +plugin: 'system_menu_block:footer-social-media' +settings: + id: 'system_menu_block:footer-social-media' + label: 'Social media' + provider: system + label_display: visible + level: 1 + depth: 0 + expand_all_items: false +visibility: { } diff --git a/config/sync/block.block.ventuno_footer_menu.yml b/config/sync/block.block.ventuno_footer_menu.yml index 37338a24f1..a13f083aa9 100644 --- a/config/sync/block.block.ventuno_footer_menu.yml +++ b/config/sync/block.block.ventuno_footer_menu.yml @@ -13,7 +13,7 @@ _core: id: ventuno_footer_menu theme: ventuno region: footer -weight: -16 +weight: -27 provider: null plugin: 'system_menu_block:footer' settings: diff --git a/config/sync/filter.format.simple_html.yml b/config/sync/filter.format.simple_html.yml index ee1ad0df4a..352fd398f0 100644 --- a/config/sync/filter.format.simple_html.yml +++ b/config/sync/filter.format.simple_html.yml @@ -41,6 +41,48 @@ filters: status: true weight: -48 settings: { } + collection_glossary: + id: collection_glossary + provider: collection + status: false + weight: -43 + settings: { } + editor_file_reference: + id: editor_file_reference + provider: editor + status: true + weight: -46 + settings: { } + embed_block: + id: embed_block + provider: embed_block + status: false + weight: -42 + settings: { } + filter_align: + id: filter_align + provider: filter + status: false + weight: -41 + settings: { } + filter_autop: + id: filter_autop + provider: filter + status: false + weight: -40 + settings: { } + filter_caption: + id: filter_caption + provider: filter + status: false + weight: -39 + settings: { } + filter_html_escape: + id: filter_html_escape + provider: filter + status: false + weight: -44 + settings: { } filter_html_image_secure: id: filter_html_image_secure provider: filter @@ -74,6 +116,13 @@ filters: vimeo: 0 autoplay: false responsive: true + linkit: + id: linkit + provider: linkit + status: false + weight: -37 + settings: + title: true media_embed: id: media_embed provider: media @@ -83,55 +132,6 @@ filters: default_view_mode: default allowed_media_types: { } allowed_view_modes: { } - editor_file_reference: - id: editor_file_reference - provider: editor - status: true - weight: -46 - settings: { } - collection_glossary: - id: collection_glossary - provider: collection - status: false - weight: -43 - settings: { } - embed_block: - id: embed_block - provider: embed_block - status: false - weight: -42 - settings: { } - filter_html_escape: - id: filter_html_escape - provider: filter - status: false - weight: -44 - settings: { } - filter_caption: - id: filter_caption - provider: filter - status: false - weight: -39 - settings: { } - filter_align: - id: filter_align - provider: filter - status: false - weight: -41 - settings: { } - filter_autop: - id: filter_autop - provider: filter - status: false - weight: -40 - settings: { } - linkit: - id: linkit - provider: linkit - status: false - weight: -37 - settings: - title: true video_embed_wysiwyg: id: video_embed_wysiwyg provider: video_embed_wysiwyg diff --git a/config/sync/system.menu.footer-about-us.yml b/config/sync/system.menu.footer-about-us.yml new file mode 100644 index 0000000000..b31d160917 --- /dev/null +++ b/config/sync/system.menu.footer-about-us.yml @@ -0,0 +1,8 @@ +uuid: 8a44b579-bf6c-4cf9-b620-f1c4868030cf +langcode: en +status: true +dependencies: { } +id: footer-about-us +label: 'About us' +description: 'Footer: About us' +locked: false diff --git a/config/sync/system.menu.footer-european-commission.yml b/config/sync/system.menu.footer-european-commission.yml new file mode 100644 index 0000000000..317f6ca7a5 --- /dev/null +++ b/config/sync/system.menu.footer-european-commission.yml @@ -0,0 +1,8 @@ +uuid: c2ca3cf8-caf8-4724-941c-0ddf2fa57565 +langcode: en +status: true +dependencies: { } +id: footer-european-commission +label: 'European Commission' +description: 'Footer: European Commission' +locked: false diff --git a/config/sync/system.menu.footer-follow-us.yml b/config/sync/system.menu.footer-follow-us.yml new file mode 100644 index 0000000000..dfc7321ae6 --- /dev/null +++ b/config/sync/system.menu.footer-follow-us.yml @@ -0,0 +1,8 @@ +uuid: da299060-2fac-45b2-8ca1-031627f884dd +langcode: en +status: true +dependencies: { } +id: footer-follow-us +label: 'Follow us' +description: 'Footer: Follow us' +locked: false diff --git a/config/sync/system.menu.footer-help-and-support.yml b/config/sync/system.menu.footer-help-and-support.yml new file mode 100644 index 0000000000..029400db48 --- /dev/null +++ b/config/sync/system.menu.footer-help-and-support.yml @@ -0,0 +1,8 @@ +uuid: e05063d8-6fbb-4fed-82b1-c9b493484249 +langcode: en +status: true +dependencies: { } +id: footer-help-and-support +label: 'Help and support' +description: 'Footer: Help and support' +locked: false diff --git a/config/sync/system.menu.footer-social-media.yml b/config/sync/system.menu.footer-social-media.yml new file mode 100644 index 0000000000..862d032167 --- /dev/null +++ b/config/sync/system.menu.footer-social-media.yml @@ -0,0 +1,8 @@ +uuid: 411499f6-4913-432e-baea-ec0c54443638 +langcode: en +status: true +dependencies: { } +id: footer-social-media +label: 'Social media' +description: 'Footer: Social media' +locked: false diff --git a/config/sync/tour.tour.joinup_homepage.yml b/config/sync/tour.tour.joinup_homepage.yml index fd9f127c80..39d734a29a 100644 --- a/config/sync/tour.tour.joinup_homepage.yml +++ b/config/sync/tour.tour.joinup_homepage.yml @@ -24,7 +24,7 @@ tips: weight: 2 location: left attributes: - data-class: 'search-bar' + data-class: search-bar discover_topics: id: discover_topics plugin: text @@ -32,7 +32,7 @@ tips: weight: 3 location: right attributes: - data-class: 'view-discover-topics' + data-class: view-discover-topics spotlight: id: spotlight plugin: text @@ -40,7 +40,7 @@ tips: weight: 4 location: left attributes: - data-class: 'block-views-blockin-the-spotlight-block' + data-class: block-views-blockin-the-spotlight-block news: id: news plugin: text @@ -48,7 +48,7 @@ tips: weight: 5 location: left attributes: - data-class: 'block-views-blocklatest-news-block' + data-class: block-views-blocklatest-news-block explore: id: explore plugin: text @@ -64,7 +64,7 @@ tips: weight: 7 location: left attributes: - data-class: 'about-what' + data-class: about-what contact: id: contact plugin: text diff --git a/web/themes/ventuno/templates/layout/page--home.html.twig b/web/themes/ventuno/templates/layout/page--home.html.twig index c0ce348ad5..eaae3ce76f 100644 --- a/web/themes/ventuno/templates/layout/page--home.html.twig +++ b/web/themes/ventuno/templates/layout/page--home.html.twig @@ -133,36 +133,6 @@ {{ page.footer }} - -
-

{{ 'European Commission'|t }}

- -
- - - diff --git a/web/themes/ventuno/templates/layout/page.html.twig b/web/themes/ventuno/templates/layout/page.html.twig index 8ec27ee2c6..ff70c1692a 100644 --- a/web/themes/ventuno/templates/layout/page.html.twig +++ b/web/themes/ventuno/templates/layout/page.html.twig @@ -91,36 +91,6 @@ {{ page.footer }} - -
-

{{ 'European Commission'|t }}

- -
- - - From 14920c611c732a9e760142d4903f6e690b49c0a3 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 17:51:45 +0300 Subject: [PATCH 03/26] ISAICP-6694: Export default links. --- .../01f49cb4-ac88-469d-bb15-31a08c1beaaf.yml | 40 +++++++++++++++++++ .../160075bc-f52f-48b3-8049-f9a80ee2dd1a.yml | 40 +++++++++++++++++++ .../1d7ae4fa-8de5-4629-8c22-496c8cfb1368.yml | 40 +++++++++++++++++++ .../3b5a3987-33e3-48be-b67b-ea7d745e7aa1.yml | 40 +++++++++++++++++++ .../3d17368b-533a-4b78-ba16-997d40be6ae5.yml | 40 +++++++++++++++++++ .../5cea5e3e-b6e6-44eb-addc-ea2f73fc0eb6.yml | 40 +++++++++++++++++++ .../5d8efeaf-8655-49e5-850d-0a6cc85052ee.yml | 40 +++++++++++++++++++ .../5fd2bf68-453b-4f11-a680-7aa4e56ef6b4.yml | 40 +++++++++++++++++++ .../8c1531f4-3d69-4f9f-b3f0-8f846336c5d8.yml | 40 +++++++++++++++++++ .../9065069f-cf16-4883-8e26-a1598f6a2c97.yml | 40 +++++++++++++++++++ .../b48755b4-8158-4ac4-9f1b-0977ce4fcd13.yml | 40 +++++++++++++++++++ .../cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml | 40 +++++++++++++++++++ .../d0061f62-3700-4506-bced-c01382bb050a.yml | 40 +++++++++++++++++++ .../d20f26d7-2139-4a29-bea9-a4a38b476ca8.yml | 40 +++++++++++++++++++ .../dd34c2cb-c22b-4c74-8c77-20e69b779f21.yml | 40 +++++++++++++++++++ .../f00e66fc-6bfc-416b-88c2-24caa2af0708.yml | 40 +++++++++++++++++++ .../joinup_default_content.info.yml | 8 ++++ .../joinup_default_content.module | 10 +++++ 18 files changed, 658 insertions(+) create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/01f49cb4-ac88-469d-bb15-31a08c1beaaf.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/160075bc-f52f-48b3-8049-f9a80ee2dd1a.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/1d7ae4fa-8de5-4629-8c22-496c8cfb1368.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/3b5a3987-33e3-48be-b67b-ea7d745e7aa1.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/3d17368b-533a-4b78-ba16-997d40be6ae5.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/5cea5e3e-b6e6-44eb-addc-ea2f73fc0eb6.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/5d8efeaf-8655-49e5-850d-0a6cc85052ee.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/5fd2bf68-453b-4f11-a680-7aa4e56ef6b4.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/8c1531f4-3d69-4f9f-b3f0-8f846336c5d8.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/9065069f-cf16-4883-8e26-a1598f6a2c97.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/b48755b4-8158-4ac4-9f1b-0977ce4fcd13.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/d0061f62-3700-4506-bced-c01382bb050a.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/d20f26d7-2139-4a29-bea9-a4a38b476ca8.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/dd34c2cb-c22b-4c74-8c77-20e69b779f21.yml create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/f00e66fc-6bfc-416b-88c2-24caa2af0708.yml create mode 100644 web/modules/custom/joinup_default_content/joinup_default_content.info.yml create mode 100644 web/modules/custom/joinup_default_content/joinup_default_content.module diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/01f49cb4-ac88-469d-bb15-31a08c1beaaf.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/01f49cb4-ac88-469d-bb15-31a08c1beaaf.yml new file mode 100644 index 0000000000..0ee37875e4 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/01f49cb4-ac88-469d-bb15-31a08c1beaaf.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 01f49cb4-ac88-469d-bb15-31a08c1beaaf + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'Satisfaction survey' + menu_name: + - + value: footer-help-and-support + link: + - + uri: 'https://ec.europa.eu/eusurvey/runner/Joinup_Satisfaction_Survey' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -47 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/160075bc-f52f-48b3-8049-f9a80ee2dd1a.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/160075bc-f52f-48b3-8049-f9a80ee2dd1a.yml new file mode 100644 index 0000000000..19065c15ec --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/160075bc-f52f-48b3-8049-f9a80ee2dd1a.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 160075bc-f52f-48b3-8049-f9a80ee2dd1a + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'Resources for partners' + menu_name: + - + value: footer-european-commission + link: + - + uri: 'https://ec.europa.eu/info/resources-partners_en' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -49 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/1d7ae4fa-8de5-4629-8c22-496c8cfb1368.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/1d7ae4fa-8de5-4629-8c22-496c8cfb1368.yml new file mode 100644 index 0000000000..d356d779fe --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/1d7ae4fa-8de5-4629-8c22-496c8cfb1368.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 1d7ae4fa-8de5-4629-8c22-496c8cfb1368 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'Europa Analytics' + menu_name: + - + value: footer-european-commission + link: + - + uri: 'https://ec.europa.eu/info/europa-analytics_en' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -45 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/3b5a3987-33e3-48be-b67b-ea7d745e7aa1.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/3b5a3987-33e3-48be-b67b-ea7d745e7aa1.yml new file mode 100644 index 0000000000..6eb9f3bc87 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/3b5a3987-33e3-48be-b67b-ea7d745e7aa1.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 3b5a3987-33e3-48be-b67b-ea7d745e7aa1 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'About Joinup' + menu_name: + - + value: footer-about-us + link: + - + uri: 'internal:/collection/joinup/about' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: true + weight: + - + value: 0 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/3d17368b-533a-4b78-ba16-997d40be6ae5.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/3d17368b-533a-4b78-ba16-997d40be6ae5.yml new file mode 100644 index 0000000000..f5d4127c07 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/3d17368b-533a-4b78-ba16-997d40be6ae5.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 3d17368b-533a-4b78-ba16-997d40be6ae5 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'Legal notice' + menu_name: + - + value: footer-european-commission + link: + - + uri: 'internal:/joinup/legal-notice' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: true + weight: + - + value: -47 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/5cea5e3e-b6e6-44eb-addc-ea2f73fc0eb6.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/5cea5e3e-b6e6-44eb-addc-ea2f73fc0eb6.yml new file mode 100644 index 0000000000..d67d0f9077 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/5cea5e3e-b6e6-44eb-addc-ea2f73fc0eb6.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 5cea5e3e-b6e6-44eb-addc-ea2f73fc0eb6 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: LinkedIn + menu_name: + - + value: footer-social-media + link: + - + uri: 'https://www.linkedin.com/groups/2600644/' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -49 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/5d8efeaf-8655-49e5-850d-0a6cc85052ee.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/5d8efeaf-8655-49e5-850d-0a6cc85052ee.yml new file mode 100644 index 0000000000..f33eceb83b --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/5d8efeaf-8655-49e5-850d-0a6cc85052ee.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 5d8efeaf-8655-49e5-850d-0a6cc85052ee + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: Cookies + menu_name: + - + value: footer-european-commission + link: + - + uri: 'https://ec.europa.eu/info/cookies_en' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -48 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/5fd2bf68-453b-4f11-a680-7aa4e56ef6b4.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/5fd2bf68-453b-4f11-a680-7aa4e56ef6b4.yml new file mode 100644 index 0000000000..398aeff245 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/5fd2bf68-453b-4f11-a680-7aa4e56ef6b4.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 5fd2bf68-453b-4f11-a680-7aa4e56ef6b4 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'Joinup newsletter' + menu_name: + - + value: footer-follow-us + link: + - + uri: 'https://ec.europa.eu/newsroom/joinup/newsletter-specific-archive-issue.cfm?newsletter_service_id=877&lang=default' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: 0 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/8c1531f4-3d69-4f9f-b3f0-8f846336c5d8.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/8c1531f4-3d69-4f9f-b3f0-8f846336c5d8.yml new file mode 100644 index 0000000000..bd04ecc113 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/8c1531f4-3d69-4f9f-b3f0-8f846336c5d8.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 8c1531f4-3d69-4f9f-b3f0-8f846336c5d8 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: Twitter + menu_name: + - + value: footer-social-media + link: + - + uri: 'https://twitter.com/joinup_eu' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -50 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/9065069f-cf16-4883-8e26-a1598f6a2c97.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/9065069f-cf16-4883-8e26-a1598f6a2c97.yml new file mode 100644 index 0000000000..1c4cb0dd0a --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/9065069f-cf16-4883-8e26-a1598f6a2c97.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 9065069f-cf16-4883-8e26-a1598f6a2c97 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'Federation of solutions' + menu_name: + - + value: footer-help-and-support + link: + - + uri: 'internal:/collection/joinup/federation-solutions' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: true + weight: + - + value: -46 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/b48755b4-8158-4ac4-9f1b-0977ce4fcd13.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/b48755b4-8158-4ac4-9f1b-0977ce4fcd13.yml new file mode 100644 index 0000000000..7903d997b4 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/b48755b4-8158-4ac4-9f1b-0977ce4fcd13.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: b48755b4-8158-4ac4-9f1b-0977ce4fcd13 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: How-to + menu_name: + - + value: footer-help-and-support + link: + - + uri: 'internal:/collection/joinup/how-video-tutorials' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: true + weight: + - + value: -50 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml new file mode 100644 index 0000000000..aa5cfacf32 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: cdec3c57-1e0e-44c4-83a7-75df99730c5a + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'Contact Joinup Support' + menu_name: + - + value: footer-help-and-support + link: + - + uri: 'internal:/contact' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: true + weight: + - + value: -48 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/d0061f62-3700-4506-bced-c01382bb050a.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/d0061f62-3700-4506-bced-c01382bb050a.yml new file mode 100644 index 0000000000..9e2c62dfab --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/d0061f62-3700-4506-bced-c01382bb050a.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: d0061f62-3700-4506-bced-c01382bb050a + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: Contact + menu_name: + - + value: footer-european-commission + link: + - + uri: 'https://ec.europa.eu/info/contact_en' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -46 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/d20f26d7-2139-4a29-bea9-a4a38b476ca8.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/d20f26d7-2139-4a29-bea9-a4a38b476ca8.yml new file mode 100644 index 0000000000..c49bb7a3ff --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/d20f26d7-2139-4a29-bea9-a4a38b476ca8.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: d20f26d7-2139-4a29-bea9-a4a38b476ca8 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'About the Commission''s new web presence' + menu_name: + - + value: footer-european-commission + link: + - + uri: 'https://ec.europa.eu/info/about-commissions-new-web-presence_en' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: -50 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/dd34c2cb-c22b-4c74-8c77-20e69b779f21.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/dd34c2cb-c22b-4c74-8c77-20e69b779f21.yml new file mode 100644 index 0000000000..4d755f6b77 --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/dd34c2cb-c22b-4c74-8c77-20e69b779f21.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: dd34c2cb-c22b-4c74-8c77-20e69b779f21 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'ADMS-AP Validator' + menu_name: + - + value: footer-help-and-support + link: + - + uri: 'internal:/adms-validator' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: true + weight: + - + value: -45 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/f00e66fc-6bfc-416b-88c2-24caa2af0708.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/f00e66fc-6bfc-416b-88c2-24caa2af0708.yml new file mode 100644 index 0000000000..c00f82ffcb --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/f00e66fc-6bfc-416b-88c2-24caa2af0708.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: f00e66fc-6bfc-416b-88c2-24caa2af0708 + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: FAQ + menu_name: + - + value: footer-help-and-support + link: + - + uri: 'internal:/collection/joinup/faq' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: true + weight: + - + value: -49 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false diff --git a/web/modules/custom/joinup_default_content/joinup_default_content.info.yml b/web/modules/custom/joinup_default_content/joinup_default_content.info.yml new file mode 100644 index 0000000000..4c9f853147 --- /dev/null +++ b/web/modules/custom/joinup_default_content/joinup_default_content.info.yml @@ -0,0 +1,8 @@ +name: Joinup default content +type: module +description: Provides exported content that can be imported on will in Joinup. +package: Custom +core: 8.x +core_version_requirement: ^8 || ^9 +dependencies: + - default_content diff --git a/web/modules/custom/joinup_default_content/joinup_default_content.module b/web/modules/custom/joinup_default_content/joinup_default_content.module new file mode 100644 index 0000000000..0ace7e4c9b --- /dev/null +++ b/web/modules/custom/joinup_default_content/joinup_default_content.module @@ -0,0 +1,10 @@ + Date: Mon, 4 Oct 2021 18:18:48 +0300 Subject: [PATCH 04/26] ISAICP-6694: Export all new common named about-us menu. --- ...ntuno_footer_menu.yml => block.block.aboutus.yml} | 12 +++++------- web/themes/ventuno/ventuno.theme | 10 +++++++++- 2 files changed, 14 insertions(+), 8 deletions(-) rename config/sync/{block.block.ventuno_footer_menu.yml => block.block.aboutus.yml} (55%) diff --git a/config/sync/block.block.ventuno_footer_menu.yml b/config/sync/block.block.aboutus.yml similarity index 55% rename from config/sync/block.block.ventuno_footer_menu.yml rename to config/sync/block.block.aboutus.yml index a13f083aa9..fdb6ddcc47 100644 --- a/config/sync/block.block.ventuno_footer_menu.yml +++ b/config/sync/block.block.aboutus.yml @@ -1,23 +1,21 @@ -uuid: 1acef884-058e-450c-bc67-505d3a3fd838 +uuid: 8f2ad8e0-8d6f-4885-a094-79f176363562 langcode: en status: true dependencies: config: - - system.menu.footer + - system.menu.footer-about-us module: - system theme: - ventuno -_core: - default_config_hash: IBAuorDvEPLpOEBTV6rOAnCmaW1fezbLLj0dtgQI2G0 -id: ventuno_footer_menu +id: aboutus theme: ventuno region: footer weight: -27 provider: null -plugin: 'system_menu_block:footer' +plugin: 'system_menu_block:footer-about-us' settings: - id: 'system_menu_block:footer' + id: 'system_menu_block:footer-about-us' label: 'About us' provider: system label_display: visible diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme index 4c9496b51e..f66c9c3a26 100644 --- a/web/themes/ventuno/ventuno.theme +++ b/web/themes/ventuno/ventuno.theme @@ -23,7 +23,15 @@ use Drupal\smart_trim\Truncate\TruncateHTML; * styled in the same way. */ function ventuno_theme_suggestions_menu_alter(array &$suggestions, array $variables) { - if (in_array($variables['menu_name'], ['footer', 'support'])) { + if (in_array($variables['menu_name'], [ + 'footer', + 'support', + 'footer-about-us', + 'footer-european-commission', + 'footer-follow-us', + 'footer-help-and-support', + 'footer-social-media', + ])) { $suggestions[] = 'menu__region_footer'; } } From eb9cfe730672db29079e5bcf34928ec2d3ac4b3c Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 18:19:19 +0300 Subject: [PATCH 05/26] ISAICP-6694: Export one twig for each menu. Is this required for all menus? --- ...stem-menu-block--footer-about-us.html.twig | 47 +++++++++++++++++++ ...lock--footer-european-commission.html.twig | 47 +++++++++++++++++++ ...tem-menu-block--footer-follow-us.html.twig | 47 +++++++++++++++++++ ...u-block--footer-help-and-support.html.twig | 47 +++++++++++++++++++ ...-menu-block--footer-social-media.html.twig | 47 +++++++++++++++++++ 5 files changed, 235 insertions(+) create mode 100644 web/themes/ventuno/templates/block/block--system-menu-block--footer-about-us.html.twig create mode 100644 web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig create mode 100644 web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig create mode 100644 web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig create mode 100644 web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-about-us.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-about-us.html.twig new file mode 100644 index 0000000000..d9cd5b6a80 --- /dev/null +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-about-us.html.twig @@ -0,0 +1,47 @@ +{# +/** + * @file + * Theme override to display a block. + * + * Available variables: + * - plugin_id: The ID of the block implementation. + * - label: The configured label of the block if visible. + * - configuration: A list of the block's configuration values. + * - label: The configured label for the block. + * - label_display: The display settings for the label. + * - provider: The module or other provider that provided this block plugin. + * - Block plugin specific settings will also be stored here. + * - content: The content of this block. + * - attributes: array of HTML attributes populated by modules, intended to + * be added to the main container tag of this template. + * - id: A valid HTML ID and guaranteed unique. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * + * @see template_preprocess_block() + */ +#} +{% + set classes = [ + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + 'col-md-3', + 'col-lg-2', + 'about-us-menu' + ] +%} + + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% block content %} + {{ content }} + {% endblock %} + diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig new file mode 100644 index 0000000000..d9cd5b6a80 --- /dev/null +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig @@ -0,0 +1,47 @@ +{# +/** + * @file + * Theme override to display a block. + * + * Available variables: + * - plugin_id: The ID of the block implementation. + * - label: The configured label of the block if visible. + * - configuration: A list of the block's configuration values. + * - label: The configured label for the block. + * - label_display: The display settings for the label. + * - provider: The module or other provider that provided this block plugin. + * - Block plugin specific settings will also be stored here. + * - content: The content of this block. + * - attributes: array of HTML attributes populated by modules, intended to + * be added to the main container tag of this template. + * - id: A valid HTML ID and guaranteed unique. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * + * @see template_preprocess_block() + */ +#} +{% + set classes = [ + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + 'col-md-3', + 'col-lg-2', + 'about-us-menu' + ] +%} + + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% block content %} + {{ content }} + {% endblock %} + diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig new file mode 100644 index 0000000000..d9cd5b6a80 --- /dev/null +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig @@ -0,0 +1,47 @@ +{# +/** + * @file + * Theme override to display a block. + * + * Available variables: + * - plugin_id: The ID of the block implementation. + * - label: The configured label of the block if visible. + * - configuration: A list of the block's configuration values. + * - label: The configured label for the block. + * - label_display: The display settings for the label. + * - provider: The module or other provider that provided this block plugin. + * - Block plugin specific settings will also be stored here. + * - content: The content of this block. + * - attributes: array of HTML attributes populated by modules, intended to + * be added to the main container tag of this template. + * - id: A valid HTML ID and guaranteed unique. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * + * @see template_preprocess_block() + */ +#} +{% + set classes = [ + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + 'col-md-3', + 'col-lg-2', + 'about-us-menu' + ] +%} + + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% block content %} + {{ content }} + {% endblock %} + diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig new file mode 100644 index 0000000000..d9cd5b6a80 --- /dev/null +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig @@ -0,0 +1,47 @@ +{# +/** + * @file + * Theme override to display a block. + * + * Available variables: + * - plugin_id: The ID of the block implementation. + * - label: The configured label of the block if visible. + * - configuration: A list of the block's configuration values. + * - label: The configured label for the block. + * - label_display: The display settings for the label. + * - provider: The module or other provider that provided this block plugin. + * - Block plugin specific settings will also be stored here. + * - content: The content of this block. + * - attributes: array of HTML attributes populated by modules, intended to + * be added to the main container tag of this template. + * - id: A valid HTML ID and guaranteed unique. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * + * @see template_preprocess_block() + */ +#} +{% + set classes = [ + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + 'col-md-3', + 'col-lg-2', + 'about-us-menu' + ] +%} + + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% block content %} + {{ content }} + {% endblock %} + diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig new file mode 100644 index 0000000000..d9cd5b6a80 --- /dev/null +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig @@ -0,0 +1,47 @@ +{# +/** + * @file + * Theme override to display a block. + * + * Available variables: + * - plugin_id: The ID of the block implementation. + * - label: The configured label of the block if visible. + * - configuration: A list of the block's configuration values. + * - label: The configured label for the block. + * - label_display: The display settings for the label. + * - provider: The module or other provider that provided this block plugin. + * - Block plugin specific settings will also be stored here. + * - content: The content of this block. + * - attributes: array of HTML attributes populated by modules, intended to + * be added to the main container tag of this template. + * - id: A valid HTML ID and guaranteed unique. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * + * @see template_preprocess_block() + */ +#} +{% + set classes = [ + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + 'col-md-3', + 'col-lg-2', + 'about-us-menu' + ] +%} + + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% block content %} + {{ content }} + {% endblock %} + From bbb29b3a21c9c55f74d0e19adb39bc8c3362b5a3 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 18:22:24 +0300 Subject: [PATCH 06/26] ISAICP-6694: Export an extra menu item. --- .../76705682-ed82-4cec-a30d-84e2bc31e43e.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml new file mode 100644 index 0000000000..0b0547275f --- /dev/null +++ b/web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml @@ -0,0 +1,40 @@ +_meta: + version: '1.0' + entity_type: menu_link_content + uuid: 76705682-ed82-4cec-a30d-84e2bc31e43e + bundle: menu_link_content + default_langcode: en +default: + enabled: + - + value: true + title: + - + value: 'ADMS-AP Validator' + menu_name: + - + value: footer-about-us + link: + - + uri: 'https://joinup.ec.europa.eu/adms-validator' + title: '' + options: + menu_link_destination: 0 + external: + - + value: false + rediscover: + - + value: false + weight: + - + value: 0 + expanded: + - + value: false + revision_translation_affected: + - + value: true + live_link: + - + value: false From c295d29e01721578373a2b3de807489b274746ac Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 18:35:20 +0300 Subject: [PATCH 07/26] ISAICP-6694: Add a tour link to the footer too. --- .../custom/joinup_tour/joinup_tour.links.menu.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/modules/custom/joinup_tour/joinup_tour.links.menu.yml b/web/modules/custom/joinup_tour/joinup_tour.links.menu.yml index 3f221943f4..a971566831 100644 --- a/web/modules/custom/joinup_tour/joinup_tour.links.menu.yml +++ b/web/modules/custom/joinup_tour/joinup_tour.links.menu.yml @@ -7,3 +7,13 @@ joinup_tour.support.tour: attributes: data-drupal-tour-link: true weight: -200 + +joinup_tour.support.footer-tour: + title: 'Take a tour' + menu_name: footer-help-and-support + url: 'internal:#' + class: Drupal\joinup_tour\Plugin\Menu\TourMenuLink + options: + attributes: + data-drupal-tour-link: true + weight: -200 From dc3dff9913fe5738968833243366b3c69a5265d6 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 21:42:43 +0300 Subject: [PATCH 08/26] ISAICP-6694: Allow moderators to edit the footer menus. --- config/sync/user.role.moderator.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/sync/user.role.moderator.yml b/config/sync/user.role.moderator.yml index c1fbd7b97c..ba3c9ff870 100644 --- a/config/sync/user.role.moderator.yml +++ b/config/sync/user.role.moderator.yml @@ -25,6 +25,11 @@ permissions: - 'administer collection ownership' - 'administer comments' - 'administer entity legal' + - 'administer footer-about-us menu items' + - 'administer footer-european-commission menu items' + - 'administer footer-follow-us menu items' + - 'administer footer-help-and-support menu items' + - 'administer footer-social-media menu items' - 'administer matomo integration' - 'administer nodes' - 'administer organic groups' From 090012ae35365e470a7d5d3e29ec551e6241e812 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 21:46:49 +0300 Subject: [PATCH 09/26] ISAICP-6694: Switch the 'Support menu' from admin toolbar to lead to the menu management page. --- web/modules/custom/joinup_core/joinup_core.links.menu.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web/modules/custom/joinup_core/joinup_core.links.menu.yml b/web/modules/custom/joinup_core/joinup_core.links.menu.yml index 5b68f7b718..82d4e81474 100644 --- a/web/modules/custom/joinup_core/joinup_core.links.menu.yml +++ b/web/modules/custom/joinup_core/joinup_core.links.menu.yml @@ -14,11 +14,9 @@ joinup_core.redirects: weight: 0 joinup_core.edit_support_menu: - title: 'Support menu' - route_name: entity.menu.edit_form - route_parameters: - menu: support - description: 'Allows to manage the user support menu.' + title: 'Menus' + route_name: entity.menu.collection + description: 'Allows users to manage menus.' parent: system.admin weight: 0 From 12f59815c88cfac71447d9a27244955f79fb2d9b Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Mon, 4 Oct 2021 21:54:01 +0300 Subject: [PATCH 10/26] ISAICP-6694: Codesniffs for the joinup_default_content module. --- .../joinup_default_content.info.yml | 3 ++- .../joinup_default_content.module | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 web/modules/custom/joinup_default_content/joinup_default_content.module diff --git a/web/modules/custom/joinup_default_content/joinup_default_content.info.yml b/web/modules/custom/joinup_default_content/joinup_default_content.info.yml index 4c9f853147..fb74f68d5c 100644 --- a/web/modules/custom/joinup_default_content/joinup_default_content.info.yml +++ b/web/modules/custom/joinup_default_content/joinup_default_content.info.yml @@ -4,5 +4,6 @@ description: Provides exported content that can be imported on will in Joinup. package: Custom core: 8.x core_version_requirement: ^8 || ^9 +php: 7.1 dependencies: - - default_content + - default_content:default_content diff --git a/web/modules/custom/joinup_default_content/joinup_default_content.module b/web/modules/custom/joinup_default_content/joinup_default_content.module deleted file mode 100644 index 0ace7e4c9b..0000000000 --- a/web/modules/custom/joinup_default_content/joinup_default_content.module +++ /dev/null @@ -1,10 +0,0 @@ - Date: Mon, 4 Oct 2021 23:00:03 +0300 Subject: [PATCH 11/26] ISAICP-6415: Update the patch version of the css import optimizer. --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 8701e77872..678972fb08 100644 --- a/composer.json +++ b/composer.json @@ -282,7 +282,7 @@ "Views exposed sort identifiers are not configurable @see https://www.drupal.org/project/drupal/issues/2897638": "https://www.drupal.org/files/issues/2020-09-06/2897638-33-8.9.x.patch", "Pass current route parameters to the confirmation form route @see https://www.drupal.org/project/drupal/issues/2901412": "https://www.drupal.org/files/issues/2020-02-25/2901412-13.patch", "Lazy services: support PHP7 return types in generate-proxy-class @see https://www.drupal.org/node/2919243": "https://www.drupal.org/files/issues/2919243-2.patch", - "CSS aggregation fails on many variations of @import @see https://www.drupal.org/project/drupal/issues/2936067": "https://git.drupalcode.org/project/drupal/-/merge_requests/241.diff", + "CSS aggregation fails on many variations of @import @see https://www.drupal.org/project/drupal/issues/2936067": "https://www.drupal.org/files/issues/2021-10-04/2936067-67-backport.patch", "Cache tags are not invalidated on revision delete @see https://www.drupal.org/project/drupal/issues/2945928": "https://www.drupal.org/files/issues/entity-cache_revision_deletion-2945928-2.patch", "Users w/o access to content should still have configurable access to the content URL @see https://www.drupal.org/project/drupal/issues/3008254": "https://www.drupal.org/files/issues/2019-12-03/3008254-19-8.8.x.patch", "Make it easier to trigger a tour @see https://www.drupal.org/project/drupal/issues/3012027": "https://www.drupal.org/files/issues/2018-11-07/3012027-2.patch", diff --git a/composer.lock b/composer.lock index fda1fadf83..5920249f10 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": "02b2d4ee27172c0331df5b65738eb035", + "content-hash": "cf6873f09baec3e36f41d81cfe6c7ad1", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -2953,7 +2953,7 @@ "Views exposed sort identifiers are not configurable @see https://www.drupal.org/project/drupal/issues/2897638": "https://www.drupal.org/files/issues/2020-09-06/2897638-33-8.9.x.patch", "Pass current route parameters to the confirmation form route @see https://www.drupal.org/project/drupal/issues/2901412": "https://www.drupal.org/files/issues/2020-02-25/2901412-13.patch", "Lazy services: support PHP7 return types in generate-proxy-class @see https://www.drupal.org/node/2919243": "https://www.drupal.org/files/issues/2919243-2.patch", - "CSS aggregation fails on many variations of @import @see https://www.drupal.org/project/drupal/issues/2936067": "https://git.drupalcode.org/project/drupal/-/merge_requests/241.diff", + "CSS aggregation fails on many variations of @import @see https://www.drupal.org/project/drupal/issues/2936067": "https://www.drupal.org/files/issues/2021-10-04/2936067-67-backport.patch", "Cache tags are not invalidated on revision delete @see https://www.drupal.org/project/drupal/issues/2945928": "https://www.drupal.org/files/issues/entity-cache_revision_deletion-2945928-2.patch", "Users w/o access to content should still have configurable access to the content URL @see https://www.drupal.org/project/drupal/issues/3008254": "https://www.drupal.org/files/issues/2019-12-03/3008254-19-8.8.x.patch", "Make it easier to trigger a tour @see https://www.drupal.org/project/drupal/issues/3012027": "https://www.drupal.org/files/issues/2018-11-07/3012027-2.patch", @@ -11206,7 +11206,7 @@ "reference": "master" }, "type": "library", - "time": "2020-08-03T19:59:39+00:00" + "time": "2020-11-25T21:59:37+00:00" }, { "name": "stack/builder", From de3f3f74b5fa5190b5842ebd47a0c0ce20b6dacc Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Tue, 5 Oct 2021 13:47:01 +0300 Subject: [PATCH 12/26] ISAICP-6694: Include the joinup_default_content and default_content in the installation procedures. --- resources/runner/dev.yml | 1 + resources/runner/drupal.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/resources/runner/dev.yml b/resources/runner/dev.yml index 05f4575f42..bf49161ebb 100644 --- a/resources/runner/dev.yml +++ b/resources/runner/dev.yml @@ -10,6 +10,7 @@ dev: - config_devel - config_update - dblog + - joinup_default_content - devel - field_ui - filecache diff --git a/resources/runner/drupal.yml b/resources/runner/drupal.yml index e6c1690c69..888aba9aa2 100644 --- a/resources/runner/drupal.yml +++ b/resources/runner/drupal.yml @@ -157,8 +157,10 @@ drupal: 'config_update', 'config_update_ui', 'dblog', + 'defautl_content', 'devel', 'filecache', + 'hal', 'joinup_cas_mock_server', 'og_ui', 'page_manager_ui', From 69fe86a5deb6d19124a53a4cd9595d7cf14255a6 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Tue, 5 Oct 2021 13:47:18 +0300 Subject: [PATCH 13/26] ISAICP-6694: Include the new menus in the access tests. --- tests/features/support/support_menu.feature | 23 +++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/features/support/support_menu.feature b/tests/features/support/support_menu.feature index 8e0c29004e..2a6d2c4dde 100644 --- a/tests/features/support/support_menu.feature +++ b/tests/features/support/support_menu.feature @@ -1,9 +1,9 @@ @api Feature: - As a moderator, in order to maintain the support dropdown, I am able to - administer the 'support' menu. + administer the 'support' menu. - As a user, I should see the the 'Take a tour' menu item only on pages that - are implementing tours. + are implementing tours. - As a moderator I can add custom menu items and disable default menu items. Scenario Outline: Moderators are not able to admin menus except support menu. @@ -24,13 +24,18 @@ Feature: But I should the link "Add link" Examples: - | menu | code | add link | - | admin | 403 | not see | - | footer | 403 | not see | - | main | 403 | not see | - | support | 200 | see | - | tools | 403 | not see | - | account | 403 | not see | + | menu | code | add link | + | admin | 403 | not see | + | footer | 403 | not see | + | main | 403 | not see | + | support | 200 | see | + | footer-about-us | 200 | see | + | footer-european-commission | 200 | see | + | footer-follow-us | 200 | see | + | footer-help-and-support | 200 | see | + | footer-social-media | 200 | see | + | tools | 403 | not see | + | account | 403 | not see | Scenario Outline: Test user support menu usage. From 146b787291a7a46d89ebc6be249d3dfe03afa96e Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Tue, 5 Oct 2021 20:40:10 +0300 Subject: [PATCH 14/26] ISAICP-6694: Convert the 'Contact Joinup Support' in a configuration link in order to insert the destination parameter. --- .../joinup_core/joinup_core.links.menu.yml | 7 ++++ .../cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml | 40 ------------------- 2 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml diff --git a/web/modules/custom/joinup_core/joinup_core.links.menu.yml b/web/modules/custom/joinup_core/joinup_core.links.menu.yml index 82d4e81474..a0d5082f76 100644 --- a/web/modules/custom/joinup_core/joinup_core.links.menu.yml +++ b/web/modules/custom/joinup_core/joinup_core.links.menu.yml @@ -34,6 +34,13 @@ joinup_core.support.contact: weight: -100 destination: true +joinup_core.support.homepage_contact: + title: 'Contact Joinup Support' + menu_name: footer-help-and-support + url: 'internal:/contact' + weight: -100 + destination: true + joinup_core.manage_media: title: 'Library' route_name: view.media.media_page_list diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml deleted file mode 100644 index aa5cfacf32..0000000000 --- a/web/modules/custom/joinup_default_content/content/menu_link_content/cdec3c57-1e0e-44c4-83a7-75df99730c5a.yml +++ /dev/null @@ -1,40 +0,0 @@ -_meta: - version: '1.0' - entity_type: menu_link_content - uuid: cdec3c57-1e0e-44c4-83a7-75df99730c5a - bundle: menu_link_content - default_langcode: en -default: - enabled: - - - value: true - title: - - - value: 'Contact Joinup Support' - menu_name: - - - value: footer-help-and-support - link: - - - uri: 'internal:/contact' - title: '' - options: - menu_link_destination: 0 - external: - - - value: false - rediscover: - - - value: true - weight: - - - value: -48 - expanded: - - - value: false - revision_translation_affected: - - - value: true - live_link: - - - value: false From 6191c2acdc3f9c5547a326c69744291f00b92db6 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Tue, 5 Oct 2021 20:46:00 +0300 Subject: [PATCH 15/26] ISAICP-6694: Fix the support menu test. --- tests/features/support/support_menu.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/features/support/support_menu.feature b/tests/features/support/support_menu.feature index 2a6d2c4dde..72e69c112d 100644 --- a/tests/features/support/support_menu.feature +++ b/tests/features/support/support_menu.feature @@ -47,8 +47,8 @@ Feature: When I am on the homepage Then I should not see the link "Guided tour" in the "Footer" - And I should see the link "Contact support" - Then I click "Contact support" + And I should see the link "Contact Joinup Support" + Then I click "Contact Joinup Support" And I fill in the following: | First name | Rufus | | Last name | Modric | From a56cf15fbda05a98b48203b577980a1561555670 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Tue, 5 Oct 2021 20:47:52 +0300 Subject: [PATCH 16/26] ISAICP-6694: Fix the site-menus test. --- tests/features/site_menus.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/features/site_menus.feature b/tests/features/site_menus.feature index 9117cc366b..fc61dffb02 100644 --- a/tests/features/site_menus.feature +++ b/tests/features/site_menus.feature @@ -29,7 +29,7 @@ Feature: Site menus When I am on the homepage # Todo: This should become "Contact Joinup Support" in the new theme. # Ref. https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-6694 - And I click "Contact support" in the Footer region + And I click "Contact Joinup Support" in the Footer region Then no menu items should be active in the "Header menu" menu # Collections menu item should be active when visiting a collection homepage. From b65b48e599aea5b91700b6cd6852ab20e34927f2 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Tue, 5 Oct 2021 20:49:03 +0300 Subject: [PATCH 17/26] ISAICP-6694: The joinup_default_content module is meant to be enabled. Enable it. --- config/sync/core.extension.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 1f2ae2fec0..2f2907a8fe 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -26,6 +26,7 @@ module: dashboard: 0 datetime: 0 datetime_range: 0 + default_content: 0 diff: 0 digital_size_formatter: 0 dpsi: 0 @@ -70,6 +71,7 @@ module: joinup_collection: 0 joinup_community_content: 0 joinup_core: 0 + joinup_default_content: 0 joinup_discussion: 0 joinup_document: 0 joinup_eulogin: 0 From d0247100ea816f754a6af5224a8008bd4bb39f7f Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Tue, 5 Oct 2021 22:15:36 +0300 Subject: [PATCH 18/26] ISAICP-6694: Provide a sample test for the footer menus. --- tests/features/menus/footer_menus.feature | 39 +++++++++++++++++++ .../{support => menus}/support_menu.feature | 0 .../{support => menus}/whats_new.feature | 0 3 files changed, 39 insertions(+) create mode 100644 tests/features/menus/footer_menus.feature rename tests/features/{support => menus}/support_menu.feature (100%) rename tests/features/{support => menus}/whats_new.feature (100%) diff --git a/tests/features/menus/footer_menus.feature b/tests/features/menus/footer_menus.feature new file mode 100644 index 0000000000..9232485e81 --- /dev/null +++ b/tests/features/menus/footer_menus.feature @@ -0,0 +1,39 @@ +@api +Feature: + As a moderator of the website + In order to present proper footer information to the user + I need to be able to manage the footer menus. + + Scenario: A moderator can see the footer menus in the 'Menus' item of the admin toolbar. + Given I am logged in as a moderator + And I am on the homepage + Then I should not see the link "Some random link" in the "Footer" + Then I should see the link "Menus" in the "Administration toolbar" + + When I click "Menus" in the "Administration toolbar" + Then I should see the heading "Menus" + And I should see the following lines of text: + | About us | + | European Commission | + | Follow us | + | Help and support | + | Social media | + | Support | + + When I click "Add link" in the "About us" row + And I fill in "Menu link title" with "Some random link" + And I fill in "Link" with "/collections" + And I press "Save" + Then I should see the success message "The menu link has been saved." + + When I am on the homepage + Then I should see the link "Some random link" in the "Footer" + + When I click "Menus" in the "Administration toolbar" + And I click "List links" in the "About us" row + And I click "Delete" in the "Some random link" row + And I press "Delete" + Then I should see the success message "The menu link Some random link has been deleted." + + When I am on the homepage + Then I should not see the link "Some random link" in the "Footer" diff --git a/tests/features/support/support_menu.feature b/tests/features/menus/support_menu.feature similarity index 100% rename from tests/features/support/support_menu.feature rename to tests/features/menus/support_menu.feature diff --git a/tests/features/support/whats_new.feature b/tests/features/menus/whats_new.feature similarity index 100% rename from tests/features/support/whats_new.feature rename to tests/features/menus/whats_new.feature From 4300428663afbb933ffae6b4339ec5dd1438fb66 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Wed, 6 Oct 2021 09:49:36 +0300 Subject: [PATCH 19/26] ISAICP-6694: Include a patch for the menu_link_destination module. --- composer.json | 3 +++ composer.lock | 66 +++++++++++++++++++++++++++++---------------------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index 6159db447c..50a2c1dfb5 100644 --- a/composer.json +++ b/composer.json @@ -313,6 +313,9 @@ "drupal/matomo_reporting_api": { "Ensure backward compatibility with Piwik @see https://www.drupal.org/project/matomo_reporting_api/issues/3080854": "https://www.drupal.org/files/issues/2019-09-18/3080854-7.patch" }, + "drupal/menu_link_destination": { + "Array to string conversion @see https://www.drupal.org/project/menu_link_destination/issues/3240983": "https://git.drupalcode.org/project/menu_link_destination/-/merge_requests/1.diff" + }, "drupal/message_digest": { "MessageDigestSubcontext is deprecated @see https://www.drupal.org/project/message_digest/issues/3168495": "https://www.drupal.org/files/issues/2020-09-01/3168495-2.patch" }, diff --git a/composer.lock b/composer.lock index 94bebc0b14..0da637f807 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": "cf6873f09baec3e36f41d81cfe6c7ad1", + "content-hash": "10f5f3122d7c8165ea53162cfd003820", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -2237,6 +2237,10 @@ { "name": "floretan", "homepage": "https://www.drupal.org/user/66163" + }, + { + "name": "nord102", + "homepage": "https://www.drupal.org/user/3471419" } ], "description": "Limit which text formats are available for each field instance.", @@ -2278,6 +2282,10 @@ "GPL-2.0+" ], "authors": [ + { + "name": "gaurav.kapoor", + "homepage": "https://www.drupal.org/user/3495331" + }, { "name": "mstef", "homepage": "https://www.drupal.org/user/107190" @@ -2450,7 +2458,7 @@ "datestamp": "1591462872", "security-coverage": { "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "message": "Alpha releases are not covered by Drupal security advisories." } } }, @@ -3903,7 +3911,7 @@ "extra": { "drupal": { "version": "8.x-1.4", - "datestamp": "1624457459", + "datestamp": "1624457496", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4997,7 +5005,7 @@ "extra": { "drupal": { "version": "8.x-5.0-beta12", - "datestamp": "1608957625", + "datestamp": "1632933670", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -5017,6 +5025,10 @@ "homepage": "https://stjerneman.com", "email": "emil@stjerneman.com", "role": "Maintainer" + }, + { + "name": "johnwebdev", + "homepage": "https://www.drupal.org/user/3331569" } ], "description": "Linkit - Enriched linking experience", @@ -5138,6 +5150,10 @@ { "name": "See other contributors", "homepage": "https://www.drupal.org/node/247808/committers" + }, + { + "name": "shelane", + "homepage": "https://www.drupal.org/user/2674989" } ], "description": "Adds Matomo javascript tracking code to all your site's pages", @@ -5295,6 +5311,9 @@ "status": "not-covered", "message": "Project has not opted into security advisory coverage!" } + }, + "patches_applied": { + "Array to string conversion @see https://www.drupal.org/project/menu_link_destination/issues/3240983": "https://git.drupalcode.org/project/menu_link_destination/-/merge_requests/1.diff" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -5863,6 +5882,10 @@ { "name": "phenaproxima", "homepage": "https://www.drupal.org/user/205645" + }, + { + "name": "tim.plunkett", + "homepage": "https://www.drupal.org/user/241634" } ], "description": "Provides a way to place blocks on a custom page.", @@ -7012,24 +7035,16 @@ "role": "Maintainer" }, { - "name": "chrisjlee", - "homepage": "https://www.drupal.org/user/760600" - }, - { - "name": "drywall", - "homepage": "https://www.drupal.org/user/192591" - }, - { - "name": "jsenich", - "homepage": "https://www.drupal.org/user/58871" + "name": "newsignature", + "homepage": "https://www.drupal.org/user/765518" }, { - "name": "markie", - "homepage": "https://www.drupal.org/user/206687" + "name": "ultimike", + "homepage": "https://www.drupal.org/user/51132" }, { - "name": "newsignature", - "homepage": "https://www.drupal.org/user/765518" + "name": "volkswagenchick", + "homepage": "https://www.drupal.org/user/3332522" } ], "description": "Provides a more robust alternative to 'summary or trimmed' textfield format.", @@ -7060,7 +7075,7 @@ "extra": { "drupal": { "version": "8.x-2.8", - "datestamp": "1615222638", + "datestamp": "1615222684", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -15169,9 +15184,6 @@ "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "patches_applied": { - "Add a Drush command for manipulating module info files @see https://www.drupal.org/project/config_devel/issues/2392929": "https://git.drupalcode.org/project/config_devel/-/merge_requests/4.diff" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -15390,8 +15402,7 @@ "homepage": "https://www.drupal.org/project/config_update", "support": { "source": "https://git.drupalcode.org/project/config_update" - }, - "time": "2020-11-06T21:01:03+00:00" + } }, { "name": "drupal/devel", @@ -15425,7 +15436,7 @@ "extra": { "drupal": { "version": "4.1.1", - "datestamp": "1609419527", + "datestamp": "1631968537", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -15642,8 +15653,7 @@ "support": { "source": "https://cgit.drupalcode.org/filecache", "issues": "https://drupal.org/project/issues/filecache" - }, - "time": "2019-09-19T12:07:17+00:00" + } }, { "name": "drupal/renderviz", @@ -15790,7 +15800,7 @@ "extra": { "drupal": { "version": "8.x-1.1", - "datestamp": "1601040732", + "datestamp": "1601040759", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" From 32676fa880f21a29fc19b921de8b95cd06495fe8 Mon Sep 17 00:00:00 2001 From: Ilias Dimopoulos Date: Fri, 8 Oct 2021 10:15:30 +0300 Subject: [PATCH 20/26] ISAICP-6694: hal module is required for the default content. --- config/sync/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 2f2907a8fe..cf9837fa7f 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -60,6 +60,7 @@ module: geocoder_field: 0 geocoder_geofield: 0 geofield: 0 + hal: 0 help: 0 honeypot: 0 iframe: 0 From 9b9ed4128ad4bd615cc1ec02e480d272a84d6c4b Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Fri, 15 Oct 2021 22:00:59 +0300 Subject: [PATCH 21/26] ISAICP-6694: Restore styling of the social media menu: place it underneath the Follow us menu, and replace text links with icons. --- config/sync/block.block.socialmedia.yml | 2 +- .../ventuno/src/scss/components/_footer.scss | 3 ++ ...tem-menu-block--footer-follow-us.html.twig | 4 +- ...-menu-block--footer-social-media.html.twig | 4 +- .../templates/layout/page--home.html.twig | 6 ++- .../ventuno/templates/layout/page.html.twig | 37 +++++++++++++- ...gion-footer--footer-social-media.html.twig | 51 +++++++++++++++++++ web/themes/ventuno/ventuno.theme | 34 +++++++++++++ 8 files changed, 131 insertions(+), 10 deletions(-) create mode 100644 web/themes/ventuno/templates/menu/menu--region-footer--footer-social-media.html.twig diff --git a/config/sync/block.block.socialmedia.yml b/config/sync/block.block.socialmedia.yml index 4ffba7662c..5a7c5751a2 100644 --- a/config/sync/block.block.socialmedia.yml +++ b/config/sync/block.block.socialmedia.yml @@ -18,7 +18,7 @@ settings: id: 'system_menu_block:footer-social-media' label: 'Social media' provider: system - label_display: visible + label_display: '0' level: 1 depth: 0 expand_all_items: false diff --git a/web/themes/ventuno/src/scss/components/_footer.scss b/web/themes/ventuno/src/scss/components/_footer.scss index 1908243e14..27f1e7cdaa 100644 --- a/web/themes/ventuno/src/scss/components/_footer.scss +++ b/web/themes/ventuno/src/scss/components/_footer.scss @@ -34,6 +34,9 @@ } // Move social network links on mobile to top + .social-media-menu.contextual-region { + position: unset; + } .social-networks { @include media-breakpoint-down(md) { position: absolute; diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig index d9cd5b6a80..7d358f4223 100644 --- a/web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-follow-us.html.twig @@ -30,9 +30,7 @@ 'block', 'block-' ~ configuration.provider|clean_class, 'block-' ~ plugin_id|clean_class, - 'col-md-3', - 'col-lg-2', - 'about-us-menu' + 'follow-us-menu' ] %} diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig index d9cd5b6a80..dcf9894cf0 100644 --- a/web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-social-media.html.twig @@ -30,9 +30,7 @@ 'block', 'block-' ~ configuration.provider|clean_class, 'block-' ~ plugin_id|clean_class, - 'col-md-3', - 'col-lg-2', - 'about-us-menu' + 'social-media-menu' ] %} diff --git a/web/themes/ventuno/templates/layout/page--home.html.twig b/web/themes/ventuno/templates/layout/page--home.html.twig index ba5e5ef917..e53fec601a 100644 --- a/web/themes/ventuno/templates/layout/page--home.html.twig +++ b/web/themes/ventuno/templates/layout/page--home.html.twig @@ -143,7 +143,11 @@

{{ version }}

- {{ page.footer }} + {{ page.footer|without('followus', 'socialmedia') }} +
+ {{ page.footer.followus }} + {{ page.footer.socialmedia }} +
diff --git a/web/themes/ventuno/templates/layout/page.html.twig b/web/themes/ventuno/templates/layout/page.html.twig index ff70c1692a..915b394fc2 100644 --- a/web/themes/ventuno/templates/layout/page.html.twig +++ b/web/themes/ventuno/templates/layout/page.html.twig @@ -42,8 +42,37 @@ #}
+ {# Temporary EC header, until this pattern is included in oe_bootstrap. #} +
+ +
{% if page.header_bottom %} @@ -89,7 +118,11 @@

{{ version }}

- {{ page.footer }} + {{ page.footer|without('followus', 'socialmedia') }} +
+ {{ page.footer.followus }} + {{ page.footer.socialmedia }} +
diff --git a/web/themes/ventuno/templates/menu/menu--region-footer--footer-social-media.html.twig b/web/themes/ventuno/templates/menu/menu--region-footer--footer-social-media.html.twig new file mode 100644 index 0000000000..a661314ab1 --- /dev/null +++ b/web/themes/ventuno/templates/menu/menu--region-footer--footer-social-media.html.twig @@ -0,0 +1,51 @@ +{# +/** + * @file + * Theme override to display the 'support' menu. + * + * Available variables: + * - menu_name: The machine name of the menu. + * - items: A nested list of menu items. Each menu item contains: + * - attributes: HTML attributes for the menu item. + * - below: The menu item child items. + * - title: The menu link title. + * - url: The menu link url, instance of \Drupal\Core\Url + * - localized_options: Menu link localized options. + * - is_expanded: TRUE if the link has visible children within the current + * menu tree. + * - is_collapsed: TRUE if the link has children within the current menu tree + * that are not currently visible. + * - in_active_trail: TRUE if the link is in the active trail. + * + * @ingroup themeable + */ +#} +{% import _self as menus %} + +{# +We call a macro which calls itself to render the full tree. +@see https://twig.symfony.com/doc/1.x/tags/macro.html +#} +{{ menus.menu_links(items, attributes, 0) }} + +{% macro menu_links(items, attributes, menu_level) %} + {% import _self as menus %} + {% if items %} + {% if menu_level == 0 %} + + {% else %} +
    + {% endif %} + {% for item in items %} +
  • + + + + {% if item.below %} + {{ menus.menu_links(item.below, attributes, menu_level + 1) }} + {% endif %} +
    • + {% endfor %} +
+ {% endif %} +{% endmacro %} diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme index f66c9c3a26..557dfc8eb9 100644 --- a/web/themes/ventuno/ventuno.theme +++ b/web/themes/ventuno/ventuno.theme @@ -7,6 +7,7 @@ declare(strict_types = 1); +use Drupal\Core\Menu\MenuLinkInterface; use Drupal\Core\Menu\MenuLinkTreeElement; use Drupal\Core\Menu\MenuTreeParameters; use Drupal\Core\Url; @@ -33,6 +34,7 @@ function ventuno_theme_suggestions_menu_alter(array &$suggestions, array $variab 'footer-social-media', ])) { $suggestions[] = 'menu__region_footer'; + $suggestions[] = 'menu__region_footer__' . str_replace('-', '_', $variables['menu_name']); } } @@ -214,6 +216,38 @@ function ventuno_preprocess_rdf_entity__explore_item(&$variables) { $variables['label'] = ventuno_smart_trim($entity->label(), 74); } +/** + * Implements template_preprocess_menu(). + */ +function ventuno_preprocess_menu(&$variables) { + // Set a class on each link in the social media footer menu, so that the link + // text can be replaced with an icon. + if ($variables['menu_name'] === 'footer-social-media') { + _ventuno_preprocess_menu_items($variables['items']); + } +} + +/** + * Helper function to recursively set a class on each menu item. + * + * These classes identify the social media links so we can replace them with + * icons. Used for the links to Twitter and LinkedIn. + */ +function _ventuno_preprocess_menu_items(&$items) { + foreach ($items as $item) { + /** @var \Drupal\Core\Menu\MenuLinkDefault $menu_link */ + $menu_link = isset($item['original_link']) ? $item['original_link'] : NULL; + if ($menu_link instanceof MenuLinkInterface) { + $title = strtolower(trim($menu_link->getTitle())); + $machine_name = preg_replace('/[^a-z0-9-]+/', '-', $title); + $item['attributes']->setAttribute('class', $machine_name); + } + if (!empty($item['below'])) { + _ventuno_preprocess_menu_items($item['below']); + } + } +} + /** * Performs smart trimming on the provided string. * From 9a9cb1b8989df510aef29fc42253023222171154 Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Fri, 15 Oct 2021 22:01:17 +0300 Subject: [PATCH 22/26] ISAICP-6694: Fix typo. --- resources/runner/drupal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/runner/drupal.yml b/resources/runner/drupal.yml index 888aba9aa2..877758fa79 100644 --- a/resources/runner/drupal.yml +++ b/resources/runner/drupal.yml @@ -157,7 +157,7 @@ drupal: 'config_update', 'config_update_ui', 'dblog', - 'defautl_content', + 'default_content', 'devel', 'filecache', 'hal', From 0fa471b5c37868613fabdcf48fe5ba72edf3d889 Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Fri, 15 Oct 2021 22:01:40 +0300 Subject: [PATCH 23/26] ISAICP-6694: Update documentation. --- tests/features/menus/support_menu.feature | 6 ++---- tests/features/site_menus.feature | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/features/menus/support_menu.feature b/tests/features/menus/support_menu.feature index 72e69c112d..498e968b06 100644 --- a/tests/features/menus/support_menu.feature +++ b/tests/features/menus/support_menu.feature @@ -1,9 +1,7 @@ @api Feature: - - As a moderator, in order to maintain the support dropdown, I am able to - administer the 'support' menu. - - As a user, I should see the the 'Take a tour' menu item only on pages that - are implementing tours. + - As a moderator, in order to maintain the support dropdown, I am able to administer the 'support' menu. + - As a user, I should see the the 'Take a tour' menu item only on pages that are implementing tours. - As a moderator I can add custom menu items and disable default menu items. Scenario Outline: Moderators are not able to admin menus except support menu. diff --git a/tests/features/site_menus.feature b/tests/features/site_menus.feature index fc61dffb02..58e7a6129d 100644 --- a/tests/features/site_menus.feature +++ b/tests/features/site_menus.feature @@ -27,8 +27,6 @@ Feature: Site menus | Firecrakers list | Check the list first. | Hungry Firecracker | validated | When I am on the homepage - # Todo: This should become "Contact Joinup Support" in the new theme. - # Ref. https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-6694 And I click "Contact Joinup Support" in the Footer region Then no menu items should be active in the "Header menu" menu From 3eefb03f20b5f7650bb6b6560f0cb1e95e7c43a1 Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Fri, 15 Oct 2021 22:02:01 +0300 Subject: [PATCH 24/26] ISAICP-6694: Remove duplicate menu. --- .../76705682-ed82-4cec-a30d-84e2bc31e43e.yml | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml diff --git a/web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml b/web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml deleted file mode 100644 index 0b0547275f..0000000000 --- a/web/modules/custom/joinup_default_content/content/menu_link_content/76705682-ed82-4cec-a30d-84e2bc31e43e.yml +++ /dev/null @@ -1,40 +0,0 @@ -_meta: - version: '1.0' - entity_type: menu_link_content - uuid: 76705682-ed82-4cec-a30d-84e2bc31e43e - bundle: menu_link_content - default_langcode: en -default: - enabled: - - - value: true - title: - - - value: 'ADMS-AP Validator' - menu_name: - - - value: footer-about-us - link: - - - uri: 'https://joinup.ec.europa.eu/adms-validator' - title: '' - options: - menu_link_destination: 0 - external: - - - value: false - rediscover: - - - value: false - weight: - - - value: 0 - expanded: - - - value: false - revision_translation_affected: - - - value: true - live_link: - - - value: false From 55779e5b297f75a5a37e019e378da96a552b095e Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Fri, 15 Oct 2021 22:02:28 +0300 Subject: [PATCH 25/26] ISAICP-6694: Explain a bit more in detail how default content works. --- .../joinup_default_content/joinup_default_content.info.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/modules/custom/joinup_default_content/joinup_default_content.info.yml b/web/modules/custom/joinup_default_content/joinup_default_content.info.yml index fb74f68d5c..430eafe637 100644 --- a/web/modules/custom/joinup_default_content/joinup_default_content.info.yml +++ b/web/modules/custom/joinup_default_content/joinup_default_content.info.yml @@ -1,8 +1,7 @@ name: Joinup default content type: module -description: Provides exported content that can be imported on will in Joinup. +description: Provides exported content that will be imported in Joinup when the module is enabled. package: Custom -core: 8.x core_version_requirement: ^8 || ^9 php: 7.1 dependencies: From 25b6ddd38410665e5395390ecb97178d3f73401b Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Fri, 15 Oct 2021 22:02:50 +0300 Subject: [PATCH 26/26] ISAICP-6694: Restore exact styling of the footer menus. --- ...k--system-menu-block--footer-european-commission.html.twig | 4 ++-- ...lock--system-menu-block--footer-help-and-support.html.twig | 2 +- .../block/block--system-menu-block--footer.html.twig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig index d9cd5b6a80..aaa21f23a9 100644 --- a/web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-european-commission.html.twig @@ -31,8 +31,8 @@ 'block-' ~ configuration.provider|clean_class, 'block-' ~ plugin_id|clean_class, 'col-md-3', - 'col-lg-2', - 'about-us-menu' + 'col-lg-3', + 'european-commission-menu' ] %} diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig index d9cd5b6a80..09723fef67 100644 --- a/web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer-help-and-support.html.twig @@ -32,7 +32,7 @@ 'block-' ~ plugin_id|clean_class, 'col-md-3', 'col-lg-2', - 'about-us-menu' + 'help-and-support-menu' ] %} diff --git a/web/themes/ventuno/templates/block/block--system-menu-block--footer.html.twig b/web/themes/ventuno/templates/block/block--system-menu-block--footer.html.twig index d9cd5b6a80..71e2ce13db 100644 --- a/web/themes/ventuno/templates/block/block--system-menu-block--footer.html.twig +++ b/web/themes/ventuno/templates/block/block--system-menu-block--footer.html.twig @@ -32,7 +32,7 @@ 'block-' ~ plugin_id|clean_class, 'col-md-3', 'col-lg-2', - 'about-us-menu' + 'footer-menu' ] %}