diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml index 47111d9eb3..ccacac9995 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml @@ -3,37 +3,35 @@ status: true dependencies: config: - block_content.type.banner_block - - field.field.block_content.banner_block.field_banner_image - field.field.block_content.banner_block.field_content_link + - field.field.block_content.banner_block.field_media_image - field.field.block_content.banner_block.field_summary - field.field.block_content.banner_block.field_title - - image.style.thumbnail module: - - image - link + - media_library id: block_content.banner_block.default targetEntityType: block_content bundle: banner_block mode: default content: - field_banner_image: - weight: 4 - settings: - progress_indicator: throbber - preview_image_style: thumbnail - third_party_settings: { } - type: image_image - region: content field_content_link: - weight: 3 + weight: 4 settings: placeholder_url: '' placeholder_title: '' third_party_settings: { } type: link_default region: content + field_media_image: + type: media_library_widget + weight: 6 + settings: + media_types: { } + third_party_settings: { } + region: content field_summary: - weight: 2 + weight: 3 settings: rows: 5 placeholder: '' @@ -64,9 +62,9 @@ content: include_locked: true third_party_settings: { } translation: - weight: 10 + weight: 7 + region: content settings: { } third_party_settings: { } - region: content hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml index b636365118..336985a817 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml @@ -4,36 +4,34 @@ dependencies: config: - block_content.type.footer_promo_block - field.field.block_content.footer_promo_block.field_content_link - - field.field.block_content.footer_promo_block.field_promo_image + - field.field.block_content.footer_promo_block.field_media_image - field.field.block_content.footer_promo_block.field_summary - field.field.block_content.footer_promo_block.field_title - - image.style.thumbnail module: - - image - link + - media_library id: block_content.footer_promo_block.default targetEntityType: block_content bundle: footer_promo_block mode: default content: field_content_link: - weight: 3 + weight: 4 settings: placeholder_url: '' placeholder_title: '' third_party_settings: { } type: link_default region: content - field_promo_image: - weight: 4 + field_media_image: + weight: 6 settings: - progress_indicator: throbber - preview_image_style: thumbnail + media_types: { } third_party_settings: { } - type: image_image + type: media_library_widget region: content field_summary: - weight: 2 + weight: 3 settings: rows: 5 placeholder: '' @@ -64,9 +62,9 @@ content: include_locked: true third_party_settings: { } translation: - weight: 10 + weight: 7 + region: content settings: { } third_party_settings: { } - region: content hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml index 3e83e1c387..eb3032bf8d 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml @@ -15,7 +15,7 @@ mode: default content: created: type: datetime_timestamp - weight: 10 + weight: 5 region: content settings: { } third_party_settings: { } @@ -25,7 +25,7 @@ content: preview_image_style: thumbnail third_party_settings: { } type: image_image - weight: 0 + weight: 1 region: content langcode: type: language_select @@ -34,9 +34,17 @@ content: settings: include_locked: true third_party_settings: { } + name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } path: type: path - weight: 4 + weight: 3 region: content settings: { } third_party_settings: { } @@ -44,12 +52,17 @@ content: type: boolean_checkbox settings: display_label: true - weight: 100 + weight: 7 region: content third_party_settings: { } + translation: + weight: 6 + region: content + settings: { } + third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 5 + weight: 4 settings: match_operator: CONTAINS match_limit: 10 @@ -59,4 +72,3 @@ content: third_party_settings: { } hidden: moderation_state: true - name: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml index b3b36b6acc..cee7fda1f6 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml @@ -3,14 +3,13 @@ status: true dependencies: config: - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - - image.style.thumbnail - node.type.article - workflows.workflow.editorial module: - content_moderation - - image + - media_library - path - text id: node.article.default @@ -30,21 +29,20 @@ content: third_party_settings: { } created: type: datetime_timestamp - weight: 5 + weight: 7 region: content settings: { } third_party_settings: { } - field_image: - type: image_image - weight: 3 - region: content + field_media_image: + weight: 5 settings: - progress_indicator: throbber - preview_image_style: thumbnail + media_types: { } third_party_settings: { } + type: media_library_widget + region: content field_tags: type: entity_reference_autocomplete_tags - weight: 2 + weight: 3 region: content settings: match_operator: CONTAINS @@ -61,13 +59,13 @@ content: third_party_settings: { } moderation_state: type: moderation_state_default - weight: 10 + weight: 12 region: content settings: { } third_party_settings: { } path: type: path - weight: 8 + weight: 10 region: content settings: { } third_party_settings: { } @@ -75,21 +73,21 @@ content: type: boolean_checkbox settings: display_label: true - weight: 6 + weight: 8 region: content third_party_settings: { } status: type: boolean_checkbox settings: display_label: true - weight: 9 + weight: 11 region: content third_party_settings: { } sticky: type: boolean_checkbox settings: display_label: true - weight: 7 + weight: 9 region: content third_party_settings: { } title: @@ -101,13 +99,13 @@ content: placeholder: '' third_party_settings: { } translation: - weight: 10 + weight: 13 + region: content settings: { } third_party_settings: { } - region: content uid: type: entity_reference_autocomplete - weight: 4 + weight: 6 region: content settings: match_operator: CONTAINS diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml index 44b7859c0c..fba3439718 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml @@ -4,8 +4,8 @@ dependencies: config: - field.field.node.recipe.field_cooking_time - field.field.node.recipe.field_difficulty - - field.field.node.recipe.field_image - field.field.node.recipe.field_ingredients + - field.field.node.recipe.field_media_image - field.field.node.recipe.field_number_of_servings - field.field.node.recipe.field_preparation_time - field.field.node.recipe.field_recipe_category @@ -13,12 +13,11 @@ dependencies: - field.field.node.recipe.field_summary - field.field.node.recipe.field_tags - field.field.node.recipe.layout_builder__layout - - image.style.thumbnail - node.type.recipe - workflows.workflow.editorial module: - content_moderation - - image + - media_library - path - text id: node.recipe.default @@ -28,7 +27,7 @@ mode: default content: created: type: datetime_timestamp - weight: 13 + weight: 15 region: content settings: { } third_party_settings: { } @@ -45,22 +44,21 @@ content: third_party_settings: { } type: options_select region: content - field_image: - weight: 8 - settings: - progress_indicator: throbber - preview_image_style: thumbnail - third_party_settings: { } - type: image_image - region: content field_ingredients: - weight: 10 + weight: 11 settings: size: 60 placeholder: '' third_party_settings: { } type: string_textfield region: content + field_media_image: + type: media_library_widget + weight: 9 + settings: + media_types: { } + third_party_settings: { } + region: content field_number_of_servings: weight: 4 settings: @@ -86,7 +84,7 @@ content: type: entity_reference_autocomplete_tags region: content field_recipe_instruction: - weight: 11 + weight: 13 settings: rows: 5 placeholder: '' @@ -94,7 +92,7 @@ content: type: text_textarea region: content field_summary: - weight: 9 + weight: 10 settings: rows: 5 placeholder: '' @@ -113,20 +111,26 @@ content: region: content langcode: type: language_select - weight: 2 + weight: 1 region: content settings: include_locked: true third_party_settings: { } + layout_builder__layout: + type: null + weight: 26 + region: content + settings: { } + third_party_settings: { } moderation_state: type: moderation_state_default - weight: 18 + weight: 20 region: content settings: { } third_party_settings: { } path: type: path - weight: 16 + weight: 18 region: content settings: { } third_party_settings: { } @@ -134,21 +138,21 @@ content: type: boolean_checkbox settings: display_label: true - weight: 14 + weight: 16 region: content third_party_settings: { } status: type: boolean_checkbox settings: display_label: true - weight: 17 + weight: 19 region: content third_party_settings: { } sticky: type: boolean_checkbox settings: display_label: true - weight: 15 + weight: 17 region: content third_party_settings: { } title: @@ -160,13 +164,13 @@ content: placeholder: '' third_party_settings: { } translation: - weight: 10 + weight: 12 + region: content settings: { } third_party_settings: { } - region: content uid: type: entity_reference_autocomplete - weight: 12 + weight: 14 settings: match_operator: CONTAINS match_limit: 10 @@ -174,5 +178,4 @@ content: placeholder: '' region: content third_party_settings: { } -hidden: - layout_builder__layout: true +hidden: { } diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml index 7cadd72d9e..cdeba466e1 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml @@ -3,30 +3,19 @@ status: true dependencies: config: - block_content.type.banner_block - - field.field.block_content.banner_block.field_banner_image - field.field.block_content.banner_block.field_content_link + - field.field.block_content.banner_block.field_media_image - field.field.block_content.banner_block.field_summary - field.field.block_content.banner_block.field_title - - image.style.scale_crop_7_3_large module: - - image - link id: block_content.banner_block.default targetEntityType: block_content bundle: banner_block mode: default content: - field_banner_image: - weight: 0 - label: hidden - settings: - image_style: scale_crop_7_3_large - image_link: '' - third_party_settings: { } - type: image - region: content field_content_link: - weight: 3 + weight: 4 label: hidden settings: trim_length: 80 @@ -37,15 +26,24 @@ content: third_party_settings: { } type: link region: content + field_media_image: + type: entity_reference_entity_view + weight: 1 + label: hidden + settings: + view_mode: scale_crop_7_3_large + link: false + third_party_settings: { } + region: content field_summary: - weight: 2 + weight: 3 label: hidden settings: { } third_party_settings: { } type: basic_string region: content field_title: - weight: 1 + weight: 2 label: hidden settings: link_to_entity: false diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml index e962f3bb9d..a2f2262290 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml @@ -4,12 +4,10 @@ dependencies: config: - block_content.type.footer_promo_block - field.field.block_content.footer_promo_block.field_content_link - - field.field.block_content.footer_promo_block.field_promo_image + - field.field.block_content.footer_promo_block.field_media_image - field.field.block_content.footer_promo_block.field_summary - field.field.block_content.footer_promo_block.field_title - - image.style.medium_8_7 module: - - image - link id: block_content.footer_promo_block.default targetEntityType: block_content @@ -17,7 +15,7 @@ bundle: footer_promo_block mode: default content: field_content_link: - weight: 3 + weight: 4 label: hidden settings: trim_length: 80 @@ -28,24 +26,24 @@ content: third_party_settings: { } type: link region: content - field_promo_image: - weight: 0 + field_media_image: + weight: 1 label: hidden settings: - image_style: medium_8_7 - image_link: '' + view_mode: medium_8_7 + link: false third_party_settings: { } - type: image + type: entity_reference_entity_view region: content field_summary: - weight: 2 + weight: 3 label: hidden settings: { } third_party_settings: { } type: basic_string region: content field_title: - weight: 1 + weight: 2 label: hidden settings: link_to_entity: false diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml index 35bc622952..f884019215 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml @@ -3,10 +3,10 @@ status: true dependencies: config: - field.field.media.image.field_media_image - - image.style.large - media.type.image + - responsive_image.styles.3_2_image module: - - image + - responsive_image id: media.image.default targetEntityType: media bundle: image @@ -15,10 +15,10 @@ content: field_media_image: label: visually_hidden settings: - image_style: 'large' + responsive_image_style: 3_2_image image_link: '' third_party_settings: { } - type: image + type: responsive_image weight: 1 region: content hidden: diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.medium_8_7.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.medium_8_7.yml new file mode 100644 index 0000000000..1521cf84fd --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.medium_8_7.yml @@ -0,0 +1,35 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.medium_8_7 + - field.field.media.image.field_media_image + - image.style.medium_8_7 + - media.type.image + module: + - image + - layout_builder +third_party_settings: + layout_builder: + allow_custom: false + enabled: false +id: media.image.medium_8_7 +targetEntityType: media +bundle: image +mode: medium_8_7 +content: + field_media_image: + label: visually_hidden + settings: + image_style: medium_8_7 + image_link: '' + third_party_settings: { } + type: image + weight: 1 + region: content +hidden: + created: true + langcode: true + name: true + thumbnail: true + uid: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.responsive_3x2.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.responsive_3x2.yml new file mode 100644 index 0000000000..b12d2fcee9 --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.responsive_3x2.yml @@ -0,0 +1,35 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.responsive_3x2 + - field.field.media.image.field_media_image + - media.type.image + - responsive_image.styles.3_2_image + module: + - layout_builder + - responsive_image +third_party_settings: + layout_builder: + allow_custom: false + enabled: false +id: media.image.responsive_3x2 +targetEntityType: media +bundle: image +mode: responsive_3x2 +content: + field_media_image: + label: visually_hidden + settings: + responsive_image_style: 3_2_image + image_link: '' + third_party_settings: { } + type: responsive_image + weight: 1 + region: content +hidden: + created: true + langcode: true + name: true + thumbnail: true + uid: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.scale_crop_7_3_large.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.scale_crop_7_3_large.yml new file mode 100644 index 0000000000..a8832f4409 --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.scale_crop_7_3_large.yml @@ -0,0 +1,35 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.scale_crop_7_3_large + - field.field.media.image.field_media_image + - image.style.scale_crop_7_3_large + - media.type.image + module: + - image + - layout_builder +third_party_settings: + layout_builder: + allow_custom: false + enabled: false +id: media.image.scale_crop_7_3_large +targetEntityType: media +bundle: image +mode: scale_crop_7_3_large +content: + field_media_image: + label: visually_hidden + settings: + image_style: scale_crop_7_3_large + image_link: '' + third_party_settings: { } + type: image + weight: 1 + region: content +hidden: + created: true + langcode: true + name: true + thumbnail: true + uid: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.square.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.square.yml new file mode 100644 index 0000000000..9f90a89f08 --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.square.yml @@ -0,0 +1,35 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.square + - field.field.media.image.field_media_image + - media.type.image + - responsive_image.styles.square + module: + - layout_builder + - responsive_image +third_party_settings: + layout_builder: + allow_custom: false + enabled: false +id: media.image.square +targetEntityType: media +bundle: image +mode: square +content: + field_media_image: + label: visually_hidden + settings: + responsive_image_style: square + image_link: '' + third_party_settings: { } + type: responsive_image + weight: 1 + region: content +hidden: + created: true + langcode: true + name: true + thumbnail: true + uid: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml index 44bfbdc6d8..9d5d869e72 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml @@ -4,27 +4,25 @@ dependencies: config: - core.entity_view_mode.node.card - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - node.type.article - - responsive_image.styles.3_2_image module: - - responsive_image - user id: node.article.card targetEntityType: node bundle: article mode: card content: - field_image: - type: responsive_image - weight: 0 + field_media_image: + type: entity_reference_entity_view + weight: 1 region: content + label: hidden settings: - responsive_image_style: 3_2_image - image_link: '' + view_mode: responsive_3x2 + link: false third_party_settings: { } - label: hidden hidden: body: true content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml index cbf72d37cb..2f58539c3f 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml @@ -4,27 +4,25 @@ dependencies: config: - core.entity_view_mode.node.card_common - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - node.type.article - - responsive_image.styles.3_2_image module: - - responsive_image - user id: node.article.card_common targetEntityType: node bundle: article mode: card_common content: - field_image: - type: responsive_image - weight: 0 + field_media_image: + type: entity_reference_entity_view + weight: 1 region: content + label: hidden settings: - responsive_image_style: 3_2_image - image_link: '' + view_mode: responsive_3x2 + link: false third_party_settings: { } - label: hidden hidden: body: true content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml index c77cd9fb2c..269dd8e27f 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml @@ -4,27 +4,25 @@ dependencies: config: - core.entity_view_mode.node.card_common_alt - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - node.type.article - - responsive_image.styles.square module: - - responsive_image - user id: node.article.card_common_alt targetEntityType: node bundle: article mode: card_common_alt content: - field_image: - type: responsive_image - weight: 0 + field_media_image: + type: entity_reference_entity_view + weight: 1 region: content + label: hidden settings: - responsive_image_style: square - image_link: '' + view_mode: responsive_3x2 + link: false third_party_settings: { } - label: hidden hidden: body: true content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml index fe62b3880c..340924b386 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml @@ -3,12 +3,10 @@ status: true dependencies: config: - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - node.type.article - - responsive_image.styles.3_2_image module: - - responsive_image - text - user id: node.article.default @@ -18,20 +16,20 @@ mode: default content: body: type: text_default - weight: 2 + weight: 3 region: content settings: { } third_party_settings: { } label: hidden - field_image: - type: responsive_image - weight: 1 - region: content + field_media_image: + weight: 2 + label: hidden settings: - responsive_image_style: 3_2_image - image_link: '' + view_mode: responsive_3x2 + link: false third_party_settings: { } - label: hidden + type: entity_reference_entity_view + region: content field_tags: type: entity_reference_label weight: 0 @@ -41,7 +39,7 @@ content: link: true third_party_settings: { } links: - weight: 3 + weight: 4 region: content settings: { } third_party_settings: { } diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml index 923229ca56..6cbfbe7371 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml @@ -4,12 +4,10 @@ dependencies: config: - core.entity_view_mode.node.full - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - node.type.article - - responsive_image.styles.3_2_image module: - - responsive_image - text - user id: node.article.full @@ -19,25 +17,25 @@ mode: full content: body: type: text_default - weight: 2 + weight: 3 region: content settings: { } third_party_settings: { } label: hidden content_moderation_control: - weight: 4 + weight: 5 region: content settings: { } third_party_settings: { } - field_image: - type: responsive_image - weight: 1 + field_media_image: + type: entity_reference_entity_view + weight: 2 region: content + label: hidden settings: - responsive_image_style: 3_2_image - image_link: '' + view_mode: responsive_3x2 + link: false third_party_settings: { } - label: hidden field_tags: type: entity_reference_label weight: 0 @@ -47,7 +45,7 @@ content: link: true third_party_settings: { } links: - weight: 3 + weight: 4 region: content settings: { } third_party_settings: { } diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml index 6f50c19f10..304b8aeb5a 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.rss.yml @@ -4,7 +4,7 @@ dependencies: config: - core.entity_view_mode.node.rss - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - node.type.article module: @@ -20,6 +20,6 @@ content: hidden: body: true content_moderation_control: true - field_image: true + field_media_image: true field_tags: true langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml index d7b80a24e3..0920f18055 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml @@ -4,12 +4,10 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.article.body - - field.field.node.article.field_image + - field.field.node.article.field_media_image - field.field.node.article.field_tags - node.type.article - - responsive_image.styles.3_2_image module: - - responsive_image - text - user id: node.article.teaser @@ -19,31 +17,31 @@ mode: teaser content: body: type: text_summary_or_trimmed - weight: 0 + weight: 2 region: content settings: trim_length: 600 third_party_settings: { } label: hidden - field_image: - type: responsive_image - weight: -1 + field_media_image: + type: entity_reference_entity_view + weight: 1 region: content + label: hidden settings: - responsive_image_style: 3_2_image - image_link: content + view_mode: responsive_3x2 + link: false third_party_settings: { } - label: hidden field_tags: type: entity_reference_label - weight: 10 + weight: 3 region: content settings: link: true third_party_settings: { } label: above links: - weight: 100 + weight: 4 region: content settings: { } third_party_settings: { } diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml index 84a303b773..53dd3b04b3 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml @@ -5,8 +5,8 @@ dependencies: - core.entity_view_mode.node.card - field.field.node.recipe.field_cooking_time - field.field.node.recipe.field_difficulty - - field.field.node.recipe.field_image - field.field.node.recipe.field_ingredients + - field.field.node.recipe.field_media_image - field.field.node.recipe.field_number_of_servings - field.field.node.recipe.field_preparation_time - field.field.node.recipe.field_recipe_category @@ -15,10 +15,8 @@ dependencies: - field.field.node.recipe.field_tags - field.field.node.recipe.layout_builder__layout - node.type.recipe - - responsive_image.styles.3_2_image module: - options - - responsive_image - user id: node.recipe.card targetEntityType: node @@ -32,15 +30,15 @@ content: third_party_settings: { } type: list_default region: content - field_image: - weight: 1 + field_media_image: + type: entity_reference_entity_view + weight: 2 + region: content label: hidden settings: - responsive_image_style: 3_2_image - image_link: '' + view_mode: responsive_3x2 + link: false third_party_settings: { } - type: responsive_image - region: content hidden: content_moderation_control: true field_cooking_time: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml index edf5ec3276..e4f7e9b8f2 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml @@ -5,8 +5,8 @@ dependencies: - core.entity_view_mode.node.card_common - field.field.node.recipe.field_cooking_time - field.field.node.recipe.field_difficulty - - field.field.node.recipe.field_image - field.field.node.recipe.field_ingredients + - field.field.node.recipe.field_media_image - field.field.node.recipe.field_number_of_servings - field.field.node.recipe.field_preparation_time - field.field.node.recipe.field_recipe_category @@ -15,23 +15,21 @@ dependencies: - field.field.node.recipe.field_tags - field.field.node.recipe.layout_builder__layout - node.type.recipe - - responsive_image.styles.3_2_image module: - - responsive_image - user id: node.recipe.card_common targetEntityType: node bundle: recipe mode: card_common content: - field_image: - type: responsive_image - weight: 0 + field_media_image: + type: entity_reference_entity_view + weight: 1 region: content label: hidden settings: - responsive_image_style: 3_2_image - image_link: '' + view_mode: responsive_3x2 + link: false third_party_settings: { } hidden: content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml index 31ebfc1292..229f4e1fdd 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml @@ -5,8 +5,8 @@ dependencies: - core.entity_view_mode.node.card_common_alt - field.field.node.recipe.field_cooking_time - field.field.node.recipe.field_difficulty - - field.field.node.recipe.field_image - field.field.node.recipe.field_ingredients + - field.field.node.recipe.field_media_image - field.field.node.recipe.field_number_of_servings - field.field.node.recipe.field_preparation_time - field.field.node.recipe.field_recipe_category @@ -15,24 +15,22 @@ dependencies: - field.field.node.recipe.field_tags - field.field.node.recipe.layout_builder__layout - node.type.recipe - - responsive_image.styles.square module: - - responsive_image - user id: node.recipe.card_common_alt targetEntityType: node bundle: recipe mode: card_common_alt content: - field_image: - weight: 0 + field_media_image: + type: entity_reference_entity_view + weight: 1 + region: content label: hidden settings: - responsive_image_style: square - image_link: '' + view_mode: square + link: false third_party_settings: { } - type: responsive_image - region: content hidden: content_moderation_control: true field_cooking_time: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml index 9f4274506c..20daf4d001 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml @@ -4,8 +4,8 @@ dependencies: config: - field.field.node.recipe.field_cooking_time - field.field.node.recipe.field_difficulty - - field.field.node.recipe.field_image - field.field.node.recipe.field_ingredients + - field.field.node.recipe.field_media_image - field.field.node.recipe.field_number_of_servings - field.field.node.recipe.field_preparation_time - field.field.node.recipe.field_recipe_category @@ -14,10 +14,8 @@ dependencies: - field.field.node.recipe.field_tags - field.field.node.recipe.layout_builder__layout - node.type.recipe - - responsive_image.styles.3_2_image module: - options - - responsive_image - text - user id: node.recipe.default @@ -26,7 +24,7 @@ bundle: recipe mode: default content: field_cooking_time: - weight: 5 + weight: 6 label: above settings: thousand_separator: '' @@ -35,31 +33,31 @@ content: type: number_integer region: content field_difficulty: - weight: 7 + weight: 8 label: above settings: { } third_party_settings: { } type: list_default region: content - field_image: - weight: 3 - label: hidden - settings: - responsive_image_style: 3_2_image - image_link: '' - third_party_settings: { } - type: responsive_image - region: content field_ingredients: - weight: 8 + weight: 9 label: above settings: link_to_entity: false third_party_settings: { } type: string region: content + field_media_image: + type: entity_reference_entity_view + weight: 4 + label: hidden + settings: + view_mode: responsive_3x2 + link: false + third_party_settings: { } + region: content field_number_of_servings: - weight: 6 + weight: 7 label: above settings: thousand_separator: '' @@ -68,7 +66,7 @@ content: type: number_integer region: content field_preparation_time: - weight: 4 + weight: 5 label: above settings: thousand_separator: '' @@ -85,7 +83,7 @@ content: type: entity_reference_label region: content field_recipe_instruction: - weight: 9 + weight: 10 label: above settings: { } third_party_settings: { } @@ -107,7 +105,7 @@ content: type: entity_reference_label region: content links: - weight: 10 + weight: 11 region: content settings: { } third_party_settings: { } diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml index f0a384a215..7bca55020b 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml @@ -5,8 +5,8 @@ dependencies: - core.entity_view_mode.node.full - field.field.node.recipe.field_cooking_time - field.field.node.recipe.field_difficulty - - field.field.node.recipe.field_image - field.field.node.recipe.field_ingredients + - field.field.node.recipe.field_media_image - field.field.node.recipe.field_number_of_servings - field.field.node.recipe.field_preparation_time - field.field.node.recipe.field_recipe_category @@ -15,12 +15,10 @@ dependencies: - field.field.node.recipe.field_tags - field.field.node.recipe.layout_builder__layout - node.type.recipe - - responsive_image.styles.3_2_image module: - layout_builder - layout_discovery - options - - responsive_image - text - user third_party_settings: @@ -78,23 +76,6 @@ third_party_settings: type: entity_reference_label additional: { } weight: 2 - e57c136c-2758-4d90-86e5-2d3e8be9881a: - uuid: e57c136c-2758-4d90-86e5-2d3e8be9881a - region: content - configuration: - label_display: '0' - context_mapping: - entity: layout_builder.entity - id: 'field_block:node:recipe:field_image' - formatter: - label: hidden - settings: - responsive_image_style: 3_2_image - image_link: '' - third_party_settings: { } - type: responsive_image - additional: { } - weight: 3 00488840-db50-4afe-9c30-a123e6707fa9: uuid: 00488840-db50-4afe-9c30-a123e6707fa9 region: content @@ -111,7 +92,7 @@ third_party_settings: third_party_settings: { } type: number_integer additional: { } - weight: 4 + weight: 5 f91febc6-d924-47a2-8ffd-b71d3b2597c7: uuid: f91febc6-d924-47a2-8ffd-b71d3b2597c7 region: content @@ -128,7 +109,7 @@ third_party_settings: third_party_settings: { } type: number_integer additional: { } - weight: 5 + weight: 6 a2d450d0-08ce-4123-bca0-411bfa1da132: uuid: a2d450d0-08ce-4123-bca0-411bfa1da132 region: content @@ -145,7 +126,7 @@ third_party_settings: third_party_settings: { } type: number_integer additional: { } - weight: 6 + weight: 7 df8bfafc-210c-4d86-9745-e47081ab0fd4: uuid: df8bfafc-210c-4d86-9745-e47081ab0fd4 region: content @@ -160,7 +141,7 @@ third_party_settings: third_party_settings: { } type: list_default additional: { } - weight: 7 + weight: 8 6924bf2e-8baa-4081-803a-7a2d3b7d8e14: uuid: 6924bf2e-8baa-4081-803a-7a2d3b7d8e14 region: content @@ -176,7 +157,7 @@ third_party_settings: third_party_settings: { } type: string additional: { } - weight: 8 + weight: 9 f61cae40-5865-4c4c-98fa-14b8234e7b98: uuid: f61cae40-5865-4c4c-98fa-14b8234e7b98 region: content @@ -191,7 +172,7 @@ third_party_settings: third_party_settings: { } type: text_default additional: { } - weight: 9 + weight: 10 d4b753a7-e1b1-4062-a1d0-a2666362693e: uuid: d4b753a7-e1b1-4062-a1d0-a2666362693e region: content @@ -201,7 +182,26 @@ third_party_settings: entity: layout_builder.entity id: 'extra_field_block:node:recipe:content_moderation_control' additional: { } - weight: 10 + weight: 11 + cc87463d-bb75-4eca-a2d0-42f0b643f8a7: + uuid: cc87463d-bb75-4eca-a2d0-42f0b643f8a7 + region: content + configuration: + id: 'field_block:node:recipe:field_media_image' + label: 'Media Image' + provider: layout_builder + label_display: '0' + formatter: + label: hidden + type: entity_reference_entity_view + settings: + view_mode: responsive_3x2 + third_party_settings: { } + context_mapping: + entity: layout_builder.entity + view_mode: view_mode + additional: { } + weight: 4 third_party_settings: { } allow_custom: true enabled: true @@ -231,15 +231,6 @@ content: third_party_settings: { } type: list_default region: content - field_image: - weight: 3 - label: hidden - settings: - responsive_image_style: 3_2_image - image_link: '' - third_party_settings: { } - type: responsive_image - region: content field_ingredients: weight: 8 label: above @@ -297,6 +288,7 @@ content: type: entity_reference_label region: content hidden: + field_media_image: true langcode: true layout_builder__layout: true links: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml index c80d13c10f..d72087e46b 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.teaser.yml @@ -5,8 +5,8 @@ dependencies: - core.entity_view_mode.node.teaser - field.field.node.recipe.field_cooking_time - field.field.node.recipe.field_difficulty - - field.field.node.recipe.field_image - field.field.node.recipe.field_ingredients + - field.field.node.recipe.field_media_image - field.field.node.recipe.field_number_of_servings - field.field.node.recipe.field_preparation_time - field.field.node.recipe.field_recipe_category @@ -29,8 +29,8 @@ hidden: content_moderation_control: true field_cooking_time: true field_difficulty: true - field_image: true field_ingredients: true + field_media_image: true field_number_of_servings: true field_preparation_time: true field_recipe_category: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_mode.media.medium_8_7.yml b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.medium_8_7.yml new file mode 100644 index 0000000000..cd2dcb6615 --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.medium_8_7.yml @@ -0,0 +1,9 @@ +langcode: en +status: true +dependencies: + module: + - media +id: media.medium_8_7 +label: 'Medium 8:7' +targetEntityType: media +cache: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_mode.media.responsive_3x2.yml b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.responsive_3x2.yml new file mode 100644 index 0000000000..ec295b54f0 --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.responsive_3x2.yml @@ -0,0 +1,9 @@ +langcode: en +status: true +dependencies: + module: + - media +id: media.responsive_3x2 +label: 'Responsive 3x2' +targetEntityType: media +cache: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_mode.media.scale_crop_7_3_large.yml b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.scale_crop_7_3_large.yml new file mode 100644 index 0000000000..89b4a7c273 --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.scale_crop_7_3_large.yml @@ -0,0 +1,9 @@ +langcode: en +status: true +dependencies: + module: + - media +id: media.scale_crop_7_3_large +label: 'Scale crop 7:3 large' +targetEntityType: media +cache: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_mode.media.square.yml b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.square.yml new file mode 100644 index 0000000000..029b0a7ed0 --- /dev/null +++ b/core/profiles/demo_umami/config/install/core.entity_view_mode.media.square.yml @@ -0,0 +1,9 @@ +langcode: en +status: true +dependencies: + module: + - media +id: media.square +label: Square +targetEntityType: media +cache: true diff --git a/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_banner_image.yml b/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_banner_image.yml deleted file mode 100644 index 66f3ebacde..0000000000 --- a/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_banner_image.yml +++ /dev/null @@ -1,37 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - block_content.type.banner_block - - field.storage.block_content.field_banner_image - module: - - image -id: block_content.banner_block.field_banner_image -field_name: field_banner_image -entity_type: block_content -bundle: banner_block -label: 'Banner image' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - file_directory: '[date:custom:Y]-[date:custom:m]' - file_extensions: 'png gif jpg jpeg' - max_filesize: '' - max_resolution: '' - min_resolution: '' - alt_field: true - alt_field_required: false - title_field: false - title_field_required: false - default_image: - uuid: null - alt: '' - title: '' - width: null - height: null - handler: 'default:file' - handler_settings: { } -field_type: image diff --git a/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_media_image.yml b/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_media_image.yml new file mode 100644 index 0000000000..a4ee3579d7 --- /dev/null +++ b/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_media_image.yml @@ -0,0 +1,27 @@ +langcode: en +status: true +dependencies: + config: + - block_content.type.banner_block + - field.storage.block_content.field_media_image + - media.type.image +id: block_content.banner_block.field_media_image +field_name: field_media_image +entity_type: block_content +bundle: banner_block +label: 'Media Image' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + image: image + sort: + field: _none + auto_create: true + auto_create_bundle: '' +field_type: entity_reference diff --git a/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_media_image.yml b/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_media_image.yml new file mode 100644 index 0000000000..aec17bec0f --- /dev/null +++ b/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_media_image.yml @@ -0,0 +1,27 @@ +langcode: en +status: true +dependencies: + config: + - block_content.type.footer_promo_block + - field.storage.block_content.field_media_image + - media.type.image +id: block_content.footer_promo_block.field_media_image +field_name: field_media_image +entity_type: block_content +bundle: footer_promo_block +label: 'Media Image' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + image: image + sort: + field: _none + auto_create: true + auto_create_bundle: '' +field_type: entity_reference diff --git a/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_promo_image.yml b/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_promo_image.yml deleted file mode 100644 index 0721324b2e..0000000000 --- a/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_promo_image.yml +++ /dev/null @@ -1,37 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - block_content.type.footer_promo_block - - field.storage.block_content.field_promo_image - module: - - image -id: block_content.footer_promo_block.field_promo_image -field_name: field_promo_image -entity_type: block_content -bundle: footer_promo_block -label: 'Promo image' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - file_directory: '[date:custom:Y]-[date:custom:m]' - file_extensions: 'png gif jpg jpeg' - max_filesize: '' - max_resolution: '' - min_resolution: '' - alt_field: true - alt_field_required: false - title_field: false - title_field_required: false - default_image: - uuid: null - alt: '' - title: '' - width: null - height: null - handler: 'default:file' - handler_settings: { } -field_type: image diff --git a/core/profiles/demo_umami/config/install/field.field.node.article.field_image.yml b/core/profiles/demo_umami/config/install/field.field.node.article.field_image.yml deleted file mode 100644 index b4b1c1466b..0000000000 --- a/core/profiles/demo_umami/config/install/field.field.node.article.field_image.yml +++ /dev/null @@ -1,37 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_image - - node.type.article - module: - - image -id: node.article.field_image -field_name: field_image -entity_type: node -bundle: article -label: Image -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - file_directory: '[date:custom:Y]-[date:custom:m]' - file_extensions: 'png gif jpg jpeg' - max_filesize: '' - max_resolution: '' - min_resolution: '' - alt_field: true - title_field: false - alt_field_required: true - title_field_required: false - default_image: - uuid: null - alt: '' - title: '' - width: null - height: null - handler: 'default:file' - handler_settings: { } -field_type: image diff --git a/core/profiles/demo_umami/config/install/field.field.node.article.field_media_image.yml b/core/profiles/demo_umami/config/install/field.field.node.article.field_media_image.yml new file mode 100644 index 0000000000..c60f6a2195 --- /dev/null +++ b/core/profiles/demo_umami/config/install/field.field.node.article.field_media_image.yml @@ -0,0 +1,27 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_media_image + - media.type.image + - node.type.article +id: node.article.field_media_image +field_name: field_media_image +entity_type: node +bundle: article +label: 'Media Image' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + image: image + sort: + field: _none + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/core/profiles/demo_umami/config/install/field.field.node.recipe.field_image.yml b/core/profiles/demo_umami/config/install/field.field.node.recipe.field_image.yml deleted file mode 100644 index fd6127ab29..0000000000 --- a/core/profiles/demo_umami/config/install/field.field.node.recipe.field_image.yml +++ /dev/null @@ -1,37 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_image - - node.type.recipe - module: - - image -id: node.recipe.field_image -field_name: field_image -entity_type: node -bundle: recipe -label: Image -description: 'This image will be used on both the recipe page and wherever the recipe is promoted.' -required: true -translatable: true -default_value: { } -default_value_callback: '' -settings: - file_directory: '[date:custom:Y]-[date:custom:m]' - file_extensions: 'png gif jpg jpeg' - max_filesize: '' - max_resolution: '' - min_resolution: '' - alt_field: true - alt_field_required: true - title_field: false - title_field_required: false - default_image: - uuid: null - alt: '' - title: '' - width: null - height: null - handler: 'default:file' - handler_settings: { } -field_type: image diff --git a/core/profiles/demo_umami/config/install/field.field.node.recipe.field_media_image.yml b/core/profiles/demo_umami/config/install/field.field.node.recipe.field_media_image.yml new file mode 100644 index 0000000000..f6006b2bd6 --- /dev/null +++ b/core/profiles/demo_umami/config/install/field.field.node.recipe.field_media_image.yml @@ -0,0 +1,27 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_media_image + - media.type.image + - node.type.recipe +id: node.recipe.field_media_image +field_name: field_media_image +entity_type: node +bundle: recipe +label: 'Media Image' +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + image: image + sort: + field: _none + auto_create: true + auto_create_bundle: '' +field_type: entity_reference diff --git a/core/profiles/demo_umami/config/install/field.storage.block_content.field_banner_image.yml b/core/profiles/demo_umami/config/install/field.storage.block_content.field_banner_image.yml deleted file mode 100644 index 205e490bbb..0000000000 --- a/core/profiles/demo_umami/config/install/field.storage.block_content.field_banner_image.yml +++ /dev/null @@ -1,29 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - block_content - - file - - image -id: block_content.field_banner_image -field_name: field_banner_image -entity_type: block_content -type: image -settings: - uri_scheme: public - default_image: - uuid: null - alt: '' - title: '' - width: null - height: null - target_type: file - display_field: false - display_default: false -module: image -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/core/profiles/demo_umami/config/install/field.storage.block_content.field_media_image.yml b/core/profiles/demo_umami/config/install/field.storage.block_content.field_media_image.yml new file mode 100644 index 0000000000..3cf3728e51 --- /dev/null +++ b/core/profiles/demo_umami/config/install/field.storage.block_content.field_media_image.yml @@ -0,0 +1,19 @@ +langcode: en +status: true +dependencies: + module: + - block_content + - media +id: block_content.field_media_image +field_name: field_media_image +entity_type: block_content +type: entity_reference +settings: + target_type: media +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/core/profiles/demo_umami/config/install/field.storage.block_content.field_promo_image.yml b/core/profiles/demo_umami/config/install/field.storage.block_content.field_promo_image.yml deleted file mode 100644 index 4f5f344314..0000000000 --- a/core/profiles/demo_umami/config/install/field.storage.block_content.field_promo_image.yml +++ /dev/null @@ -1,29 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - block_content - - file - - image -id: block_content.field_promo_image -field_name: field_promo_image -entity_type: block_content -type: image -settings: - uri_scheme: public - default_image: - uuid: null - alt: '' - title: '' - width: null - height: null - target_type: file - display_field: false - display_default: false -module: image -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/core/profiles/demo_umami/config/install/field.storage.node.field_image.yml b/core/profiles/demo_umami/config/install/field.storage.node.field_image.yml deleted file mode 100644 index e4da708546..0000000000 --- a/core/profiles/demo_umami/config/install/field.storage.node.field_image.yml +++ /dev/null @@ -1,31 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - file - - image - - node -id: node.field_image -field_name: field_image -entity_type: node -type: image -settings: - uri_scheme: public - default_image: - uuid: null - alt: '' - title: '' - width: null - height: null - target_type: file - display_field: false - display_default: false -module: image -locked: false -cardinality: 1 -translatable: true -indexes: - target_id: - - target_id -persist_with_no_fields: false -custom_storage: false diff --git a/core/profiles/demo_umami/config/install/field.storage.node.field_media_image.yml b/core/profiles/demo_umami/config/install/field.storage.node.field_media_image.yml new file mode 100644 index 0000000000..4b1e206143 --- /dev/null +++ b/core/profiles/demo_umami/config/install/field.storage.node.field_media_image.yml @@ -0,0 +1,19 @@ +langcode: en +status: true +dependencies: + module: + - media + - node +id: node.field_media_image +field_name: field_media_image +entity_type: node +type: entity_reference +settings: + target_type: media +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/core/profiles/demo_umami/config/install/language.content_settings.media.image.yml b/core/profiles/demo_umami/config/install/language.content_settings.media.image.yml new file mode 100644 index 0000000000..653a78e661 --- /dev/null +++ b/core/profiles/demo_umami/config/install/language.content_settings.media.image.yml @@ -0,0 +1,15 @@ +langcode: en +status: true +dependencies: + config: + - media.type.image + module: + - content_translation +third_party_settings: + content_translation: + enabled: true +id: media.image +target_entity_type_id: media +target_bundle: image +default_langcode: site_default +language_alterable: true diff --git a/core/profiles/demo_umami/config/install/media.type.image.yml b/core/profiles/demo_umami/config/install/media.type.image.yml index e38d5f93d1..9527f625fc 100644 --- a/core/profiles/demo_umami/config/install/media.type.image.yml +++ b/core/profiles/demo_umami/config/install/media.type.image.yml @@ -9,5 +9,4 @@ queue_thumbnail_downloads: false new_revision: true source_configuration: source_field: field_media_image -field_map: - name: name +field_map: { } diff --git a/core/profiles/demo_umami/config/optional/views.view.media.yml b/core/profiles/demo_umami/config/optional/views.view.media.yml new file mode 100644 index 0000000000..584b5f504c --- /dev/null +++ b/core/profiles/demo_umami/config/optional/views.view.media.yml @@ -0,0 +1,904 @@ +langcode: en +status: true +dependencies: + config: + - image.style.thumbnail + module: + - image + - media + - user +id: media +label: Media +module: views +description: 'Find and manage media.' +tag: '' +base_table: media_field_data +base_field: mid +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access media overview' + cache: + type: tag + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: '' + query_tags: { } + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: full + options: + items_per_page: 50 + offset: 0 + id: 0 + total_pages: null + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + tags: + previous: '‹ Previous' + next: 'Next ›' + first: '« First' + last: 'Last »' + quantity: 9 + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + override: true + sticky: false + caption: '' + summary: '' + description: '' + columns: + name: name + bundle: bundle + changed: changed + uid: uid + status: status + thumbnail__target_id: thumbnail__target_id + info: + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + bundle: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + uid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + thumbnail__target_id: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + default: changed + empty_table: true + row: + type: fields + fields: + media_bulk_form: + id: media_bulk_form + table: media + field: media_bulk_form + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + action_title: Action + include_exclude: exclude + selected_actions: { } + entity_type: media + plugin_id: bulk_form + thumbnail__target_id: + id: thumbnail__target_id + table: media_field_data + field: thumbnail__target_id + relationship: none + group_type: group + admin_label: '' + label: Thumbnail + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: image + settings: + image_style: thumbnail + image_link: '' + group_column: '' + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: media + entity_field: thumbnail + plugin_id: field + name: + id: name + table: media_field_data + field: name + entity_type: media + entity_field: media + alter: + alter_text: false + make_link: false + absolute: false + trim: false + word_boundary: false + ellipsis: false + strip_tags: false + html: false + hide_empty: false + empty_zero: false + settings: + link_to_entity: true + plugin_id: field + relationship: none + group_type: group + admin_label: '' + label: 'Media name' + exclude: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_alter_empty: true + click_sort_column: value + type: string + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + bundle: + id: bundle + table: media_field_data + field: bundle + relationship: none + group_type: group + admin_label: '' + label: Type + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: false + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: media + entity_field: bundle + plugin_id: field + uid: + id: uid + table: media_field_data + field: uid + relationship: none + group_type: group + admin_label: '' + label: Author + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: media + entity_field: uid + plugin_id: field + status: + id: status + table: media_field_data + field: status + relationship: none + group_type: group + admin_label: '' + label: Status + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: boolean + settings: + format: custom + format_custom_true: Published + format_custom_false: Unpublished + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: media + entity_field: status + plugin_id: field + changed: + id: changed + table: media_field_data + field: changed + relationship: none + group_type: group + admin_label: '' + label: Updated + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: short + custom_date_format: '' + timezone: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: media + entity_field: changed + plugin_id: field + operations: + id: operations + table: media + field: operations + relationship: none + group_type: group + admin_label: '' + label: Operations + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + destination: true + entity_type: media + plugin_id: entity_operations + filters: + name: + id: name + table: media_field_data + field: name + relationship: none + group_type: group + admin_label: '' + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: name_op + label: 'Media name' + description: '' + use_operator: false + operator: name_op + identifier: name + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + operator_limit_selection: false + operator_list: { } + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: media + entity_field: name + plugin_id: string + bundle: + id: bundle + table: media_field_data + field: bundle + relationship: none + group_type: group + admin_label: '' + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: bundle_op + label: Type + description: '' + use_operator: false + operator: bundle_op + identifier: type + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + reduce: false + operator_limit_selection: false + operator_list: { } + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: media + entity_field: bundle + plugin_id: bundle + status: + id: status + table: media_field_data + field: status + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: '1' + group: 1 + exposed: true + expose: + operator_id: '' + label: 'True' + description: null + use_operator: false + operator: status_op + identifier: status + required: true + remember: false + multiple: false + remember_roles: + authenticated: authenticated + operator_limit_selection: false + operator_list: { } + is_grouped: true + group_info: + label: 'Published status' + description: '' + identifier: status + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: + title: Published + operator: '=' + value: '1' + 2: + title: Unpublished + operator: '=' + value: '0' + plugin_id: boolean + entity_type: media + entity_field: status + status_extra: + id: status_extra + table: media_field_data + field: status_extra + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: '' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: media + plugin_id: media_status + langcode: + id: langcode + table: media_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: langcode_op + label: Language + description: '' + use_operator: false + operator: langcode_op + identifier: langcode + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + reduce: false + operator_limit_selection: false + operator_list: { } + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: media + entity_field: langcode + plugin_id: language + sorts: + created: + id: created + table: media_field_data + field: created + order: DESC + entity_type: media + entity_field: created + plugin_id: date + relationship: none + group_type: group + admin_label: '' + exposed: false + expose: + label: '' + granularity: second + title: Media + header: { } + footer: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + empty: true + tokenize: false + content: 'No media available.' + plugin_id: text_custom + relationships: { } + arguments: { } + display_extenders: { } + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user + - user.permissions + tags: { } + media_page_list: + display_plugin: page + id: media_page_list + display_title: Media + position: 1 + display_options: + display_extenders: { } + path: admin/content/media + menu: + type: tab + title: Media + description: '' + expanded: false + parent: '' + weight: 0 + context: '0' + menu_name: main + display_description: '' + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user + - user.permissions + tags: { } diff --git a/core/profiles/demo_umami/demo_umami.info.yml b/core/profiles/demo_umami/demo_umami.info.yml index c2efc4464e..b065ab9a92 100644 --- a/core/profiles/demo_umami/demo_umami.info.yml +++ b/core/profiles/demo_umami/demo_umami.info.yml @@ -24,6 +24,7 @@ install: - help - image - media + - media_library - menu_ui - options - path diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/banner_block.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/banner_block.csv index 20795cc36a..421c91c6f8 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/banner_block.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/banner_block.csv @@ -1,3 +1,3 @@ -id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,field_banner_image_target_id,field_banner_image_alt -umami_home_banner,9aadf4a1-ded6-4017-a10d-a5e043396edf,"Umami Home Banner",banner_block,"Super easy vegetarian pasta bake",recipe,3,"View recipe","A wholesome pasta bake is the ultimate comfort food. This delicious bake is super quick to prepare and an ideal midweek meal for all the family.",veggie-pasta-bake-hero-umami.jpg,"Mouth watering vegetarian pasta bake with rich tomato sauce and cheese toppings" -umami_recipes_banner,4c7d58a3-a45d-412d-9068-259c57e40541,"Umami Recipes Banner",banner_block,"Vegan chocolate and nut brownies",recipe,2,"View recipe","These sumptuous brownies should be gooey on the inside and crisp on the outside. A perfect indulgence!",vegan-brownies-hero-umami.jpg,"A stack of chocolate and pecan brownies, sprinkled with pecan crumbs and crushed walnut, fresh out of the oven" +id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,image_reference +umami_home_banner,9aadf4a1-ded6-4017-a10d-a5e043396edf,Umami Home Banner,banner_block,Super easy vegetarian pasta bake,recipe,3,View recipe,A wholesome pasta bake is the ultimate comfort food. This delicious bake is super quick to prepare and an ideal midweek meal for all the family.,18 +umami_recipes_banner,4c7d58a3-a45d-412d-9068-259c57e40541,Umami Recipes Banner,banner_block,Vegan chocolate and nut brownies,recipe,2,View recipe,These sumptuous brownies should be gooey on the inside and crisp on the outside. A perfect indulgence!,20 diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/footer_promo_block.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/footer_promo_block.csv index 74232cb496..2dcc5091d2 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/footer_promo_block.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/block_content/footer_promo_block.csv @@ -1,2 +1,2 @@ -id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,field_promo_image_target_id,field_promo_image_alt -umami_footer_promo,924ab293-8f5f-45a1-9c7f-2423ae61a241,"Umami footer promo",footer_promo_block,"Umami Food Magazine",page,1,"Find out more","Skills and know-how. Magazine exclusive articles, recipes and plenty of reasons to get your copy today.",umami-bundle.png,"3 issue bundle of the Umami food magazine" +id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,image_reference +umami_footer_promo,924ab293-8f5f-45a1-9c7f-2423ae61a241,Umami footer promo,footer_promo_block,Umami Food Magazine,page,1,Find out more,"Skills and know-how. Magazine exclusive articles, recipes and plenty of reasons to get your copy today.",19 diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/media/image.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/media/image.csv new file mode 100644 index 0000000000..1aa163db92 --- /dev/null +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/media/image.csv @@ -0,0 +1,21 @@ +id,title,image,alt,author +1,Deep mediterranean quiche,mediterranean-quiche-umami.jpg,A delicious deep layered Mediterranean quiche with basil garnish,Umami +2,Vegan chocolate and nut brownies,vegan-chocolate-nut-brownies.jpg,"A stack of chocolate and pecan brownies, sprinkled with pecan crumbs and crushed walnut, fresh out of the oven",Umami +3,Super easy vegetarian pasta bake,veggie-pasta-bake-umami.jpg,Cheesy pasta dish with vegetarian sausages and topped with mozzarella cheese and basil,Umami +4,Watercress soup,watercress-soup-umami.jpg,Watercress soup with a sprig of coriander as garnish in a white bowl with green trim,Umami +5,Victoria sponge cake,victoria-sponge-umami.jpg,"A classic, uncut Victoria sponge with a deep filling of butter cream and jam",Umami +6,Gluten free pizza,pizza-umami.jpg,"Olives, basil, and mozzarella top a gluten free pizza crust with marinara sauce",Umami +7,Thai green curry,thai-green-curry-umami.jpg,"A traditional bowl of creamy, aromatic Thai green curry with chunks of chicken in a small bowl with jasmine rice",Umami +8,Crema catalana,crema-catalana-umami.jpg,"Typical Catalan dessert made from cream and egg yolks, covered with a traditional layer of caramelized sugar to provide a crispy contrast",Umami +9,Fiery chili sauce,chili-sauce-umami.jpg,"An iridescent array of chilies, onions, and garlic, slowly sweating over a low heat",Umami +10,Home Grown Herbs,home-grown-herbs.jpg,"Fresh cut herbs including mint, parsley, thyme and dill",Holly Foat +11,Vegan Chocolate,vegan-chocolate.jpg,"A delicious bar of dairy-free milk chocolate, broken into pieces",Umami +12,Supermarket Savvy Umami,supermarket-savvy-umami.jpg,Leafy greens presented on supermarket produce shelving,Megan Collins Quinlan +13,Mushrooms Umami,mushrooms-umami.jpg,A delightful selection of mushroom varieties laid out on a simple wooden plate,Umami +14,Heritage Carrots,heritage-carrots.jpg,"Purple, orange, yellow and white heritage carrots",Umami +15,Chocolate Brownie Umami,chocolate-brownie-umami.jpg,A delicious chocolate brownie,Umami +16,Mojito Mocktail,mojito-mocktail.jpg,"Fresh mojito mocktail with garnish of mint leaves, ice, and sliced lime",Megan Collins Quinlan +17,Oatmeal Fruit Syrop Topping,oatmeal-fruit-syrup-topping.jpg,"Oatmeal topped with a vibrant mix of berries, nuts, and seeds",Umami +18,Mouth watering vegetarian pasta bake with rich tomato sauce and cheese toppings,veggie-pasta-bake-hero-umami.jpg,Mouth watering vegetarian pasta bake with rich tomato sauce and cheese toppings,Umami +19,3 issue bundle of the Umami food magazine,umami-bundle.png,3 issue bundle of the Umami food magazine,Umami +20,(Hero) Vegan chocolate and nut brownies,vegan-brownies-hero-umami.jpg,"A stack of chocolate and pecan brownies, sprinkled with pecan crumbs and crushed walnut, fresh out of the oven",Umami diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/article.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/article.csv index 5a3a2f8898..5f2b3dfde7 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/article.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/article.csv @@ -1,9 +1,9 @@ -id,title,body,author,slug,image,alt,tags -1,Give it a go and grow your own herbs,give-it-a-go-and-grow-your-own-herbs.html,Holly Foat,articles/give-it-a-go-and-grow-your-own-herbs,home-grown-herbs.jpg,"Fresh cut herbs including mint, parsley, thyme and dill","14,23,16" -2,Dairy-free and delicious milk chocolate,dairy-free-delicious-milk-chocolate.html,Umami,articles/dairy-free-and-delicious-milk-chocolate,vegan-chocolate.jpg,"A delicious bar of dairy-free milk chocolate, broken into pieces.","27,7" -3,The real deal for supermarket savvy shopping,the-real-deal-for-supermarket-savvy-shopping.html,Megan Collins Quinlan,articles/the-real-deal-for-supermarket-savvy-shopping,supermarket-savvy-umami.jpg,Leafy greens presented on supermarket produce shelving.,"26,24" -4,The Umami guide to our favorite mushrooms,the-umami-guide-to-our-favourite-mushrooms.html,Umami,articles/the-umami-guide-to-our-favourite-mushrooms,mushrooms-umami.jpg,A delightful selection of mushroom varieties laid out on a simple wooden plate.,"18,28" -5,Let's hear it for carrots,lets-hear-it-for-carrots.html,Umami,articles/lets-hear-it-for-carrots,heritage-carrots.jpg,"Purple, orange, yellow and white heritage carrots.","6,28,15" -6,Baking mishaps - our troubleshooting tips,baking-mishaps-our-troubleshooting-tips.html,"Umami",articles/baking-mishaps-our-troubleshooting-tips,chocolate-brownie-umami.jpg,"A delicious chocolate brownie","3,17" -7,Skip the spirits with delicious mocktails,skip-the-spirits-with-delicious-mocktails.html,Megan Collins Quinlan,articles/skip-the-spirits-with-delicious-mocktails,mojito-mocktail.jpg,"Fresh mojito mocktail with garnish of mint leaves, ice, and sliced lime","1,12,20,8,11" -8,Give your oatmeal the ultimate makeover,give-your-oatmeal-the-ultimate-makeover.html,Umami,articles/give-your-oatmeal-the-ultimate-makeover,oatmeal-fruit-syrup-topping.jpg,"Oatmeal topped with a vibrant mix of berries, nuts, and seeds","27,28,19,4,10" +id,title,body,author,slug,image_reference,tags +1,Give it a go and grow your own herbs,give-it-a-go-and-grow-your-own-herbs.html,Holly Foat,articles/give-it-a-go-and-grow-your-own-herbs,10,"14,23,16" +2,Dairy-free and delicious milk chocolate,dairy-free-delicious-milk-chocolate.html,Umami,articles/dairy-free-and-delicious-milk-chocolate,11,"27,7" +3,The real deal for supermarket savvy shopping,the-real-deal-for-supermarket-savvy-shopping.html,Megan Collins Quinlan,articles/the-real-deal-for-supermarket-savvy-shopping,12,"26,24" +4,The Umami guide to our favorite mushrooms,the-umami-guide-to-our-favourite-mushrooms.html,Umami,articles/the-umami-guide-to-our-favourite-mushrooms,13,"18,28" +5,Let's hear it for carrots,lets-hear-it-for-carrots.html,Umami,articles/lets-hear-it-for-carrots,14,"6,28,15" +6,Baking mishaps - our troubleshooting tips,baking-mishaps-our-troubleshooting-tips.html,Umami,articles/baking-mishaps-our-troubleshooting-tips,15,"3,17" +7,Skip the spirits with delicious mocktails,skip-the-spirits-with-delicious-mocktails.html,Megan Collins Quinlan,articles/skip-the-spirits-with-delicious-mocktails,16,"1,12,20,8,11" +8,Give your oatmeal the ultimate makeover,give-your-oatmeal-the-ultimate-makeover.html,Umami,articles/give-your-oatmeal-the-ultimate-makeover,17,"27,28,19,4,10" diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv index 1580e1b10f..68378bc608 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/node/recipe.csv @@ -1,10 +1,10 @@ -id,title,image,alt,summary,author,recipe_category,preparation_time,cooking_time,total_time,difficulty,ingredients,recipe_instruction,number_of_servings,tags,slug -1,Deep mediterranean quiche,mediterranean-quiche-umami.jpg,"A delicious deep layered Mediterranean quiche with basil garnish.",An Italian inspired quiche with sun dried tomatoes and courgette. A perfect light meal for a summer's day.,Umami,3,40,30,70,medium,"For the pastry:,280g plain flour,140g butter,Cold water,For the filling:,1 onion,2 garlic cloves,Half a courgette,450ml soya milk,500g grated parmesan,2 eggs,200g sun dried tomatoes,100g feta",mediterranean-quiche-umami.html,8,"22,13",recipes/deep-mediterranean-quiche -2,Vegan chocolate and nut brownies,vegan-chocolate-nut-brownies.jpg,"A stack of chocolate and pecan brownies, sprinkled with pecan crumbs and crushed walnut, fresh out of the oven","Scrumptious vegan chocolate brownies that are rich, fudgy, and nutty. These delights have a surprise hint of coconut making them the perfect indulgence. Serve warm with a little vanilla dairy-free ice cream!",Umami,4,20,20,40,medium,"6 tbsp sunflower oil, 80g vegan dark chocolate, 170g plain flour, 80g coconut flour, 1 tsp baking powder, 9 tsp cocoa powder, 100g caster sugar, 3 tbsp of maple syrup, 1/4 tsp sea salt, 1 tsp vanilla extract, 230ml unsweetened organic soya milk, 100g pecan nuts, 80g walnut halves",vegan-chocolate-nut-brownies.html,12,"3,7,27,9",recipes/vegan-chocolate-and-nut-brownies -3,Super easy vegetarian pasta bake,veggie-pasta-bake-umami.jpg,Cheesy pasta dish with vegetarian sausages and topped with mozzarella cheese and basil,A wholesome pasta bake is the ultimate comfort food. This delicious bake is super quick to prepare and an ideal midweek meal for all the family.,Umami,3,5,20,25,easy,"400g wholewheat pasta, 1 onion, 2 garlic cloves, 1 pack vegetarian sausages, 400g chopped tomatoes, 50g sliced sun dried tomatoes, 1 pinch sugar, 3 tbsp red pesto, 50g cheddar cheese, Basil or mixed herbs, 100g mozzarella",veggie-pasta-bake-umami.html,4,"28,21,2",recipes/super-easy-vegetarian-pasta-bake -4,Watercress soup,watercress-soup-umami.jpg,Watercress soup with a sprig of coriander as garnish in a white bowl with green trim.,"A wonderfully simple and light soup, making the most of seasonal, local produce. ",Umami,5,10,20,30,easy,"3 bunches watercress,3 potatoes,3 onions,2 leeks,800ml stock,5 tbsp crème fraîche",watercress-soup-umami.html,4,"25,28",recipes/watercress-soup -5,Victoria sponge cake,victoria-sponge-umami.jpg,"A classic, uncut Victoria sponge with a deep filling of butter cream and jam","A traditional Victoria sponge cake, perfect for any afternoon with a cup of tea.",Umami,2,20,20,40,easy,"225g butter or margarine,225g caster sugar,225g self-raising flour,4 eggs,1 tsp baking powder,3 tbsp of jam for the filling,Icing sugar to dust the top,Cream to serve",victoria-sponge-umami.html,10,5,recipes/victoria-sponge-cake -6,Gluten free pizza,pizza-umami.jpg,"Olives, basil, and mozzarella top a gluten free pizza crust with marinara sauce.","A gorgeous and simple gluten free pizza, with deliciously indulgent mozzarella and Parma ham. Can easily be vegetarian by leaving out the ham.",Umami,3,15,15,30,,"400g gluten free flour, 125ml warm water, 125ml milk, 1 sachet dried yeast, 2 tsp sugar, 1 tsp salt, 2 tbsp olive oil, 4 tbsp tomato puree, 1 garlic clove, Fresh basil, 200g mozzarella, 100g rocket, 5 slices Parma ham",pizza-umami.html,4,,recipes/gluten-free-pizza -7,Thai green curry,thai-green-curry-umami.jpg,"A traditional bowl of creamy, aromatic Thai green curry with chunks of chicken in a small bowl with jasmine rice.",A quick and easy version of the classic Thai green curry. Perfect for a midweek meal!,Umami,3,10,15,25,,"400g coconut milk, 400g chicken or tofu, 1 tbsp Thai green curry paste, 1 garlic clove, 2 tsp fish sauce, 400g mushrooms, 200g green beans, Fresh coriander leaves, Jasmine rice",thai-green-curry-umami.html,4,,recipes/thai-green-curry -8,Crema catalana,crema-catalana-umami.jpg,"Typical Catalan dessert made from cream and egg yolks, covered with a traditional layer of caramelized sugar to provide a crispy contrast.",Enjoy this sweet recipe for one of the oldest desserts in Europe. It requires very few ingredients!,Umami,2,10,20,30,,"1l milk, 200g sugar, 6 egg yolks, 30g cornstarch, 1 cinnamon stick, 1 piece lemon peel",crema-catalana-umami.html,8,"13,28",recipes/crema-catalana -9,Fiery chili sauce,chili-sauce-umami.jpg,"An iridescent array of chilies, onions, and garlic, slowly sweating over a low heat","A rich and fiery chili sauce. Take care when handling chili peppers. And serve sparingly!",Umami,1,10,50,60,easy,"2 red onions, 1 lemon, 2 limes, 250ml malt vinegar, 7 garlic cloves, 1 green bell pepper, 1 red bell pepper, 800g cherry tomatoes, 30 mixed chilies, Olive oil, 1 tbsp ground black pepper, 1 tbsp brown sugar",chili-sauce-umami.html,60,28,recipes/fiery-chili-sauce +id,title,image_reference,summary,author,recipe_category,preparation_time,cooking_time,total_time,difficulty,ingredients,recipe_instruction,number_of_servings,tags,slug +1,Deep mediterranean quiche,1,An Italian inspired quiche with sun dried tomatoes and courgette. A perfect light meal for a summer's day.,Umami,3,40,30,70,medium,"For the pastry:,280g plain flour,140g butter,Cold water,For the filling:,1 onion,2 garlic cloves,Half a courgette,450ml soya milk,500g grated parmesan,2 eggs,200g sun dried tomatoes,100g feta",mediterranean-quiche-umami.html,8,"22,13",recipes/deep-mediterranean-quiche +2,Vegan chocolate and nut brownies,2,"Scrumptious vegan chocolate brownies that are rich, fudgy, and nutty. These delights have a surprise hint of coconut making them the perfect indulgence. Serve warm with a little vanilla dairy-free ice cream!",Umami,4,20,20,40,medium,"6 tbsp sunflower oil, 80g vegan dark chocolate, 170g plain flour, 80g coconut flour, 1 tsp baking powder, 9 tsp cocoa powder, 100g caster sugar, 3 tbsp of maple syrup, 1/4 tsp sea salt, 1 tsp vanilla extract, 230ml unsweetened organic soya milk, 100g pecan nuts, 80g walnut halves",vegan-chocolate-nut-brownies.html,12,"3,7,27,9",recipes/vegan-chocolate-and-nut-brownies +3,Super easy vegetarian pasta bake,3,A wholesome pasta bake is the ultimate comfort food. This delicious bake is super quick to prepare and an ideal midweek meal for all the family.,Umami,3,5,20,25,easy,"400g wholewheat pasta, 1 onion, 2 garlic cloves, 1 pack vegetarian sausages, 400g chopped tomatoes, 50g sliced sun dried tomatoes, 1 pinch sugar, 3 tbsp red pesto, 50g cheddar cheese, Basil or mixed herbs, 100g mozzarella",veggie-pasta-bake-umami.html,4,"28,21,2",recipes/super-easy-vegetarian-pasta-bake +4,Watercress soup,4,"A wonderfully simple and light soup, making the most of seasonal, local produce. ",Umami,5,10,20,30,easy,"3 bunches watercress,3 potatoes,3 onions,2 leeks,800ml stock,5 tbsp crème fraîche",watercress-soup-umami.html,4,"25,28",recipes/watercress-soup +5,Victoria sponge cake,5,"A traditional Victoria sponge cake, perfect for any afternoon with a cup of tea.",Umami,2,20,20,40,easy,"225g butter or margarine,225g caster sugar,225g self-raising flour,4 eggs,1 tsp baking powder,3 tbsp of jam for the filling,Icing sugar to dust the top,Cream to serve",victoria-sponge-umami.html,10,5,recipes/victoria-sponge-cake +6,Gluten free pizza,6,"A gorgeous and simple gluten free pizza, with deliciously indulgent mozzarella and Parma ham. Can easily be vegetarian by leaving out the ham.",Umami,3,15,15,30,,"400g gluten free flour, 125ml warm water, 125ml milk, 1 sachet dried yeast, 2 tsp sugar, 1 tsp salt, 2 tbsp olive oil, 4 tbsp tomato puree, 1 garlic clove, Fresh basil, 200g mozzarella, 100g rocket, 5 slices Parma ham",pizza-umami.html,4,,recipes/gluten-free-pizza +7,Thai green curry,7,A quick and easy version of the classic Thai green curry. Perfect for a midweek meal!,Umami,3,10,15,25,,"400g coconut milk, 400g chicken or tofu, 1 tbsp Thai green curry paste, 1 garlic clove, 2 tsp fish sauce, 400g mushrooms, 200g green beans, Fresh coriander leaves, Jasmine rice",thai-green-curry-umami.html,4,,recipes/thai-green-curry +8,Crema catalana,8,Enjoy this sweet recipe for one of the oldest desserts in Europe. It requires very few ingredients!,Umami,2,10,20,30,,"1l milk, 200g sugar, 6 egg yolks, 30g cornstarch, 1 cinnamon stick, 1 piece lemon peel",crema-catalana-umami.html,8,"13,28",recipes/crema-catalana +9,Fiery chili sauce,9,A rich and fiery chili sauce. Take care when handling chili peppers. And serve sparingly!,Umami,1,10,50,60,easy,"2 red onions, 1 lemon, 2 limes, 250ml malt vinegar, 7 garlic cloves, 1 green bell pepper, 1 red bell pepper, 800g cherry tomatoes, 30 mixed chilies, Olive oil, 1 tbsp ground black pepper, 1 tbsp brown sugar",chili-sauce-umami.html,60,28,recipes/fiery-chili-sauce diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/banner_block.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/banner_block.csv index 9c17d68a77..dd51359a9c 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/banner_block.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/banner_block.csv @@ -1,3 +1,3 @@ -id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,field_banner_image_target_id,field_banner_image_alt -umami_home_banner,9aadf4a1-ded6-4017-a10d-a5e043396edf,"Umami Casa Pancarta",banner_block,"Pasta vegetariana horneada súper fácil",recipe,3,"Ver receta","Una pasta al horno es la comida más reconfortante que hay. Este plato al horno es súper rápido de preparar y es ideal para cocinar entre semana para toda la familia.",veggie-pasta-bake-hero-umami.jpg,"Pasta vegetariana al horno con una rica salsa de tomate cubierta de queso que hará que se te haga la boca agua." -umami_recipes_banner,4c7d58a3-a45d-412d-9068-259c57e40541,"Umami Recetas Pancarta",banner_block,"Brownies Veganos de Chocolate y Nuez",recipe,2,"Ver receta","Estos exquisitos brownies quedarán sabrosos por dentro y crujientes por fuera. ¡La tentación perfecta!",vegan-brownies-hero-umami.jpg,"Una torre de brownies de chocolate y nueces pecanas, espolvoreadas con pedacitos de nueces pecanas y avellanas, recién salida del horno." +id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,image_reference +umami_home_banner,9aadf4a1-ded6-4017-a10d-a5e043396edf,Umami Casa Pancarta,banner_block,Pasta vegetariana horneada súper fácil,recipe,3,Ver receta,Una pasta al horno es la comida más reconfortante que hay. Este plato al horno es súper rápido de preparar y es ideal para cocinar entre semana para toda la familia.,18 +umami_recipes_banner,4c7d58a3-a45d-412d-9068-259c57e40541,Umami Recetas Pancarta,banner_block,Brownies Veganos de Chocolate y Nuez,recipe,2,Ver receta,Estos exquisitos brownies quedarán sabrosos por dentro y crujientes por fuera. ¡La tentación perfecta!,20 diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/footer_promo_block.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/footer_promo_block.csv index ef8f273bc6..7c0b8853dc 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/footer_promo_block.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/block_content/footer_promo_block.csv @@ -1,2 +1,2 @@ -id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,field_promo_image_target_id,field_promo_image_alt -umami_footer_promo,924ab293-8f5f-45a1-9c7f-2423ae61a241,"Umami Pie de Pagina Promocional",footer_promo_block,"Revista de Comida Umami",page,1,"Más información","Trucos y consejos. Artículos exclusivos de la revista, recetas y una variedad de razones para conseguir tu copia hoy.",umami-bundle.png,"Paquete de 3 ediciones de la revista de comida Umami" +id,uuid,info,type,field_title,content_type,node_id,field_content_link_title,field_summary,image_reference +umami_footer_promo,924ab293-8f5f-45a1-9c7f-2423ae61a241,Umami Pie de Pagina Promocional,footer_promo_block,Revista de Comida Umami,page,1,Más información,"Trucos y consejos. Artículos exclusivos de la revista, recetas y una variedad de razones para conseguir tu copia hoy.",19 diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/media/image.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/media/image.csv new file mode 100644 index 0000000000..6933520a82 --- /dev/null +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/media/image.csv @@ -0,0 +1,21 @@ +id,title,image,alt,author +1,Quiche mediterráneo profundo,mediterranean-quiche-umami.jpg,Un delicioso quiche mediterráneo de capas profundas con guarnición de albahaca.,Umami +2,Bizcochos veganos de chocolate y nueces,vegan-chocolate-nut-brownies.jpg,"Una pila de brownies de chocolate y nuez, rociados con migas de nuez y nuez triturada, recién sacados del horno",Umami +3,Pasta vegetariana al horno súper fácil,veggie-pasta-bake-umami.jpg,Plato de pasta con salchichas vegetarianas y cubierto con queso mozzarella y albahaca,Umami +4,Sopa de berro,watercress-soup-umami.jpg,Sopa de berros con una ramita de cilantro como guarnición en un tazón blanco con borde verde.,Umami +5,Pastel Victoria,victoria-sponge-umami.jpg,"Una esponja Victoria clásica, sin cortar, con un relleno profundo de crema de mantequilla y mermelada",Umami +6,Pizza sin gluten,pizza-umami.jpg,"Aceitunas, albahaca y mozzarella cubren una masa de pizza sin gluten con salsa de tomate.",Umami +7,Curry verde tailandés,thai-green-curry-umami.jpg,"Un tazón tradicional de curry verde tailandés aromático y cremoso, con trozos de pollo y verduras.",Umami +8,Crema catalana,crema-catalana-umami.jpg,"Postre típico catalán hecho de crema y yemas de huevo, cubierto con una capa tradicional de azúcar caramelizado para proporcionar un contraste crujiente.",Umami +9,Salsa de chile ardiente,chili-sauce-umami.jpg,"Una variedad iridiscente de chiles, cebollas y ajo, que suda lentamente a fuego lento",Umami +10,Prueba y cultiva tus propias hierbas,home-grown-herbs.jpg,"Hierbas frescas cortadas incluyendo menta, perejil, tomillo y eneldo.",Holly Foat +11,Delicioso chocolate sin lactosa,vegan-chocolate.jpg,Deliciosa tableta de chocolate con leche sin lactosa partido en onzas.,Umami +12,El verdadero negocio para comprar en el supermercado,supermarket-savvy-umami.jpg,Verduras de hoja verde presentadas en la estantería del supermercado.,Megan Collins Quinlan +13,Guía Umami de nuestras setas preferidas,mushrooms-umami.jpg,Una deliciosa selección de variedades de setas distribuidas en un sencillo plato de madera.,Umami +14,Un aplauso para las zanahorias,heritage-carrots.jpg,"Zanahorias moradas, naranjas, amarillas y blancas.",Umami +15,Percances al hornear - nuestros consejos para solucionar los problemas,chocolate-brownie-umami.jpg,Un delicioso brownie de chocolate,Umami +16,Salta los espíritus con deliciosos cócteles sin alcohol,mojito-mocktail.jpg,"Mocktail de mojito fresco con guarnición de hojas de menta, hielo y lima en rodajas",Megan Collins Quinlan +17,Dale a tu avena el cambio de imagen definitivo,oatmeal-fruit-syrup-topping.jpg,"Avena con una mezcla vibrante de bayas, nueces y semillas",Umami +18,Pasta vegetariana al horno con una rica salsa de tomate cubierta de queso que hará que se te haga la boca agua.,veggie-pasta-bake-hero-umami.jpg,Pasta vegetariana al horno con una rica salsa de tomate cubierta de queso que hará que se te haga la boca agua.,Umami +19,Paquete de 3 ediciones de la revista de comida Umami,umami-bundle.png,Paquete de 3 ediciones de la revista de comida Umami,Umami +20,(Hero) Bizcochos veganos de chocolate y nueces,vegan-brownies-hero-umami.jpg,"Una pila de brownies de chocolate y nuez, rociados con migas de nuez y nuez triturada, recién sacados del horno",Umami diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/article.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/article.csv index 77b94bca2f..f11c9d11b0 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/article.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/article.csv @@ -1,9 +1,9 @@ -id,title,body,author,slug,image,alt,tags -1,Prueba y cultiva tus propias hierbas,give-it-a-go-and-grow-your-own-herbs.html,Holly Foat,articles/prueba-y-cultiva-tus-propias-hierbas,home-grown-herbs.jpg,"Hierbas frescas cortadas incluyendo menta, perejil, tomillo y eneldo.","14,23,16" -2,Delicioso chocolate sin lactosa,dairy-free-delicious-milk-chocolate.html,Umami,articles/delicioso-chocolate-sin-lactosa,vegan-chocolate.jpg,"Deliciosa tableta de chocolate con leche sin lactosa partido en onzas.","27,7" -3,El verdadero negocio para comprar en el supermercado,the-real-deal-for-supermarket-savvy-shopping.html,Megan Collins Quinlan,articles/el-verdadeo-negocio-para-comprar-en-el-supermercado,supermarket-savvy-umami.jpg,"Verduras de hoja verde presentadas en la estantería del supermercado.","26,24" -4,Guía Umami de nuestras setas preferidas,the-umami-guide-to-our-favourite-mushrooms.html,Umami,articles/guia-umami-de-nuestras-setas-preferidas,mushrooms-umami.jpg,"Una deliciosa selección de variedades de setas distribuidas en un sencillo plato de madera.","18,28" -5,Un aplauso para las zanahorias,lets-hear-it-for-carrots.html,Umami,articles/un-aplauso-para-las-zanahorias,heritage-carrots.jpg,"Zanahorias moradas, naranjas, amarillas y blancas.","6,28,15" -6,Percances al hornear - nuestros consejos para solucionar los problemas,baking-mishaps-our-troubleshooting-tips.html,"Umami",articles/percances-al-hornear-nuestros-consejos-para-solucionar-problemas,chocolate-brownie-umami.jpg,"Un delicioso brownie de chocolate","3,17" -7,Salta los espíritus con deliciosos cócteles sin alcohol,skip-the-spirits-with-delicious-mocktails.html,Megan Collins Quinlan,articles/salta-los-espiritus-con-deliciosos-cocteles-sin-alcohol,mojito-mocktail.jpg,"Mocktail de mojito fresco con guarnición de hojas de menta, hielo y lima en rodajas","1,12,20,8,11" -8,Dale a tu avena el cambio de imagen definitivo,give-your-oatmeal-the-ultimate-makeover.html,Umami,articles/dale-a-tu-avena-el-cambio-de-imagen-definitivo,oatmeal-fruit-syrup-topping.jpg,"Avena con una mezcla vibrante de bayas, nueces y semillas","27,28,19,4,10" +id,title,body,author,slug,image_reference,tags +1,Prueba y cultiva tus propias hierbas,give-it-a-go-and-grow-your-own-herbs.html,Holly Foat,articles/prueba-y-cultiva-tus-propias-hierbas,10,"14,23,16" +2,Delicioso chocolate sin lactosa,dairy-free-delicious-milk-chocolate.html,Umami,articles/delicioso-chocolate-sin-lactosa,11,"27,7" +3,El verdadero negocio para comprar en el supermercado,the-real-deal-for-supermarket-savvy-shopping.html,Megan Collins Quinlan,articles/el-verdadeo-negocio-para-comprar-en-el-supermercado,12,"26,24" +4,Guía Umami de nuestras setas preferidas,the-umami-guide-to-our-favourite-mushrooms.html,Umami,articles/guia-umami-de-nuestras-setas-preferidas,13,"18,28" +5,Un aplauso para las zanahorias,lets-hear-it-for-carrots.html,Umami,articles/un-aplauso-para-las-zanahorias,14,"6,28,15" +6,Percances al hornear - nuestros consejos para solucionar los problemas,baking-mishaps-our-troubleshooting-tips.html,Umami,articles/percances-al-hornear-nuestros-consejos-para-solucionar-problemas,15,"3,17" +7,Salta los espíritus con deliciosos cócteles sin alcohol,skip-the-spirits-with-delicious-mocktails.html,Megan Collins Quinlan,articles/salta-los-espiritus-con-deliciosos-cocteles-sin-alcohol,16,"1,12,20,8,11" +8,Dale a tu avena el cambio de imagen definitivo,give-your-oatmeal-the-ultimate-makeover.html,Umami,articles/dale-a-tu-avena-el-cambio-de-imagen-definitivo,17,"27,28,19,4,10" diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/recipe.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/recipe.csv index 4d175c0a3d..d9f2fa65cc 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/recipe.csv +++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/node/recipe.csv @@ -1,10 +1,10 @@ -id,title,image,alt,summary,author,recipe_category,preparation_time,cooking_time,total_time,difficulty,ingredients,recipe_instruction,number_of_servings,tags,slug -1,Quiche mediterráneo profundo,mediterranean-quiche-umami.jpg,"Un delicioso quiche mediterráneo de capas profundas con guarnición de albahaca.",Un quiche de inspiración italiana con tomates secos y calabacín. Una comida ligera perfecta para un día de verano.,Umami,3,40,30,70,medium,"Para la masa:,280g harina normal,140g mantequilla,Agua fría,Para el relleno:,1 cebolla,2 dientes ajo,Medio calabación,450ml leche de soja,500g queso parmesano,2 huevos,200g tomate deshidratado,100g queso feta",mediterranean-quiche-umami.html,8,"22,13",recipes/quiche-mediterráneo-profundo -2,Bizcochos veganos de chocolate y nueces,vegan-chocolate-nut-brownies.jpg,"Una pila de brownies de chocolate y nuez, rociados con migas de nuez y nuez triturada, recién sacados del horno","Exquisitos brownies veganos de chocolate con nueces. Estas delicias contienen un toque de coco haciéndolos el placer perfecto. Servir calientes acompañados de un poco de helado de vainilla sin lactosa.",Umami,4,20,20,40,medium,"72g aceite de girasol, 80g de chocolate negro vegano, 170g de harina, 80g de harina de coco, 4g de levadura, 36g de cacao en polvo, 100g de azúcar en polvo, 45g de sirope de arce, 1g cucharadita de sal marina, 5g de extracto de vainilla, 230ml de leche de soja orgánica sin edulcorar, 100g de nueces pecanas, 80g de nueces",vegan-chocolate-nut-brownies.html,12,"3,7,27,9",recipes/bizcochos-veganos-de-chocolate-y-nueces -3,Pasta vegetariana al horno súper fácil,veggie-pasta-bake-umami.jpg,Plato de pasta con salchichas vegetarianas y cubierto con queso mozzarella y albahaca,Una pasta al horno es la comida más fácil y saludable. Este delicioso plato es súper rápido de preparar y una comida ideal entre semana para toda la familia.,Umami,3,5,20,25,easy,"400g pasta de trigo integral, 1 cebolla, 2 dientes de ajo, 1 paquete de salchichas vegetarianas, 400g tomates picados, 50g rodajas de tomates secados al sol, 1 pizca de azúcar, 45g pesto rojo, 50g queso cheddar, Albahaca o hierbas mixtas, 100g queso mozzarella",veggie-pasta-bake-umami.html,4,"28,21,2",recipes/pasta-vegetariana-horno-super-facil -4,Sopa de berro,watercress-soup-umami.jpg,Sopa de berros con una ramita de cilantro como guarnición en un tazón blanco con borde verde.,"Una sopa maravillosamente simple y ligera, que aprovecha al máximo los productos locales de temporada.",Umami,5,10,20,30,easy,"3 racimos de berros,3 patatas,3 cebollas,2 puerros,800ml de caldo,75g de crème fraîche",watercress-soup-umami.html,4,"25,28",recipes/sopa-de-berro -5,Pastel Victoria,victoria-sponge-umami.jpg,"Una esponja Victoria clásica, sin cortar, con un relleno profundo de crema de mantequilla y mermelada","Un tradicional bizcocho Victoria, perfecto para cualquier tarde con una taza de té.",Umami,2,20,20,40,easy,"225g mantequilla o margarina,225g azúcar en polvo,225g harina autoniveladora,4 huevos,1 cucharadita polvo de hornear,3 cucharadas mermelada para el relleno,Azúcar glas para espolvorear la parte superior,Crema para servir",victoria-sponge-umami.html,10,5,recipes/pastel-victoria -6,Pizza sin gluten,pizza-umami.jpg,"Aceitunas, albahaca y mozzarella cubren una masa de pizza sin gluten con salsa de tomate.","Una vistosa y simple pizza sin gluten, con deliciosa mozzarella y jamón de Parma. Puede convertirse fácilmente en vegetariana si quitamos el jamón.",Umami,3,15,15,30,,"400g de harina sin gluten, 125ml de agua caliente, 125ml de Leche, 1 de bolsita levadura, 12g de azúcar, 6g de Sal, 32g de aceite de oliva, 75g de tomate triturado, 1 diente de ajo, Albahaca fresca, 200g de mozzarella, 100g de rúcula, 5 lonchas de jamón de Parma",pizza-umami.html,4,,recipes/pizza-sin-gluten -7,Curry verde tailandés,thai-green-curry-umami.jpg,"Un tazón tradicional de curry verde tailandés aromático y cremoso, con trozos de pollo y verduras.",Una versión rápida y fácil del clásico curry verde tailandés. ¡Perfecto para una comida entre semana!,Umami,3,10,15,25,,"400g de leche de coco, 400g de pollo o tofu, 15g de pasta de curry verde tailandés, 1 diente de ajo, 10g de salsa de pescado, 400g de champiñones, 200g de judías verdes, Hojas de cilantro fresco, Arroz jazmín",thai-green-curry-umami.html,4,,recipes/curry-verde-tailandes -8,Crema catalana,crema-catalana-umami.jpg,"Postre típico catalán hecho de crema y yemas de huevo, cubierto con una capa tradicional de azúcar caramelizado para proporcionar un contraste crujiente.",Disfruta de esta dulce receta de uno de los postres más antiguos de Europa. ¡Requiere muy pocos ingredientes!,Umami,2,10,20,30,,"1l de Leche, 200g de azúcar, 6 yemas de huevo, 30g de Maizena, 1 rama de canela, 1 La piel de un limón",crema-catalana-umami.html,8,"13,28",recipes/crema-catalana -9,Salsa de chile ardiente,chili-sauce-umami.jpg,"Una variedad iridiscente de chiles, cebollas y ajo, que suda lentamente a fuego lento","Una rica y ardiente salsa de chile. Tenga cuidado al manejar chiles. ¡Y servir con moderación!",Umami,1,10,50,60,easy,"2 cebollas rojas, 1 limón, 2 limas, 250ml vinagre de malta, 7 dientes de ajo, 1 pimiento verde, 1 pimiento rojo, 800g tomates cherry, 30 chiles mezclados, Aceite de oliva, 1 cucharada pimienta negra molida, 1 cucharada azúcar morena",chili-sauce-umami.html,60,28,recipes/salsa-de-chile-ardiente +id,title,image_reference,summary,author,recipe_category,preparation_time,cooking_time,total_time,difficulty,ingredients,recipe_instruction,number_of_servings,tags,slug +1,Quiche mediterráneo profundo,1,Un quiche de inspiración italiana con tomates secos y calabacín. Una comida ligera perfecta para un día de verano.,Umami,3,40,30,70,medium,"Para la masa:,280g harina normal,140g mantequilla,Agua fría,Para el relleno:,1 cebolla,2 dientes ajo,Medio calabación,450ml leche de soja,500g queso parmesano,2 huevos,200g tomate deshidratado,100g queso feta",mediterranean-quiche-umami.html,8,"22,13",recipes/quiche-mediterráneo-profundo +2,Bizcochos veganos de chocolate y nueces,2,Exquisitos brownies veganos de chocolate con nueces. Estas delicias contienen un toque de coco haciéndolos el placer perfecto. Servir calientes acompañados de un poco de helado de vainilla sin lactosa.,Umami,4,20,20,40,medium,"72g aceite de girasol, 80g de chocolate negro vegano, 170g de harina, 80g de harina de coco, 4g de levadura, 36g de cacao en polvo, 100g de azúcar en polvo, 45g de sirope de arce, 1g cucharadita de sal marina, 5g de extracto de vainilla, 230ml de leche de soja orgánica sin edulcorar, 100g de nueces pecanas, 80g de nueces",vegan-chocolate-nut-brownies.html,12,"3,7,27,9",recipes/bizcochos-veganos-de-chocolate-y-nueces +3,Pasta vegetariana al horno súper fácil,3,Una pasta al horno es la comida más fácil y saludable. Este delicioso plato es súper rápido de preparar y una comida ideal entre semana para toda la familia.,Umami,3,5,20,25,easy,"400g pasta de trigo integral, 1 cebolla, 2 dientes de ajo, 1 paquete de salchichas vegetarianas, 400g tomates picados, 50g rodajas de tomates secados al sol, 1 pizca de azúcar, 45g pesto rojo, 50g queso cheddar, Albahaca o hierbas mixtas, 100g queso mozzarella",veggie-pasta-bake-umami.html,4,"28,21,2",recipes/pasta-vegetariana-horno-super-facil +4,Sopa de berro,4,"Una sopa maravillosamente simple y ligera, que aprovecha al máximo los productos locales de temporada.",Umami,5,10,20,30,easy,"3 racimos de berros,3 patatas,3 cebollas,2 puerros,800ml de caldo,75g de crème fraîche",watercress-soup-umami.html,4,"25,28",recipes/sopa-de-berro +5,Pastel Victoria,5,"Un tradicional bizcocho Victoria, perfecto para cualquier tarde con una taza de té.",Umami,2,20,20,40,easy,"225g mantequilla o margarina,225g azúcar en polvo,225g harina autoniveladora,4 huevos,1 cucharadita polvo de hornear,3 cucharadas mermelada para el relleno,Azúcar glas para espolvorear la parte superior,Crema para servir",victoria-sponge-umami.html,10,5,recipes/pastel-victoria +6,Pizza sin gluten,6,"Una vistosa y simple pizza sin gluten, con deliciosa mozzarella y jamón de Parma. Puede convertirse fácilmente en vegetariana si quitamos el jamón.",Umami,3,15,15,30,,"400g de harina sin gluten, 125ml de agua caliente, 125ml de Leche, 1 de bolsita levadura, 12g de azúcar, 6g de Sal, 32g de aceite de oliva, 75g de tomate triturado, 1 diente de ajo, Albahaca fresca, 200g de mozzarella, 100g de rúcula, 5 lonchas de jamón de Parma",pizza-umami.html,4,,recipes/pizza-sin-gluten +7,Curry verde tailandés,7,Una versión rápida y fácil del clásico curry verde tailandés. ¡Perfecto para una comida entre semana!,Umami,3,10,15,25,,"400g de leche de coco, 400g de pollo o tofu, 15g de pasta de curry verde tailandés, 1 diente de ajo, 10g de salsa de pescado, 400g de champiñones, 200g de judías verdes, Hojas de cilantro fresco, Arroz jazmín",thai-green-curry-umami.html,4,,recipes/curry-verde-tailandes +8,Crema catalana,8,Disfruta de esta dulce receta de uno de los postres más antiguos de Europa. ¡Requiere muy pocos ingredientes!,Umami,2,10,20,30,,"1l de Leche, 200g de azúcar, 6 yemas de huevo, 30g de Maizena, 1 rama de canela, 1 La piel de un limón",crema-catalana-umami.html,8,"13,28",recipes/crema-catalana +9,Salsa de chile ardiente,9,Una rica y ardiente salsa de chile. Tenga cuidado al manejar chiles. ¡Y servir con moderación!,Umami,1,10,50,60,easy,"2 cebollas rojas, 1 limón, 2 limas, 250ml vinagre de malta, 7 dientes de ajo, 1 pimiento verde, 1 pimiento rojo, 800g tomates cherry, 30 chiles mezclados, Aceite de oliva, 1 cucharada pimienta negra molida, 1 cucharada azúcar morena",chili-sauce-umami.html,60,28,recipes/salsa-de-chile-ardiente diff --git a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php index b072bc1925..acd87a0ba9 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php +++ b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php @@ -75,6 +75,17 @@ class InstallHelper implements ContainerInjectionInterface { */ protected $termIdMap; + /** + * Media Image CSV ID map. + * + * Used to store media image CSV IDs created in the import process. + * This allows the created media images to be cross referenced when creating + * article, recipes and blocks. + * + * @var array + */ + protected $mediaImageIdMap; + /** * Node CSV ID map. * @@ -106,6 +117,7 @@ public function __construct(AliasManagerInterface $aliasManager, EntityTypeManag $this->state = $state; $this->fileSystem = $fileSystem; $this->termIdMap = []; + $this->mediaImageIdMap = []; $this->nodeIdMap = []; $this->enabledLanguages = array_keys(\Drupal::languageManager()->getLanguages()); } @@ -135,6 +147,7 @@ public function importContent() { ->importEditors() ->importContentFromFile('taxonomy_term', 'tags') ->importContentFromFile('taxonomy_term', 'recipe_category') + ->importContentFromFile('media', 'image') ->importContentFromFile('node', 'recipe') ->importContentFromFile('node', 'article') ->importContentFromFile('node', 'page') @@ -224,6 +237,34 @@ protected function saveTermId($vocabulary, $term_csv_id, $tid) { $this->termIdMap[$vocabulary][$term_csv_id] = $tid; } + /** + * Retrieves the Media Image ID of a media image saved during the import process. + * + * @param int $media_image_csv_id + * The media image's ID from the CSV file. + * + * @return int + * Media Image ID, or 0 if Media Image ID could not be found. + */ + protected function getMediaImageId($media_image_csv_id) { + if (array_key_exists($media_image_csv_id, $this->mediaImageIdMap)) { + return $this->mediaImageIdMap[$media_image_csv_id]; + } + return 0; + } + + /** + * Saves a Media Image ID generated when saving a media image. + * + * @param int $media_image_csv_id + * The media image's ID from the CSV file. + * @param int $media_image_id + * Media Image ID generated when saved in the Drupal database. + */ + protected function saveMediaImageId($media_image_csv_id, $media_image_id) { + $this->mediaImageIdMap[$media_image_csv_id] = $media_image_id; + } + /** * Retrieves the node path of node CSV ID saved during the import process. * @@ -314,6 +355,35 @@ protected function processTerm(array $data, $vocabulary) { return $values; } + /** + * Process images into media entities. + * + * @param array $data + * Data of line that was read from the file. + * + * @return array + * Data structured as a image. + */ + protected function processImage(array $data) { + // Set article author. + if (!empty($data['author'])) { + $values['uid'] = $this->getUser($data['author']); + } + + $image_path = $this->module_path . '/default_content/images/' . $data['image']; + // Prepare content. + $values = [ + 'name' => $data['title'], + 'bundle' => 'image', + 'langcode' => 'en', + 'field_media_image' => [ + 'target_id' => $this->createFileEntity($image_path), + 'alt' => $data['alt'], + ], + ]; + return $values; + } + /** * Process pages data into page node structure. * @@ -379,13 +449,10 @@ protected function processRecipe(array $data, $langcode) { } // Save node alias $this->saveNodePath($langcode, 'recipe', $data['id'], $data['slug']); - - // Set field_image field. - if (!empty($data['image'])) { - $image_path = $this->module_path . '/default_content/images/' . $data['image']; - $values['field_image'] = [ - 'target_id' => $this->createFileEntity($image_path), - 'alt' => $data['alt'], + // Set field_media_image field. + if (!empty($data['image_reference'])) { + $values['field_media_image'] = [ + 'target_id' => $this->getMediaImageId($data['image_reference']), ]; } // Set field_summary field. @@ -486,12 +553,10 @@ protected function processArticle(array $data, $langcode) { if (!empty($data['author'])) { $values['uid'] = $this->getUser($data['author']); } - // Set Image field. - if (!empty($data['image'])) { - $path = $this->module_path . '/default_content/images/' . $data['image']; - $values['field_image'] = [ - 'target_id' => $this->createFileEntity($path), - 'alt' => $data['alt'], + // Set field_media_image field. + if (!empty($data['image_reference'])) { + $values['field_media_image'] = [ + 'target_id' => $this->getMediaImageId($data['image_reference']), ]; } // Set field_tags if exists. @@ -535,9 +600,8 @@ protected function processBannerBlock(array $data, $langcode) { 'field_summary' => [ 'value' => $data['field_summary'], ], - 'field_banner_image' => [ - 'target_id' => $this->createFileEntity($this->module_path . '/default_content/images/' . $data['field_banner_image_target_id']), - 'alt' => $data['field_banner_image_alt'], + 'field_media_image' => [ + 'target_id' => $this->getMediaImageId($data['image_reference']), ], ]; return $values; @@ -598,9 +662,8 @@ protected function processFooterPromoBlock(array $data, $langcode) { 'field_summary' => [ 'value' => $data['field_summary'], ], - 'field_promo_image' => [ - 'target_id' => $this->createFileEntity($this->module_path . '/default_content/images/' . $data['field_promo_image_target_id']), - 'alt' => $data['field_promo_image_alt'], + 'field_media_image' => [ + 'target_id' => $this->getMediaImageId($data['image_reference']), ], ]; return $values; @@ -639,6 +702,9 @@ protected function processContent($bundle_machine_name, array $content, $langcod case 'footer_promo_block': $structured_content = $this->processFooterPromoBlock($content, $langcode); break; + case 'image': + $structured_content = $this->processImage($content); + break; case 'recipe_category': case 'tags': $structured_content = $this->processTerm($content, $bundle_machine_name); @@ -679,11 +745,16 @@ protected function importContentFromFile($entity_type, $bundle_machine_name) { $entity->save(); $this->storeCreatedContentUuids([$entity->uuid() => $entity_type]); - // Taxonomy entities - save ID internally to reference nodes later. + // Save taxonomy entity Drupal ID, so we can reference it in nodes. if ($entity_type == 'taxonomy_term') { $this->saveTermId($bundle_machine_name, $current_content['id'], $entity->id()); } + // Save media entity Drupal ID, so we can reference it in nodes & blocks. + if ($entity_type == 'media') { + $this->saveMediaImageId($current_content['id'], $entity->id()); + } + // Go through all the languages that have translations. foreach ($translated_languages as $translated_language) { diff --git a/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css b/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css index 82645a9f8d..0af6ef97b7 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css +++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css @@ -77,7 +77,7 @@ background: rgba(0, 0, 0, 0.42); } - .block-type-banner-block .field--name-field-banner-image { + .block-type-banner-block .field--name-field-media-image { /** * We need to ensure that the alt text on the image is accessible to * screenreaders, so, when on large screens, let's give this the same CSS diff --git a/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css b/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css index 2954d7f5c9..6ced7aa398 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css +++ b/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css @@ -13,17 +13,17 @@ max-width: 796px; } -.node--type-recipe.node--view-mode-full .field--name-field-image { +.node--type-recipe.node--view-mode-full .field--name-field-media-image { background-color: #fcece7; background-image: url(../../../../images/png/umami-background-pattern-1.png); } -.node--type-recipe.node--view-mode-full .field--name-field-image img { +.node--type-recipe.node--view-mode-full .field--name-field-media-image img { display: block; } @media screen and (min-width: 786px) { - .node--type-recipe.node--view-mode-full .field--name-field-image img { + .node--type-recipe.node--view-mode-full .field--name-field-media-image img { max-width: 796px; } } diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/card/card.css b/core/profiles/demo_umami/themes/umami/css/components/content/card/card.css index 466980bfe0..e4eedba919 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/content/card/card.css +++ b/core/profiles/demo_umami/themes/umami/css/components/content/card/card.css @@ -39,7 +39,7 @@ flex-shrink: 0; } -.view-mode-card .field--name-field-image img { +.view-mode-card .field--name-field-media-image img { display: block; width: 100%; margin-bottom: 1.2em; diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/full/node-full.css b/core/profiles/demo_umami/themes/umami/css/components/content/full/node-full.css index 1373464fc4..5983283a39 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/content/full/node-full.css +++ b/core/profiles/demo_umami/themes/umami/css/components/content/full/node-full.css @@ -34,13 +34,13 @@ font-size: 2em; } -.node--view-mode-full .field--name-field-image { +.node--view-mode-full .field--name-field-media-image { margin-bottom: 1.184rem; } /* Large */ @media screen and (min-width: 60rem) { /* 960px */ - .node--view-mode-full .field--name-field-image { + .node--view-mode-full .field--name-field-media-image { margin-bottom: 2.369rem; } } diff --git a/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig index 20eea680ad..9b13cd6844 100644 --- a/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig @@ -34,7 +34,7 @@ ] %} -{% set background_image = file_url(content.field_banner_image.0['#item'].entity.uri.value) %} +{% set background_image = file_url(content.field_media_image[0]['#media'].field_media_image.entity.uri.value) %}
@@ -44,9 +44,9 @@ {% endif %} {{ title_suffix }} {% block content %} - {{ content.field_banner_image }} + {{ content.field_media_image }}
- {{ content|without('field_banner_image') }} + {{ content|without('field_media_image') }}
{% endblock %}
diff --git a/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig index a1ead1e7d3..e90416b9cc 100644 --- a/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig @@ -26,7 +26,7 @@ */ #} - {{ content.field_promo_image }} + {{ content.field_media_image }} {{ title_prefix }} {% if label %} {{ label }} @@ -37,9 +37,9 @@ {% block content %}
{% if not label %} - {{ content|without('field_title')|without('field_promo_image') }} + {{ content|without('field_title')|without('field_media_image') }} {% else %} - {{ content|without('field_promo_image') }} + {{ content|without('field_media_image') }} {% endif %}
{% endblock %}