diff --git a/composer.json b/composer.json
index 08461b3273e8f4e7cfee5eb1de26c7e34b80b9c8..ef137a12dbe25b3abf6a6f03b217e82f0f9db593 100644
--- a/composer.json
+++ b/composer.json
@@ -32,9 +32,10 @@
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
"openeuropa/oe_authentication": "^1.4",
"openeuropa/oe_contact_forms": "~1.1",
+ "openeuropa/oe_content": "^2.8.0",
"openeuropa/oe_corporate_blocks": "^4.4",
"openeuropa/oe_multilingual": "^1.9",
- "openeuropa/oe_starter_content": "1.x-dev#5a4a77b",
+ "openeuropa/oe_starter_content": "dev-OEL-1290",
"openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
"phpspec/prophecy-phpunit": "^1 || ^2"
},
diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.full.yml b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
similarity index 78%
rename from modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.full.yml
rename to modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
index c09a383238eceb99eb01a6a4e5b353b706f25fb9..6b0bd79b85c5e65c1146130940bec4a238b64757 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.full.yml
+++ b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.full.yml
@@ -3,21 +3,21 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.full
- - field.field.node.oe_event.body
- - field.field.node.oe_event.oe_documents
- - field.field.node.oe_event.oe_event_dates
- - field.field.node.oe_event.oe_featured_media
- - field.field.node.oe_event.oe_location
- - field.field.node.oe_event.oe_summary
- - node.type.oe_event
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
module:
- address
- datetime_range
- text
- user
-id: node.oe_event.full
+id: node.oe_sc_event.full
targetEntityType: node
-bundle: oe_event
+bundle: oe_sc_event
mode: full
content:
body:
@@ -41,7 +41,7 @@ content:
link: true
view_mode: default
third_party_settings: { }
- oe_event_dates:
+ oe_sc_event_dates:
type: daterange_default
label: inline
settings:
diff --git a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.teaser.yml b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
similarity index 67%
rename from modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.teaser.yml
rename to modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
index f174a7f466676f10044da390c86ac5e4c14cf6da..c61526d46513c6955445ca9859b58880a096cb30 100755
--- a/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_event.teaser.yml
+++ b/modules/oe_whitelabel_event/config/install/core.entity_view_display.node.oe_sc_event.teaser.yml
@@ -3,24 +3,24 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.teaser
- - field.field.node.oe_event.body
- - field.field.node.oe_event.oe_documents
- - field.field.node.oe_event.oe_event_dates
- - field.field.node.oe_event.oe_featured_media
- - field.field.node.oe_event.oe_location
- - field.field.node.oe_event.oe_summary
- - node.type.oe_event
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
module:
- address
- datetime_range
- text
- user
-id: node.oe_event.teaser
+id: node.oe_sc_event.teaser
targetEntityType: node
-bundle: oe_event
+bundle: oe_sc_event
mode: teaser
content:
- oe_event_dates:
+ oe_sc_event_dates:
type: daterange_default
label: hidden
settings:
diff --git a/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml b/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
index 474de73ce43cd601f38f02cccf63e711226e9287..b45a48f7e64f4a5aa5dcb86961316085940d076c 100755
--- a/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
+++ b/modules/oe_whitelabel_event/oe_whitelabel_event.info.yml
@@ -10,6 +10,6 @@ dependencies:
config_devel:
install:
- - core.entity_view_display.node.oe_event.full
- - core.entity_view_display.node.oe_event.teaser
+ - core.entity_view_display.node.oe_sc_event.full
+ - core.entity_view_display.node.oe_sc_event.teaser
- core.date_format.oe_whitelabel_event_date
diff --git a/modules/oe_whitelabel_event/oe_whitelabel_event.module b/modules/oe_whitelabel_event/oe_whitelabel_event.module
index d3d5842f57b9b037f111ccc1f8a9df98af6122ea..685276cadfa3ac66c2b321d81357f02e979c9166 100755
--- a/modules/oe_whitelabel_event/oe_whitelabel_event.module
+++ b/modules/oe_whitelabel_event/oe_whitelabel_event.module
@@ -17,7 +17,7 @@ use Drupal\Component\Utility\Html;
/**
* Implements template_preprocess_node() for the Event node type.
*/
-function oe_whitelabel_event_preprocess_node__oe_event(&$variables) {
+function oe_whitelabel_event_preprocess_node__oe_sc_event(&$variables) {
if ($variables['view_mode'] !== 'full' && $variables['view_mode'] !== 'teaser') {
return;
}
diff --git a/modules/oe_whitelabel_event/templates/field--node--body--oe-event.html.twig b/modules/oe_whitelabel_event/templates/field--node--body--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/field--node--body--oe-event.html.twig
rename to modules/oe_whitelabel_event/templates/field--node--body--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-event.html.twig b/modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-sc-event.html.twig
similarity index 100%
rename from modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-event.html.twig
rename to modules/oe_whitelabel_event/templates/field--node--oe-documents--oe-sc-event.html.twig
diff --git a/modules/oe_whitelabel_event/templates/node--oe-event--full.html.twig b/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
similarity index 88%
rename from modules/oe_whitelabel_event/templates/node--oe-event--full.html.twig
rename to modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
index b524b69d0352e6a5f99a94959a79a63cbaa0147c..705b34a9a5a7b1ed5f92448a477777d53b05d8e6 100755
--- a/modules/oe_whitelabel_event/templates/node--oe-event--full.html.twig
+++ b/modules/oe_whitelabel_event/templates/node--oe-sc-event--full.html.twig
@@ -5,14 +5,14 @@
*/
#}
{% set description_items = [] %}
-{% if content.oe_event_dates|field_value is not empty %}
+{% if content.oe_sc_event_dates|field_value is not empty %}
{% set _event_dates %}
- {{ content.oe_event_dates|field_value|safe_join(', ') }}
+ {{ content.oe_sc_event_dates|field_value|safe_join(', ') }}
{% endset %}
{% set description_items = description_items|merge([
{
term:[{
- 'label': content.oe_event_dates|field_label,
+ 'label': content.oe_sc_event_dates|field_label,
'icon': 'calendar-event',
}],
definition: _event_dates,
diff --git a/modules/oe_whitelabel_event/templates/node--oe-event--teaser.html.twig b/modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig
similarity index 80%
rename from modules/oe_whitelabel_event/templates/node--oe-event--teaser.html.twig
rename to modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig
index a92a49590cf231e8c8cc9da3f787dfac3e8504a2..94b72061e78b99e857ace54a91a145164cc420c0 100755
--- a/modules/oe_whitelabel_event/templates/node--oe-event--teaser.html.twig
+++ b/modules/oe_whitelabel_event/templates/node--oe-sc-event--teaser.html.twig
@@ -8,7 +8,7 @@
<a class="text-underline-hover" href="{{ url }}">{{ label }}</a>
{% endset %}
{% set _content %}
- <span class="text-muted text-nowrap me-4-5">{{ content.oe_event_dates }}</span>
+ <span class="text-muted text-nowrap me-4-5">{{ content.oe_sc_event_dates }}</span>
{% endset %}
<article{{attributes}}>
{{ pattern('card', {
diff --git a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.full.yml b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
similarity index 79%
rename from modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.full.yml
rename to modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
index c7bd5898a2850b54fd0877192a1368ad13bf8cc2..aee775f3c9499013841cbf700d79675fca9e9d62 100644
--- a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.full.yml
+++ b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.full.yml
@@ -2,19 +2,19 @@ langcode: en
status: true
dependencies:
config:
- - field.field.node.oe_news.body
- - field.field.node.oe_news.oe_featured_media
- - field.field.node.oe_news.oe_publication_date
- - field.field.node.oe_news.oe_summary
- - node.type.oe_news
+ - field.field.node.oe_sc_news.body
+ - field.field.node.oe_sc_news.oe_featured_media
+ - field.field.node.oe_sc_news.oe_publication_date
+ - field.field.node.oe_sc_news.oe_summary
+ - node.type.oe_sc_news
module:
- datetime
- text
- user
-id: node.oe_news.full
+id: node.oe_sc_news.full
targetEntityType: node
-bundle: oe_news
+bundle: oe_sc_news
mode: full
content:
body:
diff --git a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.teaser.yml b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
similarity index 79%
rename from modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.teaser.yml
rename to modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
index b385718c7d92f746abfb503105c28ca6180bad7e..54e03626f1a4d0afe3a11d05b5676c3bd55c941f 100644
--- a/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_news.teaser.yml
+++ b/modules/oe_whitelabel_news/config/install/core.entity_view_display.node.oe_sc_news.teaser.yml
@@ -3,19 +3,19 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.teaser
- - field.field.node.oe_news.body
- - field.field.node.oe_news.oe_featured_media
- - field.field.node.oe_news.oe_publication_date
- - field.field.node.oe_news.oe_summary
- - node.type.oe_news
+ - field.field.node.oe_sc_news.body
+ - field.field.node.oe_sc_news.oe_featured_media
+ - field.field.node.oe_sc_news.oe_publication_date
+ - field.field.node.oe_sc_news.oe_summary
+ - node.type.oe_sc_news
module:
- datetime
- text
- user
-id: node.oe_news.teaser
+id: node.oe_sc_news.teaser
targetEntityType: node
-bundle: oe_news
+bundle: oe_sc_news
mode: teaser
content:
body:
diff --git a/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml b/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
index ec78176a6cf4e50b110b410038bd3faaa2e88d48..1d49572d93e13302239f5d698bbfe69a57bb22ed 100644
--- a/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
+++ b/modules/oe_whitelabel_news/oe_whitelabel_news.info.yml
@@ -11,5 +11,5 @@ dependencies:
config_devel:
install:
- core.date_format.oel_whitelabel_news_date.yml
- - core.entity_view_display.node.oe_news.full.yml
- - core.entity_view_display.node.oe_news.teaser.yml
+ - core.entity_view_display.node.oe_sc_news.full.yml
+ - core.entity_view_display.node.oe_sc_news.teaser.yml
diff --git a/modules/oe_whitelabel_news/oe_whitelabel_news.module b/modules/oe_whitelabel_news/oe_whitelabel_news.module
index fc89a07f215d9c95d1c225cd5cad86f3cab484cf..c19cef8fbaf48d6688bc2791f74bf2f177a86005 100644
--- a/modules/oe_whitelabel_news/oe_whitelabel_news.module
+++ b/modules/oe_whitelabel_news/oe_whitelabel_news.module
@@ -16,7 +16,7 @@ use Drupal\oe_bootstrap_theme\ValueObject\ImageValueObject;
/**
* Implements template_preprocess_node() for the News node type.
*/
-function oe_whitelabel_news_preprocess_node__oe_news(&$variables) {
+function oe_whitelabel_news_preprocess_node__oe_sc_news(&$variables) {
if ($variables['view_mode'] !== 'full' && $variables['view_mode'] !== 'teaser') {
return;
}
diff --git a/modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-news.html.twig b/modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-news.html.twig
rename to modules/oe_whitelabel_news/templates/field--node--oe-publication-date--oe-sc-news.html.twig
diff --git a/modules/oe_whitelabel_news/templates/node--oe-news--full.html.twig b/modules/oe_whitelabel_news/templates/node--oe-sc-news--full.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/node--oe-news--full.html.twig
rename to modules/oe_whitelabel_news/templates/node--oe-sc-news--full.html.twig
diff --git a/modules/oe_whitelabel_news/templates/node--oe-news--teaser.html.twig b/modules/oe_whitelabel_news/templates/node--oe-sc-news--teaser.html.twig
similarity index 100%
rename from modules/oe_whitelabel_news/templates/node--oe-news--teaser.html.twig
rename to modules/oe_whitelabel_news/templates/node--oe-sc-news--teaser.html.twig