From b52a06fe9a44348b21a085fee6084c5289962ebc Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Mon, 20 Jun 2022 16:50:00 +0200 Subject: [PATCH 01/17] OEL-1662: Add patch to updated oe_starter_content with new event registration url field. --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 38df8c77..6c34813c 100644 --- a/composer.json +++ b/composer.json @@ -94,6 +94,9 @@ "patches": { "drupal/entity_reference_revisions": { "https://www.drupal.org/project/entity_reference_revisions/issues/2937835": "https://www.drupal.org/files/issues/2021-03-26/entity_reference_revisions-field_formatter_label-2937835-36.patch" + }, + "openeuropa/oe_starter_content": { + "latest": "https://github.com/openeuropa/oe_starter_content/compare/1.0.0-beta1..OEL-1662.diff" } }, "drupal-scaffold": { -- GitLab From 849c1eddcc20cf1e95c22a502eb4f7e456bc3bf8 Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Mon, 20 Jun 2022 17:11:14 +0200 Subject: [PATCH 02/17] OEL-1662: Post update to add event registration url field to full content view. --- ...ity_view_display.node.oe_sc_event.full.yml | 14 +++ ...ity_view_display.node.oe_sc_event.full.yml | 85 +++++++++++++++++++ ...e_whitelabel_starter_event.post_update.php | 13 +++ 3 files changed, 112 insertions(+) mode change 100755 => 100644 modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml create mode 100644 modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml old mode 100755 new mode 100644 index ebe638c0..9f0c7a6d --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml @@ -8,10 +8,12 @@ dependencies: - field.field.node.oe_sc_event.oe_featured_media - field.field.node.oe_sc_event.oe_sc_event_dates - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_sc_event_registration_url - field.field.node.oe_sc_event.oe_summary - node.type.oe_sc_event module: - daterange_compact + - oe_starter_content_event - oe_whitelabel_helper - text - user @@ -57,6 +59,18 @@ content: third_party_settings: { } weight: 2 region: content + oe_sc_event_registration_url: + type: event_link_external + label: above + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: 5 + region: content hidden: langcode: true oe_content_content_owner: true diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml new file mode 100644 index 00000000..fd775aef --- /dev/null +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml @@ -0,0 +1,85 @@ +uuid: afb9cc2b-4f04-456e-a129-992427b532e3 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.full + - field.field.node.oe_sc_event.body + - field.field.node.oe_sc_event.oe_documents + - field.field.node.oe_sc_event.oe_featured_media + - field.field.node.oe_sc_event.oe_sc_event_dates + - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_sc_event_registration_url + - field.field.node.oe_sc_event.oe_summary + - node.type.oe_sc_event + module: + - datetime_range + - oe_starter_content_event + - oe_whitelabel_helper + - text + - user +id: node.oe_sc_event.full +targetEntityType: node +bundle: oe_sc_event +mode: full +content: + body: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 0 + region: content + links: + settings: { } + third_party_settings: { } + weight: 4 + region: content + oe_documents: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 3 + region: content + oe_sc_event_dates: + type: daterange_default + label: inline + settings: + timezone_override: '' + format_type: oe_whitelabel_starter_event_date + separator: to + third_party_settings: { } + weight: 1 + region: content + oe_sc_event_location: + type: oe_whitelabel_helper_address_inline + label: inline + settings: + delimiter: ', ' + third_party_settings: { } + weight: 2 + region: content + oe_sc_event_registration_url: + type: event_link_external + label: above + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: 5 + region: content +hidden: + langcode: true + oe_content_content_owner: true + oe_content_legacy_link: true + oe_content_navigation_title: true + oe_content_short_title: true + oe_featured_media: true + oe_summary: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php index 817165f1..50fdbe99 100644 --- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php +++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php @@ -31,3 +31,16 @@ function oe_whitelabel_starter_event_post_update_00002(): void { ]; ConfigImporter::importMultiple('module', 'oe_whitelabel_starter_event', '/config/post_updates/00002_event_date_show_time', $configs); } + +/** + * Add registration URL field to full content view. + */ +function oe_whitelabel_starter_event_post_update_00003(): void { + ConfigImporter::importSingle( + 'module', + 'oe_whitelabel_starter_event', + '/config/post_updates/00003_add_registration_url_field', + 'core.entity_view_display.node.oe_sc_event.full', + TRUE + ); +} -- GitLab From 6ca6ee235682ddb13beaf18cd4200778d1689b06 Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 21 Jun 2022 11:32:03 +0200 Subject: [PATCH 03/17] OEL-1662: Add register button template. --- ...de--oe-sc-event-registration-url.html.twig | 25 +++++++++++++++++++ ...oe-sc-event--oe-w-content-banner.html.twig | 1 + 2 files changed, 26 insertions(+) create mode 100644 templates/content/field--node--oe-sc-event-registration-url.html.twig diff --git a/templates/content/field--node--oe-sc-event-registration-url.html.twig b/templates/content/field--node--oe-sc-event-registration-url.html.twig new file mode 100644 index 00000000..bf8a8dd8 --- /dev/null +++ b/templates/content/field--node--oe-sc-event-registration-url.html.twig @@ -0,0 +1,25 @@ +{# +/** + * @file + * Event registration button display. + */ +#} +<div class="container"> + <div class="row"> + <div class="col-8 col-md-4 col-lg-3 offset-2 offset-md-0"> + {% set button %} + {{ pattern('button', { + 'label': 'Register'|t, + 'icon': 'calendar-check', + 'icon_position': 'before', + }) }} + {% endset %} + {% set _attributes = element[0]['#options']['attributes'] %} + {{ pattern('link', { + 'label': button, + 'path': element[0]['#url'].toString(), + 'attributes': _attributes, + }) }} + </div> + </div> +</div> diff --git a/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig b/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig index 40436ebb..a999a4d9 100755 --- a/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig +++ b/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig @@ -11,4 +11,5 @@ content: content.oe_summary, image: image, }) }} + {{ content.oe_sc_event_registration_url }} </div> -- GitLab From 6c0e25379699155f170bc3041adf584baeaa154e Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 21 Jun 2022 12:41:45 +0200 Subject: [PATCH 04/17] OEL-1662: Adapt configs after moving the button template to the content banner. --- ...ity_view_display.node.oe_sc_event.full.yml | 14 +---- ...y.node.oe_sc_event.oe_w_content_banner.yml | 15 +++++ ...y_view_display.node.oe_sc_event.teaser.yml | 2 + ...ity_view_display.node.oe_sc_event.full.yml | 15 +---- ...y.node.oe_sc_event.oe_w_content_banner.yml | 62 +++++++++++++++++++ ...y_view_display.node.oe_sc_event.teaser.yml | 59 ++++++++++++++++++ ...e_whitelabel_starter_event.post_update.php | 11 +++- 7 files changed, 148 insertions(+), 30 deletions(-) create mode 100644 modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml create mode 100755 modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml index 9f0c7a6d..56b965dc 100644 --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml @@ -13,7 +13,6 @@ dependencies: - node.type.oe_sc_event module: - daterange_compact - - oe_starter_content_event - oe_whitelabel_helper - text - user @@ -59,18 +58,6 @@ content: third_party_settings: { } weight: 2 region: content - oe_sc_event_registration_url: - type: event_link_external - label: above - settings: - trim_length: 80 - url_only: false - url_plain: false - rel: '' - target: '' - third_party_settings: { } - weight: 5 - region: content hidden: langcode: true oe_content_content_owner: true @@ -78,5 +65,6 @@ hidden: oe_content_navigation_title: true oe_content_short_title: true oe_featured_media: true + oe_sc_event_registration_url: true oe_summary: true search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml index f6d0cd2a..d83b985f 100644 --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml @@ -8,10 +8,12 @@ dependencies: - field.field.node.oe_sc_event.oe_featured_media - field.field.node.oe_sc_event.oe_sc_event_dates - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_sc_event_registration_url - field.field.node.oe_sc_event.oe_summary - node.type.oe_sc_event module: - oe_content_featured_media_field + - oe_starter_content_event - text - user id: node.oe_sc_event.oe_w_content_banner @@ -27,6 +29,18 @@ content: third_party_settings: { } weight: 1 region: content + oe_sc_event_registration_url: + type: event_link_external + label: above + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: 2 + region: content oe_summary: type: text_default label: hidden @@ -45,3 +59,4 @@ hidden: oe_documents: true oe_sc_event_dates: true oe_sc_event_location: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml index 22910d1f..ed5738e0 100755 --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml @@ -8,6 +8,7 @@ dependencies: - field.field.node.oe_sc_event.oe_featured_media - field.field.node.oe_sc_event.oe_sc_event_dates - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_sc_event_registration_url - field.field.node.oe_sc_event.oe_summary - node.type.oe_sc_event module: @@ -52,4 +53,5 @@ hidden: oe_content_short_title: true oe_documents: true oe_featured_media: true + oe_sc_event_registration_url: true search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml index fd775aef..91889ecf 100644 --- a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml @@ -1,4 +1,3 @@ -uuid: afb9cc2b-4f04-456e-a129-992427b532e3 langcode: en status: true dependencies: @@ -14,7 +13,6 @@ dependencies: - node.type.oe_sc_event module: - datetime_range - - oe_starter_content_event - oe_whitelabel_helper - text - user @@ -62,18 +60,6 @@ content: third_party_settings: { } weight: 2 region: content - oe_sc_event_registration_url: - type: event_link_external - label: above - settings: - trim_length: 80 - url_only: false - url_plain: false - rel: '' - target: '' - third_party_settings: { } - weight: 5 - region: content hidden: langcode: true oe_content_content_owner: true @@ -81,5 +67,6 @@ hidden: oe_content_navigation_title: true oe_content_short_title: true oe_featured_media: true + oe_sc_event_registration_url: true oe_summary: true search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml new file mode 100644 index 00000000..d83b985f --- /dev/null +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml @@ -0,0 +1,62 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.oe_w_content_banner + - field.field.node.oe_sc_event.body + - field.field.node.oe_sc_event.oe_documents + - field.field.node.oe_sc_event.oe_featured_media + - field.field.node.oe_sc_event.oe_sc_event_dates + - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_sc_event_registration_url + - field.field.node.oe_sc_event.oe_summary + - node.type.oe_sc_event + module: + - oe_content_featured_media_field + - oe_starter_content_event + - text + - user +id: node.oe_sc_event.oe_w_content_banner +targetEntityType: node +bundle: oe_sc_event +mode: oe_w_content_banner +content: + oe_featured_media: + type: oe_featured_media_label + label: hidden + settings: + link: true + third_party_settings: { } + weight: 1 + region: content + oe_sc_event_registration_url: + type: event_link_external + label: above + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: 2 + region: content + oe_summary: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 0 + region: content +hidden: + body: true + langcode: true + links: true + oe_content_content_owner: true + oe_content_legacy_link: true + oe_content_navigation_title: true + oe_content_short_title: true + oe_documents: true + oe_sc_event_dates: true + oe_sc_event_location: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml new file mode 100755 index 00000000..4ebc0631 --- /dev/null +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml @@ -0,0 +1,59 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.teaser + - field.field.node.oe_sc_event.body + - field.field.node.oe_sc_event.oe_documents + - field.field.node.oe_sc_event.oe_featured_media + - field.field.node.oe_sc_event.oe_sc_event_dates + - field.field.node.oe_sc_event.oe_sc_event_location + - field.field.node.oe_sc_event.oe_sc_event_registration_url + - field.field.node.oe_sc_event.oe_summary + - node.type.oe_sc_event + module: + - address + - datetime_range + - text + - user +id: node.oe_sc_event.teaser +targetEntityType: node +bundle: oe_sc_event +mode: teaser +content: + oe_sc_event_dates: + type: daterange_default + label: hidden + settings: + timezone_override: '' + format_type: oe_whitelabel_starter_event_date + separator: to + third_party_settings: { } + weight: 4 + region: content + oe_sc_event_location: + type: address_default + label: hidden + settings: { } + third_party_settings: { } + weight: 5 + region: content + oe_summary: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 2 + region: content +hidden: + body: true + langcode: true + links: true + oe_content_content_owner: true + oe_content_legacy_link: true + oe_content_navigation_title: true + oe_content_short_title: true + oe_documents: true + oe_featured_media: true + oe_sc_event_registration_url: true + search_api_excerpt: true diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php index 50fdbe99..9e4162cb 100644 --- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php +++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php @@ -33,14 +33,19 @@ function oe_whitelabel_starter_event_post_update_00002(): void { } /** - * Add registration URL field to full content view. + * Add registration URL field to event content_banner view. */ function oe_whitelabel_starter_event_post_update_00003(): void { - ConfigImporter::importSingle( + $configs = [ + 'core.entity_view_display.node.oe_sc_event.full', + 'core.entity_view_display.node.oe_sc_event.oe_w_content_banner', + 'core.entity_view_display.node.oe_sc_event.teaser', + ]; + ConfigImporter::importMultiple( 'module', 'oe_whitelabel_starter_event', '/config/post_updates/00003_add_registration_url_field', - 'core.entity_view_display.node.oe_sc_event.full', + $configs, TRUE ); } -- GitLab From 040389a2fee4ac387acd316820185960f3f7a433 Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 21 Jun 2022 12:51:46 +0200 Subject: [PATCH 05/17] OEL-1662: Testing register button. --- tests/src/Functional/ContentEventRenderTest.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php index 68c3cf55..ed46836b 100644 --- a/tests/src/Functional/ContentEventRenderTest.php +++ b/tests/src/Functional/ContentEventRenderTest.php @@ -80,6 +80,12 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase { trim($content_banner->filter('.oe-sc-event__oe-summary')->text()) ); + // Assert registration button. + $link = $crawler->filter('div.container > div.row > div.col-8 > a[target="_blank"]'); + $this->assertCount(1, $link); + $this->assertStringContainsString('Register', $link->text()); + $this->assertStringContainsString('calendar-check', $link->html()); + $date = $crawler->filter('dl > dd'); // Assert event dates starting and ending same day. @@ -237,6 +243,7 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase { ]); $node->set('oe_documents', [$media_document]); $node->set('oe_featured_media', [$media_image]); + $node->set('oe_sc_event_registration_url', 'https://europa.eu'); $node->save(); return $node; } -- GitLab From 2f6d743c682e28b3ee74fb47d40ef2368c0f8050 Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Thu, 23 Jun 2022 12:22:23 +0200 Subject: [PATCH 06/17] OEL-1662: Added formatter to the helper submodule instead oe_starter_content. --- .../schema/oe_whitelabel_helper.schema.yml | 19 +++++++++ .../FieldFormatter/ExternalLinkFormatter.php | 40 +++++++++++++++++++ ...y.node.oe_sc_event.oe_w_content_banner.yml | 2 +- ...y.node.oe_sc_event.oe_w_content_banner.yml | 2 +- 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php diff --git a/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml b/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml index 2f171640..4cec5805 100644 --- a/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml +++ b/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml @@ -23,3 +23,22 @@ field_group.field_group_formatter_plugin.oe_whitelabel_helper_pattern_base: field_group.field_group_formatter_plugin.oe_whitelabel_helper_description_list_pattern: type: field_group.field_group_formatter_plugin.oe_whitelabel_helper_pattern_base label: 'Mapping for the description list pattern formatter settings' +field.formatter.settings.external_link: + type: mapping + label: 'Link format settings' + mapping: + trim_length: + type: integer + label: 'Trim link text length' + url_only: + type: boolean + label: 'URL only' + url_plain: + type: boolean + label: 'Show URL as plain text' + rel: + type: string + label: 'Add rel="nofollow" to links' + target: + type: string + label: 'Open link in new window' diff --git a/modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php b/modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php new file mode 100644 index 00000000..8aa9b2a6 --- /dev/null +++ b/modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php @@ -0,0 +1,40 @@ +<?php + +declare(strict_types = 1); + +namespace Drupal\oe_whitelabel_helper\Plugin\Field\FieldFormatter; + +use Drupal\Core\Field\FieldItemListInterface; +use Drupal\link\Plugin\Field\FieldFormatter\LinkFormatter; + +/** + * Plugin implementation of the 'external_link' formatter. + * + * @FieldFormatter( + * id = "external_link", + * label = @Translation("Force external links to open in new tab"), + * field_types = { + * "link" + * } + * ) + */ +class ExternalLinkFormatter extends LinkFormatter { + + /** + * {@inheritdoc} + */ + public function viewElements(FieldItemListInterface $items, $langcode) { + $element = parent::viewElements($items, $langcode); + + foreach ($items as $delta => $item) { + $url = $this->buildUrl($item); + + if ($url->isExternal()) { + $element[$delta]['#options']['attributes']['target'] = '_blank'; + } + } + + return $element; + } + +} diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml index d83b985f..67e22a0d 100644 --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml @@ -30,7 +30,7 @@ content: weight: 1 region: content oe_sc_event_registration_url: - type: event_link_external + type: external_link label: above settings: trim_length: 80 diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml index d83b985f..67e22a0d 100644 --- a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml @@ -30,7 +30,7 @@ content: weight: 1 region: content oe_sc_event_registration_url: - type: event_link_external + type: external_link label: above settings: trim_length: 80 -- GitLab From e02a75f5a53a0c194357b4983358d69fd94eac7c Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Thu, 23 Jun 2022 12:22:48 +0200 Subject: [PATCH 07/17] OEL-1662: Move register button inside the content banner. --- ...de--oe-sc-event-registration-url.html.twig | 33 ++++++++----------- ...oe-sc-event--oe-w-content-banner.html.twig | 7 ++-- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/templates/content/field--node--oe-sc-event-registration-url.html.twig b/templates/content/field--node--oe-sc-event-registration-url.html.twig index bf8a8dd8..96d4e218 100644 --- a/templates/content/field--node--oe-sc-event-registration-url.html.twig +++ b/templates/content/field--node--oe-sc-event-registration-url.html.twig @@ -4,22 +4,17 @@ * Event registration button display. */ #} -<div class="container"> - <div class="row"> - <div class="col-8 col-md-4 col-lg-3 offset-2 offset-md-0"> - {% set button %} - {{ pattern('button', { - 'label': 'Register'|t, - 'icon': 'calendar-check', - 'icon_position': 'before', - }) }} - {% endset %} - {% set _attributes = element[0]['#options']['attributes'] %} - {{ pattern('link', { - 'label': button, - 'path': element[0]['#url'].toString(), - 'attributes': _attributes, - }) }} - </div> - </div> -</div> +{% set button %} + {{ pattern('button', { + 'label': 'Register'|t, + 'icon': 'calendar-check', + 'icon_position': 'before', + }) }} +{% endset %} +{% set _attributes = element[0]['#options']['attributes'] %} +{{ pattern('link', { + 'label': button, + 'path': element[0]['#url'].toString(), + 'attributes': _attributes, +}) }} + diff --git a/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig b/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig index a999a4d9..43185dca 100755 --- a/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig +++ b/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig @@ -4,12 +4,15 @@ * Event content banner display. */ #} +{% set _content %} + {{ content.oe_summary }} + {{ content.oe_sc_event_registration_url }} +{% endset %} <div{{attributes}}> {{ pattern('content_banner', { background: 'gray', title: label, - content: content.oe_summary, + content: _content, image: image, }) }} - {{ content.oe_sc_event_registration_url }} </div> -- GitLab From f35c81e98e1476c0b6a165e9f6885b0c6504b9aa Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Thu, 23 Jun 2022 12:23:30 +0200 Subject: [PATCH 08/17] OEL-1662: Adapt testing to new register button position inside content banner. --- tests/src/Functional/ContentEventRenderTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php index ed46836b..8c19e410 100644 --- a/tests/src/Functional/ContentEventRenderTest.php +++ b/tests/src/Functional/ContentEventRenderTest.php @@ -81,10 +81,11 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase { ); // Assert registration button. - $link = $crawler->filter('div.container > div.row > div.col-8 > a[target="_blank"]'); + $link = $crawler->filter('.bcl-content-banner a[target="_blank"]'); $this->assertCount(1, $link); - $this->assertStringContainsString('Register', $link->text()); - $this->assertStringContainsString('calendar-check', $link->html()); + $button = $link->filter('button'); + $this->assertStringContainsString('Register', $button->text()); + $this->assertStringContainsString('calendar-check', $button->html()); $date = $crawler->filter('dl > dd'); -- GitLab From ac0213ac626ed36cf53200560b2131532e02854d Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Thu, 23 Jun 2022 15:53:00 +0200 Subject: [PATCH 09/17] OEL-1662: Added margin between the content and the button (mt-4). --- ...de--oe-sc-event-registration-url.html.twig | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/templates/content/field--node--oe-sc-event-registration-url.html.twig b/templates/content/field--node--oe-sc-event-registration-url.html.twig index 96d4e218..7d554f1d 100644 --- a/templates/content/field--node--oe-sc-event-registration-url.html.twig +++ b/templates/content/field--node--oe-sc-event-registration-url.html.twig @@ -4,17 +4,18 @@ * Event registration button display. */ #} -{% set button %} - {{ pattern('button', { - 'label': 'Register'|t, - 'icon': 'calendar-check', - 'icon_position': 'before', +<div class="mt-4"> + {% set button %} + {{ pattern('button', { + 'label': 'Register'|t, + 'icon': 'calendar-check', + 'icon_position': 'before', + }) }} + {% endset %} + {% set _attributes = element[0]['#options']['attributes'] %} + {{ pattern('link', { + 'label': button, + 'path': element[0]['#url'].toString(), + 'attributes': _attributes, }) }} -{% endset %} -{% set _attributes = element[0]['#options']['attributes'] %} -{{ pattern('link', { - 'label': button, - 'path': element[0]['#url'].toString(), - 'attributes': _attributes, -}) }} - +</div> -- GitLab From 8dcec3e7126c7fb1081b4a4b8d41b3202157fb7a Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 12 Jul 2022 10:57:56 +0200 Subject: [PATCH 10/17] OEL-1662: Rename post_update folder. --- .../core.entity_view_display.node.oe_sc_event.full.yml | 0 ...e.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml | 0 .../core.entity_view_display.node.oe_sc_event.teaser.yml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename modules/oe_whitelabel_starter_event/config/post_updates/{00002_add_registration_url_field => 00003_add_registration_url_field}/core.entity_view_display.node.oe_sc_event.full.yml (100%) rename modules/oe_whitelabel_starter_event/config/post_updates/{00002_add_registration_url_field => 00003_add_registration_url_field}/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml (100%) rename modules/oe_whitelabel_starter_event/config/post_updates/{00002_add_registration_url_field => 00003_add_registration_url_field}/core.entity_view_display.node.oe_sc_event.teaser.yml (100%) diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml similarity index 100% rename from modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml rename to modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml similarity index 100% rename from modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml rename to modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml similarity index 100% rename from modules/oe_whitelabel_starter_event/config/post_updates/00002_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml rename to modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml -- GitLab From 3265b426ebd6f7ee4d716f51249ca9970a0b7117 Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 12 Jul 2022 18:32:39 +0200 Subject: [PATCH 11/17] OEL-1662: Remove ExternalLinkFormatter. --- .../FieldFormatter/ExternalLinkFormatter.php | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php diff --git a/modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php b/modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php deleted file mode 100644 index 8aa9b2a6..00000000 --- a/modules/oe_whitelabel_helper/src/Plugin/Field/FieldFormatter/ExternalLinkFormatter.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php - -declare(strict_types = 1); - -namespace Drupal\oe_whitelabel_helper\Plugin\Field\FieldFormatter; - -use Drupal\Core\Field\FieldItemListInterface; -use Drupal\link\Plugin\Field\FieldFormatter\LinkFormatter; - -/** - * Plugin implementation of the 'external_link' formatter. - * - * @FieldFormatter( - * id = "external_link", - * label = @Translation("Force external links to open in new tab"), - * field_types = { - * "link" - * } - * ) - */ -class ExternalLinkFormatter extends LinkFormatter { - - /** - * {@inheritdoc} - */ - public function viewElements(FieldItemListInterface $items, $langcode) { - $element = parent::viewElements($items, $langcode); - - foreach ($items as $delta => $item) { - $url = $this->buildUrl($item); - - if ($url->isExternal()) { - $element[$delta]['#options']['attributes']['target'] = '_blank'; - } - } - - return $element; - } - -} -- GitLab From c36a2e3da0901ba446387679a30cdc77b565bacc Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 12 Jul 2022 18:33:04 +0200 Subject: [PATCH 12/17] OEL-1662: Revert view display to link. --- ...tity_view_display.node.oe_sc_event.oe_w_content_banner.yml | 4 ++-- ...tity_view_display.node.oe_sc_event.oe_w_content_banner.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml index 67e22a0d..bd0d1312 100644 --- a/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml +++ b/modules/oe_whitelabel_starter_event/config/install/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml @@ -12,8 +12,8 @@ dependencies: - field.field.node.oe_sc_event.oe_summary - node.type.oe_sc_event module: + - link - oe_content_featured_media_field - - oe_starter_content_event - text - user id: node.oe_sc_event.oe_w_content_banner @@ -30,7 +30,7 @@ content: weight: 1 region: content oe_sc_event_registration_url: - type: external_link + type: link label: above settings: trim_length: 80 diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml index 67e22a0d..bd0d1312 100644 --- a/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml @@ -12,8 +12,8 @@ dependencies: - field.field.node.oe_sc_event.oe_summary - node.type.oe_sc_event module: + - link - oe_content_featured_media_field - - oe_starter_content_event - text - user id: node.oe_sc_event.oe_w_content_banner @@ -30,7 +30,7 @@ content: weight: 1 region: content oe_sc_event_registration_url: - type: external_link + type: link label: above settings: trim_length: 80 -- GitLab From 1f48cb36baa1410b40bd60981e877809a31690df Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 12 Jul 2022 18:33:27 +0200 Subject: [PATCH 13/17] OEL-1662: Templating button and link. --- ...de--oe-sc-event-registration-url.html.twig | 29 ++++++++++--------- ...oe-sc-event--oe-w-content-banner.html.twig | 9 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/templates/content/field--node--oe-sc-event-registration-url.html.twig b/templates/content/field--node--oe-sc-event-registration-url.html.twig index 7d554f1d..09967c3c 100644 --- a/templates/content/field--node--oe-sc-event-registration-url.html.twig +++ b/templates/content/field--node--oe-sc-event-registration-url.html.twig @@ -4,18 +4,19 @@ * Event registration button display. */ #} -<div class="mt-4"> - {% set button %} - {{ pattern('button', { - 'label': 'Register'|t, - 'icon': 'calendar-check', - 'icon_position': 'before', +{% for item in items %} + <div class="mt-4"> + {% set button %} + {{ pattern('button', { + 'label': 'Register'|t, + 'icon': 'calendar-check', + 'icon_position': 'before', + }) }} + {% endset %} + {{ pattern('link', { + 'label': button, + 'path': item['content']['#url'].toString(), + 'attributes': item['content']['attributes'] }) }} - {% endset %} - {% set _attributes = element[0]['#options']['attributes'] %} - {{ pattern('link', { - 'label': button, - 'path': element[0]['#url'].toString(), - 'attributes': _attributes, - }) }} -</div> + </div> +{% endfor %} diff --git a/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig b/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig index 43185dca..494f8f6b 100755 --- a/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig +++ b/templates/content/node--oe-sc-event--oe-w-content-banner.html.twig @@ -4,15 +4,14 @@ * Event content banner display. */ #} -{% set _content %} - {{ content.oe_summary }} - {{ content.oe_sc_event_registration_url }} -{% endset %} <div{{attributes}}> {{ pattern('content_banner', { background: 'gray', title: label, - content: _content, + content: [ + content.oe_summary, + content.oe_sc_event_registration_url, + ], image: image, }) }} </div> -- GitLab From ea5025ef4f4f20f1d421bd8d62325b8802f456af Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 12 Jul 2022 18:34:23 +0200 Subject: [PATCH 14/17] OEL-1662: Simple preprocess to add target blank to external links. --- .../oe_whitelabel_starter_event.module | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module index b1143375..cb774215 100755 --- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module +++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module @@ -125,3 +125,14 @@ function _oe_whitelabel_starter_event_preprocess_inpage_nav(array &$variables): } } + +/** + * Implements hook_preprocess_HOOK(). + */ +function oe_whitelabel_starter_event_preprocess_field__node__oe_sc_event_registration_url(&$variables) { + foreach ($variables['items'] as &$item) { + if ($item['content']['#url']->isExternal()) { + $item['content']['attributes']['target'] = '_blank'; + } + } +} -- GitLab From 1f91ad54862a3ca28e361dda0f957a342369306b Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Tue, 12 Jul 2022 18:35:49 +0200 Subject: [PATCH 15/17] OEL-1662: Testing registration with internal url. --- tests/src/Functional/ContentEventRenderTest.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php index 8c19e410..7b20eb84 100644 --- a/tests/src/Functional/ContentEventRenderTest.php +++ b/tests/src/Functional/ContentEventRenderTest.php @@ -83,6 +83,21 @@ class ContentEventRenderTest extends WhitelabelBrowserTestBase { // Assert registration button. $link = $crawler->filter('.bcl-content-banner a[target="_blank"]'); $this->assertCount(1, $link); + $this->assertEquals('https://europa.eu', $link->attr('href')); + $button = $link->filter('button'); + $this->assertStringContainsString('Register', $button->text()); + $this->assertStringContainsString('calendar-check', $button->html()); + + // Assert registration button with internal route. + $node->set('oe_sc_event_registration_url', 'entity:node/' . $node->id()); + $node->save(); + + $this->drupalGet('node/' . $node->id()); + $crawler = $client->getCrawler(); + + $link = $crawler->filter('.bcl-content-banner a[href="/build/node/' . $node->id() . '"]'); + $this->assertCount(1, $link); + $this->assertObjectNotHasAttribute('target', $link); $button = $link->filter('button'); $this->assertStringContainsString('Register', $button->text()); $this->assertStringContainsString('calendar-check', $button->html()); -- GitLab From d09d31e7bc1e722d9f2b050197b7e850bde9c79b Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Wed, 13 Jul 2022 08:26:24 +0200 Subject: [PATCH 16/17] OEL-1662: Remove external link from schema. --- .../schema/oe_whitelabel_helper.schema.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml b/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml index 4cec5805..2f171640 100644 --- a/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml +++ b/modules/oe_whitelabel_helper/config/schema/oe_whitelabel_helper.schema.yml @@ -23,22 +23,3 @@ field_group.field_group_formatter_plugin.oe_whitelabel_helper_pattern_base: field_group.field_group_formatter_plugin.oe_whitelabel_helper_description_list_pattern: type: field_group.field_group_formatter_plugin.oe_whitelabel_helper_pattern_base label: 'Mapping for the description list pattern formatter settings' -field.formatter.settings.external_link: - type: mapping - label: 'Link format settings' - mapping: - trim_length: - type: integer - label: 'Trim link text length' - url_only: - type: boolean - label: 'URL only' - url_plain: - type: boolean - label: 'Show URL as plain text' - rel: - type: string - label: 'Add rel="nofollow" to links' - target: - type: string - label: 'Open link in new window' -- GitLab From 1bd25c3949078e4f3a20c00e02d1148d5e517c15 Mon Sep 17 00:00:00 2001 From: escuriola <escuriola@gmail.com> Date: Mon, 18 Jul 2022 17:27:09 +0200 Subject: [PATCH 17/17] OEL-1662: Update to last changes event full display in post_update. --- .../core.entity_view_display.node.oe_sc_event.full.yml | 8 +++----- .../core.entity_view_display.node.oe_sc_event.teaser.yml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml index 91889ecf..56b965dc 100644 --- a/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.full.yml @@ -12,7 +12,7 @@ dependencies: - field.field.node.oe_sc_event.oe_summary - node.type.oe_sc_event module: - - datetime_range + - daterange_compact - oe_whitelabel_helper - text - user @@ -43,12 +43,10 @@ content: weight: 3 region: content oe_sc_event_dates: - type: daterange_default + type: daterange_compact label: inline settings: - timezone_override: '' - format_type: oe_whitelabel_starter_event_date - separator: to + daterange_compact_format: oe_whitelabel_date_time_long third_party_settings: { } weight: 1 region: content diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml index 4ebc0631..ed5738e0 100755 --- a/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml +++ b/modules/oe_whitelabel_starter_event/config/post_updates/00003_add_registration_url_field/core.entity_view_display.node.oe_sc_event.teaser.yml @@ -13,7 +13,7 @@ dependencies: - node.type.oe_sc_event module: - address - - datetime_range + - daterange_compact - text - user id: node.oe_sc_event.teaser @@ -22,12 +22,10 @@ bundle: oe_sc_event mode: teaser content: oe_sc_event_dates: - type: daterange_default + type: daterange_compact label: hidden settings: - timezone_override: '' - format_type: oe_whitelabel_starter_event_date - separator: to + daterange_compact_format: oe_whitelabel_date_only_short_month third_party_settings: { } weight: 4 region: content -- GitLab