Merge branch 'develop'

rimi-itk · rimi-itk · commit 4e9ae15ee803 · 2025-08-22T09:47:14.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [4.11.1] - 2025-08-22
+
+* [PR-539](https://github.com/itk-dev/deltag.aarhus.dk/pull/539)
+  Fixed public meeting summary view
+* [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-533](https://github.com/itk-dev/deltag.aarhus.dk/pull/533)
@@ -517,7 +526,8 @@ Updated drupal core 8.6.16
 
 Initial release
 
-[Unreleased]: https://github.com/itk-dev/hoeringsportal/compare/4.11.0...HEAD
+[Unreleased]: https://github.com/itk-dev/hoeringsportal/compare/4.11.1...HEAD
+[4.11.1]: https://github.com/itk-dev/hoeringsportal/compare/4.11.0...4.11.1
 [4.11.0]: https://github.com/itk-dev/hoeringsportal/compare/4.10.3...4.11.0
 [4.10.3]: https://github.com/itk-dev/hoeringsportal/compare/4.10.2...4.10.3
 [4.10.2]: https://github.com/itk-dev/hoeringsportal/compare/4.10.1...4.10.2
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
@@ -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
@@ -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,15 +22,22 @@ content:
       view_mode: default
       link: ''
     third_party_settings: {  }
-    weight: 0
+    weight: 2
     region: content
   field_project_category:
     type: entity_reference_label
     label: visually_hidden
     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
@@ -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
@@ -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
@@ -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 indholdsvisningen'
+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
@@ -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 landing page for your project'
 help: null
 new_revision: true
 preview_mode: 1
diff --git a/web/modules/custom/hoeringsportal_base_fixtures/src/Fixture/PublicMeetingFixture.php b/web/modules/custom/hoeringsportal_base_fixtures/src/Fixture/PublicMeetingFixture.php
@@ -55,7 +55,6 @@ public function load() {
       'field_contact' => 'Contact info',
       'field_content_state' => 'active',
       'field_email_address' => 'a@a.dk',
-      'field_first_meeting_time' => date('Y-m-d', 1283166912),
       'field_media_document' => [[$this->getReference('media_library:Fil:MTM')]],
       'field_media_image_single' => [
         ['target_id' => $this->getReference('media:Large1')->id()],
@@ -89,6 +88,14 @@ public function load() {
     $this->addReference('public_meeting:fixture-1', $node);
     $node->save();
 
+    // Create a copy in the future.
+    $node = $node->createDuplicate();
+    $node->setTitle('Future public meeting with manual signup');
+    $node->set('field_registration_deadline', (new \DateTimeImmutable('today + 12 hours + 4 years'))->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT));
+    $node->set('field_last_meeting_time', (new \DateTimeImmutable('today + 19 hours + 4 years'))->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT));
+    $node->set('field_last_meeting_time_end', (new \DateTimeImmutable('today + 21 hours + 4 years'))->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT));
+    $node->save();
+
     // A public meeting that has signup with Pretix.
     $node = $node->createDuplicate();
     $node->setTitle('Public meeting with pretix signup');
diff --git a/web/modules/custom/hoeringsportal_content_blocks/templates/hoeringsportal-meeting-warning.html.twig b/web/modules/custom/hoeringsportal_content_blocks/templates/hoeringsportal-meeting-warning.html.twig
@@ -11,10 +11,10 @@
   <div class="bg-danger p-3">
     <div class="container">
       {% if config.content_state is same as('finished') %}
-        <span class="text-light"><strong>{{ 'Note!'|t }}</strong>{{ 'This public meeting has been held.'|t }}</span>
+        <span class="text-light"><strong>{{ 'Note!'|t }}</strong> {{ 'This public meeting has been held.'|t }}</span>
       {% endif %}
       {% if config.content_state is same as('cancelled') %}
-        <span class="text-light"><strong>{{ 'Note!'|t }}</strong>{{ 'This public meeting has been cancelled.'|t }}</span>
+        <span class="text-light"><strong>{{ 'Note!'|t }}</strong> {{ 'This public meeting has been cancelled.'|t }}</span>
       {% endif %}
     </div>
   </div>
diff --git a/web/modules/custom/hoeringsportal_public_meeting/src/Helper/PublicMeetingHelper.php b/web/modules/custom/hoeringsportal_public_meeting/src/Helper/PublicMeetingHelper.php
@@ -344,6 +344,7 @@ public function getPublicMeetingContext(NodeInterface $node): ?array {
     $upcoming = array_values(array_filter($dates, static fn(PretixDate $date) => $date->get('time_from')->getValue() > $now));
 
     return array_filter([
+      'is_pretix' => $this->hasPretixSignUp($node),
       'previous' => $previous,
       'current' => $current,
       'next' => $next,
@@ -381,7 +382,7 @@ public function hasDateEndingBetween(NodeInterface $node, ?\DateTimeInterface $f
    * @return \Drupal\itk_pretix\Plugin\Field\FieldType\PretixDate[]|iterable|null
    *   The pretix dates if any.
    */
-  private function getPretixDates(NodeInterface $node): ?iterable {
+  public function getPretixDates(NodeInterface $node): ?iterable {
     if (!$this->isPublicMeeting($node) || !$this->hasPretixSignUp($node)) {
       return NULL;
     }
diff --git a/web/modules/custom/hoeringsportal_public_meeting/templates/hoeringsportal-public-meeting-summary.html.twig b/web/modules/custom/hoeringsportal_public_meeting/templates/hoeringsportal-public-meeting-summary.html.twig
@@ -10,6 +10,8 @@
  */
 #}
 
+{% if public_meeting_context.is_pretix|default(false) %}
+
 {# Define `variables` to match the one used in field--field-pretix-dates.html.twig #}
 {# Use current date if set. Otherwise the first upcoming date. #}
 {% set variables = public_meeting_context.current|default(public_meeting_context.upcoming|first) %}
@@ -26,20 +28,6 @@
 {% set is_current = variables.uuid == public_meeting_context.current.uuid %}
 {% set is_next = variables.uuid == public_meeting_context.next.uuid %}
 {% set is_first_upcoming = variables.uuid == public_meeting_context.upcoming[0].uuid %}
-
-{# {{ dump({
-  meeting_cancelled,
-  meeting_has_been_held,
-  registration_deadline_passed,
-  sign_up_url,
-  availability,
-  is_previous,
-  is_current,
-  is_next,
-  is_first_upcoming,
-
-  variables,
-  }) }} #}
 {% endif %}
 
 {% if public_meeting_context.current %}
@@ -101,5 +89,25 @@
   {% endif %}
 {% endif %}
 
-<h3 class="mt-3">{{ 'This event has multiple dates'|t }}</h3>
-<a href="#pretix_signup_list" class="btn btn-sm bg-primary text-white rounded py-1 px-3 mb-3">{{ 'View the list'|t }}</a>
+{% if public_meeting_helper.hasPretixSignUp(node) and public_meeting_helper.getPretixDates(node)|length > 1 %}
+  <h3 class="mt-3">{{ 'This event has multiple dates'|t }}</h3>
+  <a href="#pretix_signup_list" class="btn btn-sm bg-primary text-white rounded py-1 px-3 mb-3">{{ 'View the list'|t }}</a>
+{% endif %}
+
+{% else %}
+
+{# Non-pretix meeting #}
+{% if node.field_last_meeting_time[0] is defined %}
+  <h5 class="mt-3">{{ 'Date'|t }}</h5>
+  {{ node.field_last_meeting_time[0].date|date('U')|format_date('hoeringsportal_date_long') }}
+
+  <h5 class="mt-3">{{ 'Time'|t }}</h5>
+  {{ node.field_last_meeting_time[0].date|date('U')|format_date('hoeringsportal_time') }}{% if node.field_last_meeting_time_end[0].date is defined %} - {{ node.field_last_meeting_time_end[0].date|date('U')|format_date('hoeringsportal_time') }}{% endif %}
+{% endif %}
+
+{% if signup_deadline.value|default(false) %}
+  <h5 class="mt-3">{{ 'Last signup date'|t }}</h5>
+  {{ signup_deadline.value|date('U')|format_date('hoeringsportal_date_long') }}
+{% endif %}
+
+{% endif %}
diff --git a/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-public-meeting-summary.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--dynamic-block-field--node-public-meeting-summary.html.twig
@@ -36,11 +36,6 @@
  * @see template_preprocess_field()
  */
 #}
-{% set node = element['#object'] %}
-{% set meeting_cancelled = public_meeting_helper.isCancelled(node) %}
-{% set meeting_has_been_held = public_meeting_helper.hasBeenHeld(node) %}
-{% set registration_deadline_passed = public_meeting_helper.isDeadlinePassed(node) %}
-
 {% if label_hidden %}
   {% if multiple %}
     {% for item in items %}
@@ -68,15 +63,22 @@
   {% endif %}
 {% endif %}
 
-{% if meeting_cancelled %}
-  <div class="pretix-alert meeting-has-been-cancelled my-3">{{ 'Meeting has been cancelled'|t }}</div>
-{% elseif meeting_has_been_held %}
-  <div class="pretix-alert meeting-has-been-held my-3">{{ 'Meeting has already been held'|t }}</div>
-{% else %}
-  {% if registration_deadline_passed %}
-    {# @TODO: Design: styling of "alert" #}
-    <div class="pretix-alert pretix-alert-registration-deadline-passed my-3">{{ 'Registration deadline passed'|t }}</div>
+{% set node = element['#object'] %}
+{# pretix info is rendered in hoeringsportal-public-meeting-summary.html.twig #}
+{% if not public_meeting_helper.hasPretixSignUp(node) %}
+  {% set meeting_cancelled = public_meeting_helper.isCancelled(node) %}
+  {% set meeting_has_been_held = public_meeting_helper.hasBeenHeld(node) %}
+  {% set registration_deadline_passed = public_meeting_helper.isDeadlinePassed(node) %}
+
+  {% if meeting_cancelled %}
+    <div class="pretix-alert meeting-has-been-cancelled my-3">{{ 'Meeting has been cancelled'|t }}</div>
+  {% elseif meeting_has_been_held %}
+    <div class="pretix-alert meeting-has-been-held my-3">{{ 'Meeting has already been held'|t }}</div>
   {% else %}
-    <a id="sign-up-shortcut" class="btn btn-primary btn-sm my-3" style="display: none">{{ 'Sign up for public meeting'|t }}</a>
+    {% if registration_deadline_passed %}
+      <div class="pretix-alert pretix-alert-registration-deadline-passed my-3">{{ 'Registration deadline passed'|t }}</div>
+    {% else %}
+      <a id="sign-up-shortcut" class="btn btn-primary btn-sm my-3" style="display: none">{{ 'Sign up for public meeting'|t }}</a>
+    {% endif %}
   {% endif %}
 {% endif %}
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
@@ -1,17 +1,20 @@
 {# Main container #}
 <div class="container content__container">
   <div class="row">
-    <div class="col-md-8 py-3 py-md-5">
-      {{ content.field_project_category }}
+    <div class="col-md-8 py-3 pt-md-5">
+      <span class="text-primary">{{ content.field_project_category }}</span>
       <h1>{{ node.title.value }}</h1>
-      {{ content|without('field_project_category', 'field_content_sections', 'published_at') }}
+      {% if content.field_teaser %}
+        <p class="fs-3">{{ content.field_teaser }}</p>
+      {% endif %}
+      {{ content|without('field_project_category', 'field_teaser', 'field_content_sections', 'published_at') }}
     </div>
     <div class="col-md-4 pt-md-3">
       {{ content.field_aside_block }}
     </div>
   </div>
 </div>
-<div class="sections d-flex flex-column row-gap-5">
+<div class="d-flex flex-column row-gap-3">
   {{ content.field_content_sections }}
 </div>
 <div class="container">
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
@@ -38,7 +38,7 @@
  * @ingroup themeable
  */
 #}
-<div class="container my-3 my-md-5">
+<div class="container my-2 my-lg-4">
   <div class="row">
     <div class="col-md-12">
       {% 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
@@ -38,7 +38,7 @@
  * @ingroup themeable
  */
 #}
-<div class="container my-3 my-md-5">
+<div class="container my-2 my-lg-4">
   <div class="row align-items-center my-3 mt-md-5 mb-md-3">
     <div class="col">
       <h2>{{ paragraph.field_list_title.value }}</h2>
diff --git 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 #}
 
-<div class="container my-3 my-md-5">
+<div class="container my-2 my-lg-4">
   <div class="row">
     <div class="col-md-8">
       {% 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
@@ -38,7 +38,7 @@
  * @ingroup themeable
  */
 #}
-<div class="container my-3 my-md-5">
+<div class="container my-2 my-lg-4">
   <div class="row">
     <div class="col-md-8">
       <div class="info-box rounded overflow-hidden {{ elements.field_variant_select.0['#markup']|clean_class }}">
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
@@ -1,4 +1,4 @@
-<div class="container my-3 my-md-5">
+<div class="container my-2 my-lg-4">
   <div class="row">
     <div class="col-md-12">
       {% 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
diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph.html.twig
