From 021a81d37b06631d11d1ca06b8ab01d2c0156b62 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 20 Aug 2025 17:07:29 +0200 Subject: [PATCH 1/7] Project page and paragraph styling --- .../templates/node/node--project-page.html.twig | 9 +++++---- .../paragraph/paragraph--content-block.html.twig | 2 +- .../paragraph/paragraph--content-list.html.twig | 2 +- .../templates/paragraph/paragraph--files.html.twig | 2 +- .../templates/paragraph/paragraph--info-box.html.twig | 2 +- .../templates/paragraph/paragraph--teaser-row.html.twig | 2 +- .../paragraph--text-aside-blocks-2-column.html.twig | 2 +- .../templates/paragraph/paragraph.html.twig | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig b/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig index 1c1570666..ceb64ea85 100755 --- a/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig +++ b/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig @@ -1,17 +1,18 @@ {# Main container #}
-
- {{ content.field_project_category }} +
+ {{ content.field_project_category }}

{{ node.title.value }}

- {{ content|without('field_project_category', 'field_content_sections', 'published_at') }} +

{{ content.field_teaser }}

+ {{ content|without('field_project_category', 'field_teaser', 'field_content_sections', 'published_at') }}
{{ content.field_aside_block }}
-
+
{{ content.field_content_sections }}
diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-block.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-block.html.twig index 3ed3fc0f3..4f30bfd32 100644 --- a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-block.html.twig +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-block.html.twig @@ -38,7 +38,7 @@ * @ingroup themeable */ #} -
+
{% if content.field_paragraph_title['#items'] is not empty %} diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-list.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-list.html.twig index 262c20a27..d40564056 100644 --- a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-list.html.twig +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--content-list.html.twig @@ -38,7 +38,7 @@ * @ingroup themeable */ #} -
+

{{ paragraph.field_list_title.value }}

diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig index e0e60654c..03e1de8e3 100644 --- a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig @@ -1,6 +1,6 @@ {# Paragraph for exposing downloadable files #} -
+
{% block paragraph %} diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--info-box.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--info-box.html.twig index b714a777c..7b48a3e52 100644 --- a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--info-box.html.twig +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--info-box.html.twig @@ -38,7 +38,7 @@ * @ingroup themeable */ #} -
+
diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--teaser-row.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--teaser-row.html.twig index 29f8c4e16..2df323969 100644 --- a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--teaser-row.html.twig +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--teaser-row.html.twig @@ -1,4 +1,4 @@ -
+
{% if paragraph.field_paragraph_title.value %} diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--text-aside-blocks-2-column.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--text-aside-blocks-2-column.html.twig index c2c48c326..3abc4faa1 100644 --- a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--text-aside-blocks-2-column.html.twig +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--text-aside-blocks-2-column.html.twig @@ -1,4 +1,4 @@ -
+
{% if paragraph.field_title.value %} diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph.html.twig index be9cdfac3..8245daebe 100644 --- a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph.html.twig +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph.html.twig @@ -38,7 +38,7 @@ * @ingroup themeable */ #} -
+
{% block paragraph %} From 748a3f036b314da6df693bd1a277e4ae211503f6 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 20 Aug 2025 17:10:58 +0200 Subject: [PATCH 2/7] Config export --- ...form_display.node.project_page.default.yml | 9 +++++ ...view_display.node.project_page.default.yml | 12 +++++- ...display.node.project_page.list_display.yml | 40 +++++++++++++++++++ ..._view_display.node.project_page.teaser.yml | 8 ++++ ...d.field.node.project_page.field_teaser.yml | 19 +++++++++ config/sync/node.type.project_main_page.yml | 2 +- 6 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 config/sync/core.entity_view_display.node.project_page.list_display.yml create mode 100644 config/sync/field.field.node.project_page.field_teaser.yml diff --git a/config/sync/core.entity_form_display.node.project_page.default.yml b/config/sync/core.entity_form_display.node.project_page.default.yml index 6a8b881e4..53145df5a 100644 --- a/config/sync/core.entity_form_display.node.project_page.default.yml +++ b/config/sync/core.entity_form_display.node.project_page.default.yml @@ -5,6 +5,7 @@ dependencies: config: - field.field.node.project_page.field_content_sections - field.field.node.project_page.field_project_category + - field.field.node.project_page.field_teaser - node.type.project_page module: - maxlength @@ -52,6 +53,14 @@ content: size: 100 placeholder: '' third_party_settings: { } + field_teaser: + type: string_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } langcode: type: language_select weight: 3 diff --git a/config/sync/core.entity_view_display.node.project_page.default.yml b/config/sync/core.entity_view_display.node.project_page.default.yml index 243b79b37..d1478b07e 100644 --- a/config/sync/core.entity_view_display.node.project_page.default.yml +++ b/config/sync/core.entity_view_display.node.project_page.default.yml @@ -5,6 +5,7 @@ dependencies: config: - field.field.node.project_page.field_content_sections - field.field.node.project_page.field_project_category + - field.field.node.project_page.field_teaser - node.type.project_page module: - entity_reference_revisions @@ -21,7 +22,7 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 0 + weight: 2 region: content field_project_category: type: entity_reference_label @@ -29,7 +30,14 @@ content: settings: link: true third_party_settings: { } - weight: 7 + weight: 1 + region: content + field_teaser: + type: basic_string + label: hidden + settings: { } + third_party_settings: { } + weight: 0 region: content hidden: langcode: true diff --git a/config/sync/core.entity_view_display.node.project_page.list_display.yml b/config/sync/core.entity_view_display.node.project_page.list_display.yml new file mode 100644 index 000000000..18431092c --- /dev/null +++ b/config/sync/core.entity_view_display.node.project_page.list_display.yml @@ -0,0 +1,40 @@ +uuid: df31d120-b83b-4267-881f-562181eb12a3 +langcode: da +status: true +dependencies: + config: + - core.entity_view_mode.node.list_display + - field.field.node.project_page.field_content_sections + - field.field.node.project_page.field_project_category + - field.field.node.project_page.field_teaser + - node.type.project_page + module: + - user +id: node.project_page.list_display +targetEntityType: node +bundle: project_page +mode: list_display +content: + field_teaser: + type: basic_string + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + links: + settings: { } + third_party_settings: { } + weight: 100 + region: content + sharing_buttons: + settings: { } + third_party_settings: { } + weight: 100 + region: content +hidden: + field_content_sections: true + field_project_category: true + langcode: true + published_at: true + search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.project_page.teaser.yml b/config/sync/core.entity_view_display.node.project_page.teaser.yml index 1cf431e27..dacd342b6 100644 --- a/config/sync/core.entity_view_display.node.project_page.teaser.yml +++ b/config/sync/core.entity_view_display.node.project_page.teaser.yml @@ -6,6 +6,7 @@ dependencies: - core.entity_view_mode.node.teaser - field.field.node.project_page.field_content_sections - field.field.node.project_page.field_project_category + - field.field.node.project_page.field_teaser - node.type.project_page module: - user @@ -22,6 +23,13 @@ content: third_party_settings: { } weight: 0 region: content + field_teaser: + type: basic_string + label: hidden + settings: { } + third_party_settings: { } + weight: 0 + region: content hidden: field_content_sections: true langcode: true diff --git a/config/sync/field.field.node.project_page.field_teaser.yml b/config/sync/field.field.node.project_page.field_teaser.yml new file mode 100644 index 000000000..74ed4c03e --- /dev/null +++ b/config/sync/field.field.node.project_page.field_teaser.yml @@ -0,0 +1,19 @@ +uuid: bbb50cdb-201a-4ee2-8464-654937de6277 +langcode: da +status: true +dependencies: + config: + - field.storage.node.field_teaser + - node.type.project_page +id: node.project_page.field_teaser +field_name: field_teaser +entity_type: node +bundle: project_page +label: Teaser/indledning +description: 'Kort tekst der vises i teasers og i toppen af indholdsviningen' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/sync/node.type.project_main_page.yml b/config/sync/node.type.project_main_page.yml index fb445bc4b..fbee187bd 100644 --- a/config/sync/node.type.project_main_page.yml +++ b/config/sync/node.type.project_main_page.yml @@ -11,7 +11,7 @@ third_party_settings: parent: 'main:' name: Project type: project_main_page -description: 'Use this to create a project page' +description: 'Use this to create a landingpage for your project' help: null new_revision: true preview_mode: 1 From df4c3379e32e9ee7af24b2fcb53090111324d253 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Thu, 21 Aug 2025 07:54:59 +0200 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9aac331d..cdc8719a5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [4.11.0] - 2025-07-01 +* [PR-538](https://github.com/itk-dev/deltag.aarhus.dk/pull/538) + Update project page styling - Closes issues #536 * [PR-533](https://github.com/itk-dev/deltag.aarhus.dk/pull/533) Show deadline date on hearing teaser instead of startdate - Closes issues #532 * [PR-531](https://github.com/itk-dev/deltag.aarhus.dk/pull/531) From a72fb1ac2a4e14246211847c973ba4c7eb1e5c25 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Thu, 21 Aug 2025 09:20:48 +0200 Subject: [PATCH 4/7] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdc8719a5..a4d4f08bb 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,11 @@ Versioning](https://semver.org/spec/v2.0.0.html). * [PR-537](https://github.com/itk-dev/deltag.aarhus.dk/pull/537) 5209: Cleaned up public meeting summary view +* [PR-538](https://github.com/itk-dev/deltag.aarhus.dk/pull/538) + Update project page styling - Closes issues #536 ## [4.11.0] - 2025-07-01 -* [PR-538](https://github.com/itk-dev/deltag.aarhus.dk/pull/538) - Update project page styling - Closes issues #536 * [PR-533](https://github.com/itk-dev/deltag.aarhus.dk/pull/533) Show deadline date on hearing teaser instead of startdate - Closes issues #532 * [PR-531](https://github.com/itk-dev/deltag.aarhus.dk/pull/531) From 72b5fea0bd4c63e7da02d7f9df2e3a38e936bbd5 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Thu, 21 Aug 2025 09:14:02 +0200 Subject: [PATCH 5/7] Update field.field.node.project_page.field_teaser.yml --- config/sync/field.field.node.project_page.field_teaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/field.field.node.project_page.field_teaser.yml b/config/sync/field.field.node.project_page.field_teaser.yml index 74ed4c03e..0721196ce 100644 --- a/config/sync/field.field.node.project_page.field_teaser.yml +++ b/config/sync/field.field.node.project_page.field_teaser.yml @@ -10,7 +10,7 @@ field_name: field_teaser entity_type: node bundle: project_page label: Teaser/indledning -description: 'Kort tekst der vises i teasers og i toppen af indholdsviningen' +description: 'Kort tekst der vises i teasers og i toppen af indholdsvisningen' required: false translatable: false default_value: { } From c192fcbd74cad6552c6b5afe0caae3f2250e1226 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Thu, 21 Aug 2025 09:16:56 +0200 Subject: [PATCH 6/7] Update node.type.project_main_page.yml --- config/sync/node.type.project_main_page.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/node.type.project_main_page.yml b/config/sync/node.type.project_main_page.yml index fbee187bd..c4cd33e51 100644 --- a/config/sync/node.type.project_main_page.yml +++ b/config/sync/node.type.project_main_page.yml @@ -11,7 +11,7 @@ third_party_settings: parent: 'main:' name: Project type: project_main_page -description: 'Use this to create a landingpage for your project' +description: 'Use this to create a landing page for your project' help: null new_revision: true preview_mode: 1 From 7c9e1ea15cb775b5307e4356bcf62a90d9375781 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Thu, 21 Aug 2025 09:18:00 +0200 Subject: [PATCH 7/7] Add check --- .../templates/node/node--project-page.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig b/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig index ceb64ea85..26da4e78c 100755 --- a/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig +++ b/web/themes/custom/hoeringsportal/templates/node/node--project-page.html.twig @@ -4,7 +4,9 @@
{{ content.field_project_category }}

{{ node.title.value }}

-

{{ content.field_teaser }}

+ {% if content.field_teaser %} +

{{ content.field_teaser }}

+ {% endif %} {{ content|without('field_project_category', 'field_teaser', 'field_content_sections', 'published_at') }}