Merge branch 'feature/early_inclusion_dialogue' into develop

Author: martinyde

CHANGELOG.md

@@ -16,6 +16,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
   * Add promoted content feature
   * Updated Drupal core 10.5.2 => 10.5.6
   * Updated accessibility
+  * Add breadcrumb to dialogue
 
 * [PR-555](https://github.com/itk-dev/deltag.aarhus.dk/pull/555)
   * Add underline to active navigation.

web/themes/custom/hoeringsportal/assets/css/module/_dialogue.scss

@@ -22,6 +22,10 @@
   }
 }
 
+.proposal-form-wrapper {
+  padding-top: 3rem;
+}
+
 .node-dialogue-proposal-form {
   .fieldset-legend {
     font-size: 1rem;

web/themes/custom/hoeringsportal/assets/css/module/_promoted.scss

@@ -25,3 +25,9 @@
 .proposal-count {
   font-size: 3rem;
 }
+
+.create-proposal-dialogue {
+  .proposal-form-wrapper {
+    padding-top: 0;
+  }
+}

web/themes/custom/hoeringsportal/hoeringsportal.theme

@@ -174,6 +174,10 @@ function hoeringsportal_theme_suggestions_input_alter(array &$suggestions, array
  * Implements hook_theme_suggestions_HOOK_alter().
  */
 function hoeringsportal_theme_suggestions_form_alter(array &$suggestions, array $variables) {
+
+  if (!empty($variables['element']['#form_id'])) {
+    $suggestions[] = 'form__' . str_replace('-', '_', $variables['element']['#form_id']);
+  }
   if (!empty($variables['element']['#id'])) {
     $suggestions[] = 'form__' . str_replace('-', '_', $variables['element']['#id']);
   }

web/themes/custom/hoeringsportal/templates/comment/comment.html.twig

@@ -68,6 +68,14 @@
  * @ingroup themeable
  */
 #}
+
+{% set dialog_options = {
+  width: 400,
+  classes: {
+    'ui-dialog': 'create-comment-form',
+  }
+} %}
+
 <article{{ attributes.addClass('js-comment mb-3') }}>
   <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
   <div{{ content_attributes }}>
@@ -78,7 +86,7 @@
       </div>
       <div class="d-flex mb-2">
         <div class="flag-wrapper me-3">{{ content.flag_support_comment }}</div>
-        <div class="comment-reply"><a class="use-ajax text-secondary" data-dialog-options="{&quot;width&quot;:400}" data-dialog-type="modal" href="{{ path('comment.reply', {entity_type: 'node', entity: comment.entity_id.value[0].target_id, field_name: 'field_comments', pid: comment.cid.value}) }}">{{ include('themes/custom/hoeringsportal/templates/animated-svg/icon-deltag-reply.svg.html.twig') }}{{ 'Reply'|t({}, {context: 'Comment reply  '}) }}</a></div>
+        <div class="comment-reply"><a class="use-ajax text-secondary" data-dialog-options="{{ dialog_options|json_encode }}" data-dialog-type="modal" href="{{ path('comment.reply', {entity_type: 'node', entity: comment.entity_id.value[0].target_id, field_name: 'field_comments', pid: comment.cid.value}) }}">{{ include('themes/custom/hoeringsportal/templates/animated-svg/icon-deltag-reply.svg.html.twig') }}{{ 'Reply'|t({}, {context: 'Comment reply  '}) }}</a></div>
       </div>
     {% endif %}
   </div>

web/themes/custom/hoeringsportal/templates/components/promoted-content-dialogue-right.html.twig

@@ -1,3 +1,13 @@
+{% set dialog_options = {
+  width: 800,
+  title: '',
+  classes: {
+    'ui-dialog': 'create-proposal-dialogue',
+  },
+  dialogueId: elements['#node'].id,
+  originalPath: path('<current>')
+} %}
+
 <div class="text-align-center">
   <div class="proposal-count fw-bold mb-3">
     {{ dialogue_helper.getProposalCount(elements['#node']) }}
@@ -6,7 +16,7 @@
     {{ 'Proposals received'|t }}
   </div>
   <div class="mb-4">
-    <a data-dialog-options="{&quot;width&quot;:800, &quot;dialogueId&quot;:{{ elements['#node'].id }}, &quot;originalPath&quot;:&quot;{{ path('<current>') }}&quot;}" data-dialog-type="modal" href="{{ path('node.add', {node_type: 'dialogue_proposal', dialogue: elements['#node'].id}) }}" class="use-ajax btn btn-primary text-white rounded">{{ 'Participate with your proposal'|t }}</a>
+    <a data-dialog-options="{{ dialog_options|json_encode }}" data-dialog-type="modal" href="{{ path('node.add', {node_type: 'dialogue_proposal', dialogue: elements['#node'].id}) }}" class="use-ajax btn btn-primary text-white rounded">{{ 'Participate with your proposal'|t }}</a>
   </div>
   <div class="mb-4">
     <a href="{{ path('entity.node.canonical', {node: elements['#node'].id}) }}#proposals" class="btn btn-transparent rounded">{{ 'View all proposals'|t }}</a>

web/themes/custom/hoeringsportal/templates/components/promoted-dialogue.html.twig

@@ -5,7 +5,7 @@
       <h4 class="px-3">{{ left.leftLabel }}:</h4>
       <div class="container">
         <div class="row">
-          <div class="col-6">
+          <div class="col-lg-6">
             {% if left.promoted.id %}
               {{ drupal_entity('node', left.promoted.id, left.promoted.display_mode) }}
             {% else %}
@@ -19,7 +19,7 @@
             {% endif %}
           </div>
           {% if right %}
-            <div class="col-6">
+            <div class="col-lg-6">
               <div class="p-3">
                 {{ include(directory ~ '/templates/components/promoted-content-dialogue-right.html.twig', {}) }}
               </div>

web/themes/custom/hoeringsportal/templates/form/form--node-dialogue-proposal-form.html.twig

@@ -17,7 +17,7 @@
       {{ include((directory ~ '/templates/misc/status-messages.html.twig'), {message_list: {warning: ['No parent exists for this dialogue proposal! You should add a proposal from the appropriate dialogue page.'|t]}, status_headings: {warning: 'warning'}}) }}
     </div>
   {% endif %}
-  <div class="row justify-content-center pt-5">
+  <div class="proposal-form-wrapper row justify-content-center">
     <div class="proposal-layout">
       <div class="breadcrumb mb-3">
         <span class="me-2"><a href="/tidlig-inddragelse">{{ 'Early inclusion'|t }}</a></span>