diff --git a/composer.json b/composer.json index 3a045e34..617938be 100755 --- a/composer.json +++ b/composer.json @@ -108,6 +108,7 @@ "composer/installers": "^1.7", "cure53/dompurify": "^3.0", "cweagans/composer-patches": "^1.7", + "drupal/advanced_text_formatter": "^3.0", "drupal/allowed_formats": "^3.0", "drupal/better_exposed_filters": "^6.0", "drupal/better_social_sharing_buttons": "^4.0", diff --git a/composer.lock b/composer.lock index 8f8addab..454cd6dc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6f3a40258018767b2e9749308bf86398", + "content-hash": "ca8bb1614421e468fdeea25d49e19ac0", "packages": [ { "name": "asm89/stack-cors", @@ -1538,6 +1538,54 @@ }, "time": "2023-12-12T20:19:39+00:00" }, + { + "name": "drupal/advanced_text_formatter", + "version": "3.0.0-rc1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/advanced_text_formatter.git", + "reference": "3.0.0-rc1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/advanced_text_formatter-3.0.0-rc1.zip", + "reference": "3.0.0-rc1", + "shasum": "394729127f44a6398e29f5e5702e6def00a06e20" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "3.0.0-rc1", + "datestamp": "1675163352", + "security-coverage": { + "status": "not-covered", + "message": "RC releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "azovsky", + "homepage": "https://www.drupal.org/user/330533" + }, + { + "name": "thmnhat", + "homepage": "https://www.drupal.org/user/998946" + } + ], + "description": "Provides an additional formatter for text field, text area and text format.", + "homepage": "https://www.drupal.org/project/advanced_text_formatter", + "support": { + "source": "https://git.drupalcode.org/project/advanced_text_formatter" + } + }, { "name": "drupal/advancedqueue", "version": "1.0.0-rc7", diff --git a/config/sync/core.entity_form_display.block_content.aside_contact_info.default.yml b/config/sync/core.entity_form_display.block_content.aside_contact_info.default.yml index 5b64d040..d5637701 100644 --- a/config/sync/core.entity_form_display.block_content.aside_contact_info.default.yml +++ b/config/sync/core.entity_form_display.block_content.aside_contact_info.default.yml @@ -4,27 +4,23 @@ status: true dependencies: config: - block_content.type.aside_contact_info - - field.field.block_content.aside_contact_info.body + - field.field.block_content.aside_contact_info.field_address - field.field.block_content.aside_contact_info.field_department - field.field.block_content.aside_contact_info.field_email - field.field.block_content.aside_contact_info.field_phone_number - field.field.block_content.aside_contact_info.field_title - module: - - text id: block_content.aside_contact_info.default targetEntityType: block_content bundle: aside_contact_info mode: default content: - body: - type: text_textarea_with_summary + field_address: + type: string_textarea weight: 4 region: content settings: - rows: 9 - summary_rows: 3 + rows: 5 placeholder: '' - show_summary: false third_party_settings: { } field_department: type: string_textfield diff --git a/config/sync/core.entity_view_display.block_content.aside_contact_info.default.yml b/config/sync/core.entity_view_display.block_content.aside_contact_info.default.yml index 874d7dd4..98dd137b 100644 --- a/config/sync/core.entity_view_display.block_content.aside_contact_info.default.yml +++ b/config/sync/core.entity_view_display.block_content.aside_contact_info.default.yml @@ -4,22 +4,32 @@ status: true dependencies: config: - block_content.type.aside_contact_info - - field.field.block_content.aside_contact_info.body + - field.field.block_content.aside_contact_info.field_address - field.field.block_content.aside_contact_info.field_department - field.field.block_content.aside_contact_info.field_email - field.field.block_content.aside_contact_info.field_phone_number - field.field.block_content.aside_contact_info.field_title module: - - text + - advanced_text_formatter id: block_content.aside_contact_info.default targetEntityType: block_content bundle: aside_contact_info mode: default content: - body: - type: text_default - label: visually_hidden - settings: { } + field_address: + type: advanced_text + label: above + settings: + trim_length: '0' + filter: limit_html + format: plain_text + allowed_html: { } + autop: '1' + ellipsis: 0 + word_boundary: 0 + use_summary: 0 + token_replace: 0 + link_to_entity: 0 third_party_settings: { } weight: 2 region: content diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 56d652a2..4b6a82f8 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -3,6 +3,7 @@ _core: langcode: da module: aarhus_hero: 0 + advanced_text_formatter: 0 advancedqueue: 0 allowed_formats: 0 better_exposed_filters: 0 diff --git a/config/sync/field.field.block_content.aside_contact_info.body.yml b/config/sync/field.field.block_content.aside_contact_info.body.yml deleted file mode 100644 index 46fc2aef..00000000 --- a/config/sync/field.field.block_content.aside_contact_info.body.yml +++ /dev/null @@ -1,26 +0,0 @@ -uuid: 0224e593-3045-4c91-b1aa-0fbfe99e564a -langcode: da -status: true -dependencies: - config: - - block_content.type.aside_contact_info - - field.storage.block_content.body - - filter.format.filtered_html - module: - - text -id: block_content.aside_contact_info.body -field_name: body -entity_type: block_content -bundle: aside_contact_info -label: Address -description: 'Used to show the address' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - display_summary: false - required_summary: false - allowed_formats: - - filtered_html -field_type: text_with_summary diff --git a/config/sync/field.field.block_content.aside_contact_info.field_address.yml b/config/sync/field.field.block_content.aside_contact_info.field_address.yml new file mode 100644 index 00000000..488f7752 --- /dev/null +++ b/config/sync/field.field.block_content.aside_contact_info.field_address.yml @@ -0,0 +1,19 @@ +uuid: 09ad4697-df95-4ca7-9355-41cde5a55122 +langcode: da +status: true +dependencies: + config: + - block_content.type.aside_contact_info + - field.storage.block_content.field_address +id: block_content.aside_contact_info.field_address +field_name: field_address +entity_type: block_content +bundle: aside_contact_info +label: Address +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/sync/field.storage.block_content.field_address.yml b/config/sync/field.storage.block_content.field_address.yml new file mode 100644 index 00000000..afb36aaa --- /dev/null +++ b/config/sync/field.storage.block_content.field_address.yml @@ -0,0 +1,19 @@ +uuid: 5af9d097-6695-49d0-a8fd-ef3cd7c3ba8a +langcode: da +status: true +dependencies: + module: + - block_content +id: block_content.field_address +field_name: field_address +entity_type: block_content +type: string_long +settings: + case_sensitive: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/web/themes/custom/hoeringsportal/templates/field/field--node--field-aside-block.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--node--field-aside-block.html.twig index a4f26bde..6b4001c4 100644 --- a/web/themes/custom/hoeringsportal/templates/field/field--node--field-aside-block.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--node--field-aside-block.html.twig @@ -39,6 +39,7 @@
{% for item in items %} + {% set block = item.content['#block_content'] %} {% if item.content.field_department %}
{{ item.content.field_department }} @@ -49,9 +50,9 @@ {{ item.content.field_title }}
{% endif %} - {% if item.content.body %} + {% if item.content.field_address %}
- {{ item.content.body }} + {{ item.content.field_address }}
{% endif %} {% if item.content.field_phone_number %} @@ -64,6 +65,5 @@ {{ 'Email'|trans }}:{{ item.content.field_email }}
{% endif %} - {{ item.content|without('field_department', 'field_title', 'body', 'field_phone_number', 'field_email') }} {% endfor %}