From 9f0aadc0c66e4b16307d1f5bd96778fdf5fbc6c0 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Tue, 7 May 2024 13:01:00 +0200 Subject: [PATCH 01/19] 1274: Lists on projectpages should have same size as paragraphs --- .../custom/hoeringsportal/assets/css/layout/_page-project.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss b/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss index a84b5ab0..09672384 100644 --- a/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss +++ b/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss @@ -16,7 +16,7 @@ display: inline-block; } - p { + p, ul, ol { font-size: 1.1rem; line-height: 1.65; } From 26d09424d91350def552dbbf771abbb4b286801d Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Tue, 7 May 2024 13:09:07 +0200 Subject: [PATCH 02/19] 1274: No underline on link cards --- .../templates/content/node--public-meeting--teaser.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig index 44ba2d7e..1261020a 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig @@ -75,7 +75,7 @@ {% set content_state = content.field_content_state['#items'].value %} {% set type = content.field_type[0]['#plain_text'] %} {% set project = content.field_project_reference[0]['#plain_text'] %} - + {# When deadline field exists add splash. #} {% if (content.field_first_meeting_time) %} From 289d7750f6789cc2b9c8a6ebbdac84ef72e0de8a Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Tue, 7 May 2024 13:16:52 +0200 Subject: [PATCH 03/19] 1274: Add padding in top of right column --- .../ds/ds-2col-stacked--node-citizen-proposal.html.twig | 2 +- .../ds-2col-stacked--node-hearing-hearing-ticket-add.html.twig | 2 +- .../ds-2col-stacked--node-hearing-hearing-ticket-view.html.twig | 2 +- .../templates/ds/ds-2col-stacked--node-hearing.html.twig | 2 +- .../templates/ds/ds-2col-stacked--node-project.html.twig | 2 +- .../templates/ds/ds-2col-stacked--node-public-meeting.html.twig | 2 +- .../hoeringsportal/templates/ds/ds-2col-stacked.html.twig | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-citizen-proposal.html.twig b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-citizen-proposal.html.twig index e32a0d71..3ecec218 100755 --- a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-citizen-proposal.html.twig +++ b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-citizen-proposal.html.twig @@ -58,7 +58,7 @@ - <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4') }}> + <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4 py-3') }}>
diff --git a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-add.html.twig b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-add.html.twig index f7892f1b..5b943ea1 100644 --- a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-add.html.twig +++ b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-add.html.twig @@ -36,7 +36,7 @@ - <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4') }}> + <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4 py-3') }}> {{ right }} diff --git a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-view.html.twig b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-view.html.twig index a675cd27..e5645252 100644 --- a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-view.html.twig +++ b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing-hearing-ticket-view.html.twig @@ -34,7 +34,7 @@ {{ left }} - <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4') }}> + <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4 py-3') }}> {{ right }} diff --git a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing.html.twig b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing.html.twig index 7fcfdf8b..c233a5f2 100755 --- a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing.html.twig +++ b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-hearing.html.twig @@ -43,7 +43,7 @@ - <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4') }}> + <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4 py-3') }}> {{ right }} diff --git a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-project.html.twig b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-project.html.twig index 0f80e96f..3a70bf0c 100755 --- a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-project.html.twig +++ b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-project.html.twig @@ -36,7 +36,7 @@ - <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4') }}> + <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4 py-3') }}>

{{ 'Project info'|t }}

{{ right }} diff --git a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-public-meeting.html.twig b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-public-meeting.html.twig index b7958d17..ce5a63d7 100755 --- a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-public-meeting.html.twig +++ b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked--node-public-meeting.html.twig @@ -47,7 +47,7 @@ - <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4') }}> + <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4 py-3') }}> {{ right }} diff --git a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked.html.twig b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked.html.twig index 2721bc93..f8577f47 100755 --- a/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked.html.twig +++ b/web/themes/custom/hoeringsportal/templates/ds/ds-2col-stacked.html.twig @@ -46,7 +46,7 @@ - <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4') }}> + <{{ right_wrapper }}{{ right_attributes.addClass('group-right col-md-4 py-3') }}> {{ right }} From 16d8d2251bdd96f502aa639761dcdac8bb7bc2bb Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 07:35:38 +0200 Subject: [PATCH 04/19] 1274: Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c9444a..d545cbc0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* [PR-404](https://github.com/itk-dev/hoeringsportal/pull/404) + UI fixes after project release ## [4.3.0] - 2024-04-29 From 79f52ddaac4e4c4161899ba9b1f8be0a3e5bc853 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 07:46:11 +0200 Subject: [PATCH 05/19] 1274: Apply codingstandards --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d545cbc0..62688647 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + * [PR-404](https://github.com/itk-dev/hoeringsportal/pull/404) UI fixes after project release From 903d77c5f41cc6958e296874ebe7536cff1390c5 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 13:48:38 +0200 Subject: [PATCH 06/19] 1289: Template and styling for files paragraph --- .../assets/css/hoeringsportal.scss | 1 + .../assets/css/module/_paragraph-files.scss | 14 ++++++++++++++ .../paragraph/paragraph--files.html.twig | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 web/themes/custom/hoeringsportal/assets/css/module/_paragraph-files.scss create mode 100644 web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig diff --git a/web/themes/custom/hoeringsportal/assets/css/hoeringsportal.scss b/web/themes/custom/hoeringsportal/assets/css/hoeringsportal.scss index 191e9897..301e2888 100755 --- a/web/themes/custom/hoeringsportal/assets/css/hoeringsportal.scss +++ b/web/themes/custom/hoeringsportal/assets/css/hoeringsportal.scss @@ -29,6 +29,7 @@ "module/signup", "module/list", "module/pager", + "module/paragraph-files", "module/info_box", "module/search", "module/newsletter", diff --git a/web/themes/custom/hoeringsportal/assets/css/module/_paragraph-files.scss b/web/themes/custom/hoeringsportal/assets/css/module/_paragraph-files.scss new file mode 100644 index 00000000..e5b1b491 --- /dev/null +++ b/web/themes/custom/hoeringsportal/assets/css/module/_paragraph-files.scss @@ -0,0 +1,14 @@ +.paragraph-files article { + background-color: $color-petroleum-100; + padding: $spacer; + margin-bottom: calc($spacer * 0.25); + display: flex; +} + +.paragraph-files article svg { + order: 1; +} + +.paragraph-files article span { + order: 2; +} diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig new file mode 100644 index 00000000..7aa29291 --- /dev/null +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--files.html.twig @@ -0,0 +1,18 @@ +{# Paragraph for exposing downloadable files #} + +
+
+
+ {% block paragraph %} + {% if content.field_title['#items'] is not empty %} +

{{ content.field_title }}

+ {% endif %} + {% block content %} +
+ {{ content|without('field_title') }} +
+ {% endblock %} + {% endblock paragraph %} +
+
+
From b3fa0fc6073139f12655ea16c1ecc1eb5a570861 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 13:48:59 +0200 Subject: [PATCH 07/19] 1289: Drupal configuraiton for files paragraph --- ...y_form_display.paragraph.files.default.yml | 34 +++++++++++++++++++ ...y_view_display.paragraph.files.default.yml | 31 +++++++++++++++++ ...oject_main_page.field_content_sections.yml | 5 +++ ...de.project_page.field_content_sections.yml | 5 +++ ...ield.field.paragraph.files.field_files.yml | 31 +++++++++++++++++ ...ield.field.paragraph.files.field_title.yml | 19 +++++++++++ .../field.storage.paragraph.field_files.yml | 20 +++++++++++ .../sync/paragraphs.paragraphs_type.files.yml | 10 ++++++ 8 files changed, 155 insertions(+) create mode 100644 config/sync/core.entity_form_display.paragraph.files.default.yml create mode 100644 config/sync/core.entity_view_display.paragraph.files.default.yml create mode 100644 config/sync/field.field.paragraph.files.field_files.yml create mode 100644 config/sync/field.field.paragraph.files.field_title.yml create mode 100644 config/sync/field.storage.paragraph.field_files.yml create mode 100644 config/sync/paragraphs.paragraphs_type.files.yml diff --git a/config/sync/core.entity_form_display.paragraph.files.default.yml b/config/sync/core.entity_form_display.paragraph.files.default.yml new file mode 100644 index 00000000..8d36c620 --- /dev/null +++ b/config/sync/core.entity_form_display.paragraph.files.default.yml @@ -0,0 +1,34 @@ +uuid: 458df720-e0e0-4169-bdcb-c3b73826dfaf +langcode: da +status: true +dependencies: + config: + - field.field.paragraph.files.field_files + - field.field.paragraph.files.field_title + - paragraphs.paragraphs_type.files +id: paragraph.files.default +targetEntityType: paragraph +bundle: files +mode: default +content: + field_files: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + field_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/config/sync/core.entity_view_display.paragraph.files.default.yml b/config/sync/core.entity_view_display.paragraph.files.default.yml new file mode 100644 index 00000000..600a24f1 --- /dev/null +++ b/config/sync/core.entity_view_display.paragraph.files.default.yml @@ -0,0 +1,31 @@ +uuid: 007ebc45-761d-4581-bec4-1a3746342f72 +langcode: da +status: true +dependencies: + config: + - field.field.paragraph.files.field_files + - field.field.paragraph.files.field_title + - paragraphs.paragraphs_type.files +id: paragraph.files.default +targetEntityType: paragraph +bundle: files +mode: default +content: + field_files: + type: entity_reference_entity_view + label: hidden + settings: + view_mode: material_display + link: false + third_party_settings: { } + weight: 1 + region: content + field_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: { } diff --git a/config/sync/field.field.node.project_main_page.field_content_sections.yml b/config/sync/field.field.node.project_main_page.field_content_sections.yml index 2480295f..4b13a51c 100644 --- a/config/sync/field.field.node.project_main_page.field_content_sections.yml +++ b/config/sync/field.field.node.project_main_page.field_content_sections.yml @@ -6,6 +6,7 @@ dependencies: - field.storage.node.field_content_sections - node.type.project_main_page - paragraphs.paragraphs_type.content_block + - paragraphs.paragraphs_type.files - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.info_box - paragraphs.paragraphs_type.introduction @@ -35,6 +36,7 @@ settings: info_box: info_box introduction: introduction teaser_row: teaser_row + files: files negate: 0 target_bundles_drag_drop: content_block: @@ -43,6 +45,9 @@ settings: content_list: weight: -20 enabled: false + files: + weight: 13 + enabled: true image: weight: -22 enabled: true diff --git a/config/sync/field.field.node.project_page.field_content_sections.yml b/config/sync/field.field.node.project_page.field_content_sections.yml index aeebb8ed..790d11ba 100644 --- a/config/sync/field.field.node.project_page.field_content_sections.yml +++ b/config/sync/field.field.node.project_page.field_content_sections.yml @@ -6,6 +6,7 @@ dependencies: - field.storage.node.field_content_sections - node.type.project_page - paragraphs.paragraphs_type.content_block + - paragraphs.paragraphs_type.files - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.info_box - paragraphs.paragraphs_type.introduction @@ -34,6 +35,7 @@ settings: info_box: info_box introduction: introduction teaser_row: teaser_row + files: files text_aside_blocks_2_column: text_aside_blocks_2_column negate: 0 target_bundles_drag_drop: @@ -43,6 +45,9 @@ settings: content_list: weight: -18 enabled: false + files: + weight: 13 + enabled: true image: weight: -20 enabled: true diff --git a/config/sync/field.field.paragraph.files.field_files.yml b/config/sync/field.field.paragraph.files.field_files.yml new file mode 100644 index 00000000..05ed935c --- /dev/null +++ b/config/sync/field.field.paragraph.files.field_files.yml @@ -0,0 +1,31 @@ +uuid: 6ea32cf8-12f7-4989-b7c0-b3c6fe0f5887 +langcode: da +status: true +dependencies: + config: + - field.storage.paragraph.field_files + - media.type.document + - media.type.image + - paragraphs.paragraphs_type.files +id: paragraph.files.field_files +field_name: field_files +entity_type: paragraph +bundle: files +label: Files +description: 'Used to reference the files' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + image: image + document: document + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: image +field_type: entity_reference diff --git a/config/sync/field.field.paragraph.files.field_title.yml b/config/sync/field.field.paragraph.files.field_title.yml new file mode 100644 index 00000000..b13860a9 --- /dev/null +++ b/config/sync/field.field.paragraph.files.field_title.yml @@ -0,0 +1,19 @@ +uuid: 57f24aa7-0238-4330-8266-f6c9e9307704 +langcode: da +status: true +dependencies: + config: + - field.storage.paragraph.field_title + - paragraphs.paragraphs_type.files +id: paragraph.files.field_title +field_name: field_title +entity_type: paragraph +bundle: files +label: Title +description: 'Used for the title' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.storage.paragraph.field_files.yml b/config/sync/field.storage.paragraph.field_files.yml new file mode 100644 index 00000000..a6d90d81 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_files.yml @@ -0,0 +1,20 @@ +uuid: b3aa2101-054f-4c60-821b-3b39df4efe02 +langcode: da +status: true +dependencies: + module: + - media + - paragraphs +id: paragraph.field_files +field_name: field_files +entity_type: paragraph +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/config/sync/paragraphs.paragraphs_type.files.yml b/config/sync/paragraphs.paragraphs_type.files.yml new file mode 100644 index 00000000..0a714625 --- /dev/null +++ b/config/sync/paragraphs.paragraphs_type.files.yml @@ -0,0 +1,10 @@ +uuid: 50378b6f-ed0f-41ae-98af-1afa956943b0 +langcode: da +status: true +dependencies: { } +id: files +label: Files +icon_uuid: null +icon_default: null +description: 'Used to upload files that the user can download' +behavior_plugins: { } From 56b518cca681e8c149303ecd9c24f60d78141b8c Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 14:20:12 +0200 Subject: [PATCH 08/19] 1289: Changelog update --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c9444a..49d20b9d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,11 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* [PR-405](https://github.com/itk-dev/hoeringsportal/pull/405) + Add paragraph for files + ## [4.3.0] - 2024-04-29 -* [PR-402](https://github.com/itk-dev/hoeringsportal/pull/402) - Project list filters: remove categories * [PR-395](https://github.com/itk-dev/hoeringsportal/pull/395) Project fixtures * [PR-398](https://github.com/itk-dev/hoeringsportal/pull/398) From da13042ff30365e0fd6385d8c95123b68d06501b Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 15:32:37 +0200 Subject: [PATCH 09/19] 1340: Update infobox styling --- .../assets/css/module/_info_box.scss | 64 +++++++++++++++---- .../paragraph/paragraph--info-box.html.twig | 26 +++++--- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss b/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss index 1345fe48..0eb55f8e 100644 --- a/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss +++ b/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss @@ -1,22 +1,58 @@ -// @TODO We may need to have a designer take a look at this! .info-box { - background-color: $petroleum-light; - padding: $spacer; - margin-top: $spacer * 3; + &.danger { + --bg-color: #{$red-100}; + --secondary-bg-color: #{$red-200}; + --text-color: #{$red-900}; + --link-color: #{$red-700}; + } + &.warning { + --bg-color: #{$yellow-100}; + --secondary-bg-color: #{$yellow-200}; + --text-color: #{$yellow-900}; + --link-color: #{$yellow-700}; + } + &.info { + --bg-color: #{$blue-100}; + --secondary-bg-color: #{$blue-200}; + --text-color: #{$blue-900}; + --link-color: #{$blue-700}; + } + &.petroleum-light { + --bg-color: #{$color-petroleum-100}; + --secondary-bg-color: #{$petroleum-light}; + --text-color: #{$black}; + --link-color: inherit; + } + &.petroleum { + --bg-color: #{$petroleum}; + --secondary-bg-color: #{$petroleum}; + --text-color: #{$white}; + --link-color: inherit; + } + + --bg-color: #{$color-petroleum-100}; + --secondary-bg-color: #{$petroleum-light}; + --text-color: #{$black}; + + background-color: var(--bg-color); + color: var(--text-color); + margin-top: $spacer; margin-bottom: $spacer; - p { - max-width: none; - font-size: $font-size-base * 1.25; + a { + color: var(--link-color) } +} - $block-elements: p, ol, ul, h1, h2; +.info-box-header h2 { + margin: 0; +} - #{$block-elements} { - margin: 0; +.info-box-header { + padding: $spacer; + background-color: var(--secondary-bg-color); +} - & + #{$block-elements} { - margin-top: 1rem; - } - } +.info-box-content { + padding: $spacer; } 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 1541034e..452c5c94 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 @@ -39,14 +39,22 @@ */ #}
-
- {% block paragraph %} - {% if content.field_paragraph_title['#items'] is not empty %} -

{{ content.field_paragraph_title }}

- {% endif %} - {% block content %} - {{ content.field_content_block_text }} - {% endblock %} - {% endblock paragraph %} +
+
+
+ {% block paragraph %} + {% if content.field_paragraph_title['#items'] is not empty %} +
+

{{ content.field_paragraph_title }}

+
+ {% endif %} + {% block content %} +
+ {{ content.field_content_block_text }} +
+ {% endblock %} + {% endblock paragraph %} +
+
From 13c30417390497c25d4dc0d1d2404a4529ec902f Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 15:33:44 +0200 Subject: [PATCH 10/19] 1340: Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c9444a..239ef973 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* [PR-406](https://github.com/itk-dev/hoeringsportal/pull/406) + Infobox styling + ## [4.3.0] - 2024-04-29 * [PR-402](https://github.com/itk-dev/hoeringsportal/pull/402) From 7ead77e1c5706cadb9940cfcbf18506a81e54571 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 15:34:41 +0200 Subject: [PATCH 11/19] 1340: Drupal config for infobox variant --- ...orm_display.paragraph.info_box.default.yml | 7 ++++ ...iew_display.paragraph.info_box.default.yml | 9 +++++ ...field.paragraph.info_box.field_variant.yml | 33 +++++++++++++++++++ .../field.storage.paragraph.field_variant.yml | 20 +++++++++++ ...settings.taxonomy_term.infobox_variant.yml | 11 +++++++ .../taxonomy.vocabulary.infobox_variant.yml | 8 +++++ 6 files changed, 88 insertions(+) create mode 100644 config/sync/field.field.paragraph.info_box.field_variant.yml create mode 100644 config/sync/field.storage.paragraph.field_variant.yml create mode 100644 config/sync/language.content_settings.taxonomy_term.infobox_variant.yml create mode 100644 config/sync/taxonomy.vocabulary.infobox_variant.yml diff --git a/config/sync/core.entity_form_display.paragraph.info_box.default.yml b/config/sync/core.entity_form_display.paragraph.info_box.default.yml index 568b9927..d1214a81 100644 --- a/config/sync/core.entity_form_display.paragraph.info_box.default.yml +++ b/config/sync/core.entity_form_display.paragraph.info_box.default.yml @@ -5,6 +5,7 @@ dependencies: config: - field.field.paragraph.info_box.field_content_block_text - field.field.paragraph.info_box.field_paragraph_title + - field.field.paragraph.info_box.field_variant - paragraphs.paragraphs_type.info_box module: - text @@ -29,6 +30,12 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_variant: + type: options_select + weight: 2 + region: content + settings: { } + third_party_settings: { } hidden: created: true status: true diff --git a/config/sync/core.entity_view_display.paragraph.info_box.default.yml b/config/sync/core.entity_view_display.paragraph.info_box.default.yml index 134634e5..fd2824ab 100644 --- a/config/sync/core.entity_view_display.paragraph.info_box.default.yml +++ b/config/sync/core.entity_view_display.paragraph.info_box.default.yml @@ -5,6 +5,7 @@ dependencies: config: - field.field.paragraph.info_box.field_content_block_text - field.field.paragraph.info_box.field_paragraph_title + - field.field.paragraph.info_box.field_variant - paragraphs.paragraphs_type.info_box module: - text @@ -28,4 +29,12 @@ content: third_party_settings: { } weight: 0 region: content + field_variant: + type: entity_reference_label + label: hidden + settings: + link: false + third_party_settings: { } + weight: 2 + region: content hidden: { } diff --git a/config/sync/field.field.paragraph.info_box.field_variant.yml b/config/sync/field.field.paragraph.info_box.field_variant.yml new file mode 100644 index 00000000..effdac66 --- /dev/null +++ b/config/sync/field.field.paragraph.info_box.field_variant.yml @@ -0,0 +1,33 @@ +uuid: 43046247-65e5-4511-bb5c-d3bf8d8c93fe +langcode: da +status: true +dependencies: + config: + - field.storage.paragraph.field_variant + - paragraphs.paragraphs_type.info_box + - taxonomy.vocabulary.infobox_variant + content: + - 'taxonomy_term:infobox_variant:64ea88e3-60b8-4090-ad7f-58fb5ab4498b' +id: paragraph.info_box.field_variant +field_name: field_variant +entity_type: paragraph +bundle: info_box +label: Variant +description: 'Used to select the variant' +required: false +translatable: false +default_value: + - + target_uuid: 64ea88e3-60b8-4090-ad7f-58fb5ab4498b +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + infobox_variant: infobox_variant + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/config/sync/field.storage.paragraph.field_variant.yml b/config/sync/field.storage.paragraph.field_variant.yml new file mode 100644 index 00000000..76585cd2 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_variant.yml @@ -0,0 +1,20 @@ +uuid: 7e6e8ee5-0237-4d1a-b6e3-bc15be82a56b +langcode: da +status: true +dependencies: + module: + - paragraphs + - taxonomy +id: paragraph.field_variant +field_name: field_variant +entity_type: paragraph +type: entity_reference +settings: + target_type: taxonomy_term +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/language.content_settings.taxonomy_term.infobox_variant.yml b/config/sync/language.content_settings.taxonomy_term.infobox_variant.yml new file mode 100644 index 00000000..79cd52be --- /dev/null +++ b/config/sync/language.content_settings.taxonomy_term.infobox_variant.yml @@ -0,0 +1,11 @@ +uuid: 65367f97-6fdc-4b16-80f7-a7e1a41cea82 +langcode: da +status: true +dependencies: + config: + - taxonomy.vocabulary.infobox_variant +id: taxonomy_term.infobox_variant +target_entity_type_id: taxonomy_term +target_bundle: infobox_variant +default_langcode: site_default +language_alterable: false diff --git a/config/sync/taxonomy.vocabulary.infobox_variant.yml b/config/sync/taxonomy.vocabulary.infobox_variant.yml new file mode 100644 index 00000000..5b644086 --- /dev/null +++ b/config/sync/taxonomy.vocabulary.infobox_variant.yml @@ -0,0 +1,8 @@ +uuid: 67fffa3d-fe69-4eeb-884f-b7cd51fc57f8 +langcode: da +status: true +dependencies: { } +name: 'Infobox variant' +vid: infobox_variant +description: 'Different variants of style for the infobox paragraph' +weight: 0 From 4aa987f7614a64ef1524095764c7f6874df64ce9 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Wed, 8 May 2024 15:37:17 +0200 Subject: [PATCH 12/19] 1340: Contrast issue on link --- .../custom/hoeringsportal/assets/css/module/_info_box.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss b/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss index 0eb55f8e..fb38cb79 100644 --- a/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss +++ b/web/themes/custom/hoeringsportal/assets/css/module/_info_box.scss @@ -9,7 +9,7 @@ --bg-color: #{$yellow-100}; --secondary-bg-color: #{$yellow-200}; --text-color: #{$yellow-900}; - --link-color: #{$yellow-700}; + --link-color: #{$yellow-800}; } &.info { --bg-color: #{$blue-100}; From 7361d9c9e9b63ae705fda3a89c6d8f10352cb98e Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 09:17:47 +0200 Subject: [PATCH 13/19] 1340: Change variant from taxonomy to select --- ...orm_display.paragraph.info_box.default.yml | 6 ++-- ...iew_display.paragraph.info_box.default.yml | 12 +++---- ...field.paragraph.info_box.field_variant.yml | 33 ----------------- ...aragraph.info_box.field_variant_select.yml | 23 ++++++++++++ .../field.storage.paragraph.field_variant.yml | 20 ----------- ...storage.paragraph.field_variant_select.yml | 36 +++++++++++++++++++ ...settings.taxonomy_term.infobox_variant.yml | 11 ------ .../taxonomy.vocabulary.infobox_variant.yml | 8 ----- .../paragraph/paragraph--info-box.html.twig | 2 +- 9 files changed, 69 insertions(+), 82 deletions(-) delete mode 100644 config/sync/field.field.paragraph.info_box.field_variant.yml create mode 100644 config/sync/field.field.paragraph.info_box.field_variant_select.yml delete mode 100644 config/sync/field.storage.paragraph.field_variant.yml create mode 100644 config/sync/field.storage.paragraph.field_variant_select.yml delete mode 100644 config/sync/language.content_settings.taxonomy_term.infobox_variant.yml delete mode 100644 config/sync/taxonomy.vocabulary.infobox_variant.yml diff --git a/config/sync/core.entity_form_display.paragraph.info_box.default.yml b/config/sync/core.entity_form_display.paragraph.info_box.default.yml index d1214a81..632e9506 100644 --- a/config/sync/core.entity_form_display.paragraph.info_box.default.yml +++ b/config/sync/core.entity_form_display.paragraph.info_box.default.yml @@ -5,7 +5,7 @@ dependencies: config: - field.field.paragraph.info_box.field_content_block_text - field.field.paragraph.info_box.field_paragraph_title - - field.field.paragraph.info_box.field_variant + - field.field.paragraph.info_box.field_variant_select - paragraphs.paragraphs_type.info_box module: - text @@ -30,9 +30,9 @@ content: size: 60 placeholder: '' third_party_settings: { } - field_variant: + field_variant_select: type: options_select - weight: 2 + weight: 3 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_view_display.paragraph.info_box.default.yml b/config/sync/core.entity_view_display.paragraph.info_box.default.yml index fd2824ab..e0bd06d2 100644 --- a/config/sync/core.entity_view_display.paragraph.info_box.default.yml +++ b/config/sync/core.entity_view_display.paragraph.info_box.default.yml @@ -5,9 +5,10 @@ dependencies: config: - field.field.paragraph.info_box.field_content_block_text - field.field.paragraph.info_box.field_paragraph_title - - field.field.paragraph.info_box.field_variant + - field.field.paragraph.info_box.field_variant_select - paragraphs.paragraphs_type.info_box module: + - options - text id: paragraph.info_box.default targetEntityType: paragraph @@ -29,12 +30,11 @@ content: third_party_settings: { } weight: 0 region: content - field_variant: - type: entity_reference_label + field_variant_select: + type: list_key label: hidden - settings: - link: false + settings: { } third_party_settings: { } - weight: 2 + weight: 3 region: content hidden: { } diff --git a/config/sync/field.field.paragraph.info_box.field_variant.yml b/config/sync/field.field.paragraph.info_box.field_variant.yml deleted file mode 100644 index effdac66..00000000 --- a/config/sync/field.field.paragraph.info_box.field_variant.yml +++ /dev/null @@ -1,33 +0,0 @@ -uuid: 43046247-65e5-4511-bb5c-d3bf8d8c93fe -langcode: da -status: true -dependencies: - config: - - field.storage.paragraph.field_variant - - paragraphs.paragraphs_type.info_box - - taxonomy.vocabulary.infobox_variant - content: - - 'taxonomy_term:infobox_variant:64ea88e3-60b8-4090-ad7f-58fb5ab4498b' -id: paragraph.info_box.field_variant -field_name: field_variant -entity_type: paragraph -bundle: info_box -label: Variant -description: 'Used to select the variant' -required: false -translatable: false -default_value: - - - target_uuid: 64ea88e3-60b8-4090-ad7f-58fb5ab4498b -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - infobox_variant: infobox_variant - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.paragraph.info_box.field_variant_select.yml b/config/sync/field.field.paragraph.info_box.field_variant_select.yml new file mode 100644 index 00000000..d62f0173 --- /dev/null +++ b/config/sync/field.field.paragraph.info_box.field_variant_select.yml @@ -0,0 +1,23 @@ +uuid: 0c6fc12b-e5a7-4bea-95f2-3b82a2da0124 +langcode: da +status: true +dependencies: + config: + - field.storage.paragraph.field_variant_select + - paragraphs.paragraphs_type.info_box + module: + - options +id: paragraph.info_box.field_variant_select +field_name: field_variant_select +entity_type: paragraph +bundle: info_box +label: Variant +description: 'Used to set the variant style for the info box.' +required: false +translatable: false +default_value: + - + value: petroleum_light +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/sync/field.storage.paragraph.field_variant.yml b/config/sync/field.storage.paragraph.field_variant.yml deleted file mode 100644 index 76585cd2..00000000 --- a/config/sync/field.storage.paragraph.field_variant.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 7e6e8ee5-0237-4d1a-b6e3-bc15be82a56b -langcode: da -status: true -dependencies: - module: - - paragraphs - - taxonomy -id: paragraph.field_variant -field_name: field_variant -entity_type: paragraph -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_variant_select.yml b/config/sync/field.storage.paragraph.field_variant_select.yml new file mode 100644 index 00000000..f8c62013 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_variant_select.yml @@ -0,0 +1,36 @@ +uuid: b05341ee-5214-44ae-8e24-6666af4f22f7 +langcode: da +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_variant_select +field_name: field_variant_select +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: danger + label: Danger + - + value: warning + label: Warning + - + value: info + label: Info + - + value: petroleum_light + label: 'Petroleum light' + - + value: petroleum + label: Petroleum + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/language.content_settings.taxonomy_term.infobox_variant.yml b/config/sync/language.content_settings.taxonomy_term.infobox_variant.yml deleted file mode 100644 index 79cd52be..00000000 --- a/config/sync/language.content_settings.taxonomy_term.infobox_variant.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: 65367f97-6fdc-4b16-80f7-a7e1a41cea82 -langcode: da -status: true -dependencies: - config: - - taxonomy.vocabulary.infobox_variant -id: taxonomy_term.infobox_variant -target_entity_type_id: taxonomy_term -target_bundle: infobox_variant -default_langcode: site_default -language_alterable: false diff --git a/config/sync/taxonomy.vocabulary.infobox_variant.yml b/config/sync/taxonomy.vocabulary.infobox_variant.yml deleted file mode 100644 index 5b644086..00000000 --- a/config/sync/taxonomy.vocabulary.infobox_variant.yml +++ /dev/null @@ -1,8 +0,0 @@ -uuid: 67fffa3d-fe69-4eeb-884f-b7cd51fc57f8 -langcode: da -status: true -dependencies: { } -name: 'Infobox variant' -vid: infobox_variant -description: 'Different variants of style for the infobox paragraph' -weight: 0 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 452c5c94..81ca4021 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 @@ -41,7 +41,7 @@
-
+
{% block paragraph %} {% if content.field_paragraph_title['#items'] is not empty %}
From 9b9baa3ca9e8c6603861de324a1de33168ca199e Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 11:04:32 +0200 Subject: [PATCH 14/19] 1340: Change machine name --- .../core.entity_form_display.paragraph.info_box.default.yml | 4 ++-- .../core.entity_view_display.paragraph.info_box.default.yml | 4 ++-- ...yml => field.field.paragraph.info_box.field_variant.yml} | 6 +++--- ...select.yml => field.storage.paragraph.field_variant.yml} | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename config/sync/{field.field.paragraph.info_box.field_variant_select.yml => field.field.paragraph.info_box.field_variant.yml} (76%) rename config/sync/{field.storage.paragraph.field_variant_select.yml => field.storage.paragraph.field_variant.yml} (89%) diff --git a/config/sync/core.entity_form_display.paragraph.info_box.default.yml b/config/sync/core.entity_form_display.paragraph.info_box.default.yml index 632e9506..a9cb6c67 100644 --- a/config/sync/core.entity_form_display.paragraph.info_box.default.yml +++ b/config/sync/core.entity_form_display.paragraph.info_box.default.yml @@ -5,7 +5,7 @@ dependencies: config: - field.field.paragraph.info_box.field_content_block_text - field.field.paragraph.info_box.field_paragraph_title - - field.field.paragraph.info_box.field_variant_select + - field.field.paragraph.info_box.field_variant - paragraphs.paragraphs_type.info_box module: - text @@ -30,7 +30,7 @@ content: size: 60 placeholder: '' third_party_settings: { } - field_variant_select: + field_variant: type: options_select weight: 3 region: content diff --git a/config/sync/core.entity_view_display.paragraph.info_box.default.yml b/config/sync/core.entity_view_display.paragraph.info_box.default.yml index e0bd06d2..d877f2e7 100644 --- a/config/sync/core.entity_view_display.paragraph.info_box.default.yml +++ b/config/sync/core.entity_view_display.paragraph.info_box.default.yml @@ -5,7 +5,7 @@ dependencies: config: - field.field.paragraph.info_box.field_content_block_text - field.field.paragraph.info_box.field_paragraph_title - - field.field.paragraph.info_box.field_variant_select + - field.field.paragraph.info_box.field_variant - paragraphs.paragraphs_type.info_box module: - options @@ -30,7 +30,7 @@ content: third_party_settings: { } weight: 0 region: content - field_variant_select: + field_variant: type: list_key label: hidden settings: { } diff --git a/config/sync/field.field.paragraph.info_box.field_variant_select.yml b/config/sync/field.field.paragraph.info_box.field_variant.yml similarity index 76% rename from config/sync/field.field.paragraph.info_box.field_variant_select.yml rename to config/sync/field.field.paragraph.info_box.field_variant.yml index d62f0173..d6980126 100644 --- a/config/sync/field.field.paragraph.info_box.field_variant_select.yml +++ b/config/sync/field.field.paragraph.info_box.field_variant.yml @@ -3,12 +3,12 @@ langcode: da status: true dependencies: config: - - field.storage.paragraph.field_variant_select + - field.storage.paragraph.field_variant - paragraphs.paragraphs_type.info_box module: - options -id: paragraph.info_box.field_variant_select -field_name: field_variant_select +id: paragraph.info_box.field_variant +field_name: field_variant entity_type: paragraph bundle: info_box label: Variant diff --git a/config/sync/field.storage.paragraph.field_variant_select.yml b/config/sync/field.storage.paragraph.field_variant.yml similarity index 89% rename from config/sync/field.storage.paragraph.field_variant_select.yml rename to config/sync/field.storage.paragraph.field_variant.yml index f8c62013..a6dcad68 100644 --- a/config/sync/field.storage.paragraph.field_variant_select.yml +++ b/config/sync/field.storage.paragraph.field_variant.yml @@ -5,8 +5,8 @@ dependencies: module: - options - paragraphs -id: paragraph.field_variant_select -field_name: field_variant_select +id: paragraph.field_variant +field_name: field_variant entity_type: paragraph type: list_string settings: From 138ae3c923b63784eb0899cb8b1bf18977229cbf Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 13:31:38 +0200 Subject: [PATCH 15/19] 1353: Use local i2svg replace. Update icons. Add missing. --- .../custom/hoeringsportal/assets/js/icons.js | 65 +++++++++++++------ .../node--citizen-proposal--teaser.html.twig | 2 +- .../content/node--list-display.html.twig | 2 +- .../node--project-main-page--teaser.html.twig | 2 +- .../node--public-meeting--teaser.html.twig | 4 +- .../node--static-page--teaser.html.twig | 2 +- .../templates/content/node--teaser.html.twig | 6 +- ...ock-field--node-project-timeline.html.twig | 2 +- ...field--field-itk-media-mime-type.html.twig | 2 +- ...ield--node--field-video--project.html.twig | 2 +- ...al-link--projekt-billede-galleri.html.twig | 2 +- .../form/form--search-block-form.html.twig | 4 +- .../templates/layout/html.html.twig | 2 - .../misc/itk-pretix-date-entry.html.twig | 2 +- .../templates/navigation/pager.html.twig | 8 +-- .../newsletter-bottom-link.html.twig | 2 +- ...-project-main-page--list-display.html.twig | 2 +- 17 files changed, 66 insertions(+), 45 deletions(-) diff --git a/web/themes/custom/hoeringsportal/assets/js/icons.js b/web/themes/custom/hoeringsportal/assets/js/icons.js index 4afa1a32..764b5b69 100644 --- a/web/themes/custom/hoeringsportal/assets/js/icons.js +++ b/web/themes/custom/hoeringsportal/assets/js/icons.js @@ -3,50 +3,73 @@ */ // Import the svg core -import { library } from '@fortawesome/fontawesome-svg-core' +import { library, dom } from '@fortawesome/fontawesome-svg-core' // To keep the package size as small as possible we only import icons we use // Import the icons from the free solid package. import { - faSort, + faArrowRight, + faCopy, + faComment, + faCircleCheck, + faFilePdf, faEnvelope, - faSearch, + faMagnifyingGlass, + faPrint, + faSort, faTimes, - faCopy, - faPrint + faCircle, + faFileWord, + faFileAlt, + faFileImage, + faFileExcel, + faTicketAlt, } from '@fortawesome/free-solid-svg-icons' // Import icons from the free brands package import { + faDigg, + faEvernote, faFacebook, - faXTwitter, - faLinkedin, - faWhatsapp, faFacebookMessenger, + faLinkedin, faPinterest, - faDigg, - faTumblr, faReddit, - faEvernote + faTumblr, + faWhatsapp, + faXTwitter, } from '@fortawesome/free-brands-svg-icons' // Add the icons to the library for replacing with the intended svg. library.add( - faSort, + // Solid + faArrowRight, + faCircle, + faCircleCheck, + faComment, + faCopy, faEnvelope, - faSearch, + faFilePdf, + faFileWord, + faFileAlt, + faFileImage, + faFileExcel, + faMagnifyingGlass, + faPrint, + faSort, faTimes, + faTicketAlt, + //Brand + faDigg, + faEvernote, faFacebook, - faXTwitter, - faLinkedin, - faWhatsapp, faFacebookMessenger, + faLinkedin, faPinterest, - faDigg, - faTumblr, faReddit, - faEvernote, - faCopy, - faPrint + faTumblr, + faWhatsapp, + faXTwitter, ) +dom.i2svg(); diff --git a/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig index 26cc6822..10ab18d9 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--citizen-proposal--teaser.html.twig @@ -92,7 +92,7 @@ {{ content.field_author_name }} - +
diff --git a/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig index d4dbb763..37d869e4 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--list-display.html.twig @@ -105,7 +105,7 @@ {% if (content.field_hearing_id) %} {{ content.field_hearing_id }} {% endif %} - +
diff --git a/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig index 7e55130e..c25fcab1 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--project-main-page--teaser.html.twig @@ -14,6 +14,6 @@ {{ content.field_project_category }} {{ content.field_area }} - +
diff --git a/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig index 1261020a..6a955d8f 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--public-meeting--teaser.html.twig @@ -91,7 +91,7 @@
{{ enddate|date('M')|t }}
{% elseif (content_state == 'finished') %}
{{ 'Finished'|t }}
-
+
{% set overlay = 'TRUE' %} {% set overlay_text = 'Finished'|t %} @@ -132,6 +132,6 @@ {% endif %} {{ content.field_area }} - +
diff --git a/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig index 0bdbe997..30b153c9 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--static-page--teaser.html.twig @@ -76,6 +76,6 @@ set classes = [

{{ label }}

{{ content }}

- +
diff --git a/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig b/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig index bb3498fa..4b215e37 100755 --- a/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig +++ b/web/themes/custom/hoeringsportal/templates/content/node--teaser.html.twig @@ -102,7 +102,7 @@ {% set overlay_text_color = 'text-orange' %} {% elseif (content_state == 'finished') %}
{{ 'Finished'|t }}
-
+
{% set overlay = 'TRUE' %} {% set overlay_text = 'Finished'|t %} @@ -119,7 +119,7 @@ {% set ticket_count = deskpro_get_ticket_count(node) %} {% if ticket_count > 0 %}
- {{ ticket_count }} + {{ ticket_count }}
{% endif %}
@@ -152,6 +152,6 @@ {% endif %} {{ content.field_area }} - + diff --git a/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig index c3cfaaf4..95964732 100755 --- a/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-project-timeline.html.twig @@ -83,7 +83,7 @@
{% for term in timeline_terms %} -
{{ term.name }}
+
{{ term.name }}
{% endfor %}
diff --git a/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig index e3a5c26f..538e81ab 100644 --- a/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--field-itk-media-mime-type.html.twig @@ -52,5 +52,5 @@ {% for item in items %} {% set icon = mime_type_icons[item.content['#context'].value]|default('fa-file') %} - + {% endfor %} diff --git a/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig index 4d107ae3..bbbfef4f 100755 --- a/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--node--field-video--project.html.twig @@ -42,7 +42,7 @@ {% for key, item in items %} diff --git a/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig index 4f69c636..b37f82a6 100755 --- a/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig +++ b/web/themes/custom/hoeringsportal/templates/field/field--paragraph--field-external-link--projekt-billede-galleri.html.twig @@ -47,7 +47,7 @@ {% for item in items %}
-

+

{{ 'Open project gallery'|t }}

 diff --git a/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig b/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig index 9033469e..f0bb549c 100644 --- a/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig +++ b/web/themes/custom/hoeringsportal/templates/form/form--search-block-form.html.twig @@ -19,7 +19,7 @@
@@ -27,7 +27,7 @@ {{ children }}
diff --git a/web/themes/custom/hoeringsportal/templates/layout/html.html.twig b/web/themes/custom/hoeringsportal/templates/layout/html.html.twig index c92d050d..737e4d4b 100755 --- a/web/themes/custom/hoeringsportal/templates/layout/html.html.twig +++ b/web/themes/custom/hoeringsportal/templates/layout/html.html.twig @@ -31,8 +31,6 @@ - - {# diff --git a/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig b/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig index a22bf81f..fc9ba48c 100644 --- a/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig +++ b/web/themes/custom/hoeringsportal/templates/misc/itk-pretix-date-entry.html.twig @@ -16,7 +16,7 @@ {% set availability = public_meeting_helper.getPretixAvailability(variables.data) %} - + {{ variables.location }} {{ variables.time_from|date('U')|format_date('hoeringsportal_date_long') }} {{ variables.time_from|date('U')|format_date('hoeringsportal_time') }}–{{ variables.time_to|date('U')|format_date('hoeringsportal_time') }} diff --git a/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig b/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig index 770a7b95..9994357a 100755 --- a/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig +++ b/web/themes/custom/hoeringsportal/templates/navigation/pager.html.twig @@ -35,24 +35,24 @@ {% if items.previous %}
    • {% else %}
  • - {{ 'Previous'|t }} + {{ 'Previous'|t }}
    • {% endif %}
  • {{ 'Page'|t }} {{ current }} / {{ items.pages|length }}
    • {% if items.next %}
    • {% else %}
  • - {{ 'Next'|t }} + {{ 'Next'|t }}
    • {% endif %} diff --git a/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig b/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig index 1cf68dc5..ec061053 100644 --- a/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig +++ b/web/themes/custom/hoeringsportal/templates/newsletter-bottom-link.html.twig @@ -1,5 +1,5 @@ From 4811ee648a675e7c1e2ac41512bcd86be3a80982 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 13:38:12 +0200 Subject: [PATCH 16/19] 1353: Changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8195359b..404571ee 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* [PR-407](https://github.com/itk-dev/hoeringsportal/pull/407) + Fix fontawesome issues * [PR-406](https://github.com/itk-dev/hoeringsportal/pull/406) Infobox styling * [PR-405](https://github.com/itk-dev/hoeringsportal/pull/405) From 92a0b0c07393a6acf58e49bf6a479949116685f8 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 13:40:56 +0200 Subject: [PATCH 17/19] 1353: Apply coding standards --- web/themes/custom/hoeringsportal/assets/js/icons.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/themes/custom/hoeringsportal/assets/js/icons.js b/web/themes/custom/hoeringsportal/assets/js/icons.js index 764b5b69..9708d1d9 100644 --- a/web/themes/custom/hoeringsportal/assets/js/icons.js +++ b/web/themes/custom/hoeringsportal/assets/js/icons.js @@ -24,7 +24,7 @@ import { faFileAlt, faFileImage, faFileExcel, - faTicketAlt, + faTicketAlt } from '@fortawesome/free-solid-svg-icons' // Import icons from the free brands package @@ -38,7 +38,7 @@ import { faReddit, faTumblr, faWhatsapp, - faXTwitter, + faXTwitter } from '@fortawesome/free-brands-svg-icons' // Add the icons to the library for replacing with the intended svg. @@ -60,7 +60,7 @@ library.add( faSort, faTimes, faTicketAlt, - //Brand + // Brand faDigg, faEvernote, faFacebook, @@ -70,6 +70,6 @@ library.add( faReddit, faTumblr, faWhatsapp, - faXTwitter, + faXTwitter ) -dom.i2svg(); +dom.i2svg() From f7ec9cb506a7cb0f45176f55b4f4cde3b2908d00 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Mon, 13 May 2024 14:13:34 +0200 Subject: [PATCH 18/19] 1353: Remove duplicate id on navigation --- .../templates/block/block--system-menu-block.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig b/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig index cef0d359..36148442 100755 --- a/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig +++ b/web/themes/custom/hoeringsportal/templates/block/block--system-menu-block.html.twig @@ -32,7 +32,7 @@ */ #} {% set heading_id = attributes.id ~ '-menu'|clean_id %} -
    +
    {# Label. If not displayed, we still provide it for screen readers. #} {% if not configuration.label_display %} {% set title_attributes = title_attributes.addClass('visually-hidden') %} From e537ac4693d9d4a88a1207d144dca13254045659 Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Tue, 14 May 2024 11:08:44 +0200 Subject: [PATCH 19/19] Update changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 404571ee..cf9a70f2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.4.0] - 2024-05-14 + * [PR-407](https://github.com/itk-dev/hoeringsportal/pull/407) Fix fontawesome issues * [PR-406](https://github.com/itk-dev/hoeringsportal/pull/406) @@ -210,7 +212,8 @@ Updated drupal core 8.6.16 Initial release -[Unreleased]: https://github.com/itk-dev/hoeringsportal/compare/4.3.0...HEAD +[Unreleased]: https://github.com/itk-dev/hoeringsportal/compare/4.4.0...HEAD +[4.4.0]: https://github.com/itk-dev/hoeringsportal/compare/4.3.0...4.4.0 [4.3.0]: https://github.com/itk-dev/hoeringsportal/compare/4.2.2...4.3.0 [4.2.2]: https://github.com/itk-dev/hoeringsportal/compare/4.2.1...4.2.2 [4.2.1]: https://github.com/itk-dev/hoeringsportal/compare/4.2.0...4.2.1