@openeuropa/bcl-theme-joinup 0.4298.202511051800 → 0.4360.202601141610

package/templates/bcl-list-group/list-group.html.twig

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - flush (boolean) (default: false)
   - horizontal (string) (default: '')
@@ -27,58 +25,58 @@
   - attributes (drupal attrs)
 #}
 
-{% set _flush = flush ?? false %}
+{%- set _flush = flush ?? false %}
 {% set _horizontal = horizontal|default('') %}
 {% set _id = id|default('') %}
 {% set _type = type|default('unordered') %}
 {% set _items = items|default([]) %}
 
-{% set _classes = ['list-group'] %}
+{%- set _classes = ['list-group'] %}
 
-{% if _flush %}
-  {% set _classes = _classes|merge(['list-group-flush']) %}
+{%- if _flush %}
+  {%- set _classes = _classes|merge(['list-group-flush']) %}
 {% endif %}
 {% if _type == 'ordered' %}
-  {% set _classes = _classes|merge(['list-group-numbered']) %}
+  {%- set _classes = _classes|merge(['list-group-numbered']) %}
 {% endif %}
 {% if _horizontal is not empty %}
-  {% set _classes = _classes|merge(['list-group-' ~ _horizontal]) %}
+  {%- set _classes = _classes|merge(['list-group-' ~ _horizontal]) %}
 {% endif %}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% if _id is not empty %}
-  {% set attributes = attributes.setAttribute('id', _id) %}
+{%- if _id is not empty %}
+  {%- set attributes = attributes.setAttribute('id', _id) %}
 {% endif %}
 {% set attributes = attributes.addClass(_classes) %}
 
-{% if _type == 'unordered' %}
+{%- if _type == 'unordered' -%}
   <ul
     {{ attributes }}
   >
-{% endif %}
-{% if _type == 'ordered' %}
+{%- endif %}
+{% if _type == 'ordered' -%}
   <ol
     {{ attributes }}
   >
-{% endif %}
-{% if _type == 'actionable' %}
+{%- endif %}
+{% if _type == 'actionable' -%}
   <div
     {{ attributes }}
   >
-{% endif %}
+{%- endif %}
 {% if _items is not empty and _items is iterable %}
-  {% for _item in _items %}
-    {% if _type == 'unordered' or _type == 'ordered' %}
-      {% set _item_class = 'list-group-item' %}
-      {% if _item.variant is not empty %}
-        {% set _item_class = _item_class ~ ' list-group-item-' ~ _item.variant %}
-      {% endif %}
-      {% if _item.extra_classes is not empty %}
-        {% set _item_class = _item_class ~ ' ' ~ _item.extra_classes %}
-      {% endif %}
+  {%- for _item in _items %}
+    {%- if _type == 'unordered' or _type == 'ordered' %}
+      {%- set _item_class = 'list-group-item' %}
+      {%- if _item.variant is not empty %}
+        {%- set _item_class = _item_class ~ ' list-group-item-' ~ _item.variant %}
+      {%- endif %}
+      {%- if _item.extra_classes is not empty %}
+        {%- set _item_class = _item_class ~ ' ' ~ _item.extra_classes %}
+      {%- endif -%}
       <li class="{{ _item_class }}">
       {%- if _item.input is defined -%}
           {% include '@oe-bcl/bcl-form-input/form-input.html.twig' with _item only %}
@@ -89,32 +87,30 @@
           {%- endif -%}
       {%- endif -%}
       </li>
-    {% else %}
-      {% if _item.attributes is empty %}
-        {% set _item = _item|merge({
+    {%- else %}
+      {%- if _item.attributes is empty %}
+        {%- set _item = _item|merge({
           attributes: create_attribute()
         }) %}
-      {% endif %}
-      {% set _item = _item|merge({
+      {%- endif %}
+      {%- set _item = _item|merge({
         clean_class: true,
         attributes: _item.attributes.addClass(['list-group-item', 'list-group-item-action'])
       }) %}
-      {% if _item.button is defined %}
-        {% include '@oe-bcl/bcl-button/button.html.twig' with _item only %}
-      {% else %}
-        {% include '@oe-bcl/bcl-link/link.html.twig' with _item only %}
-      {% endif %}
-    {% endif %}
-  {% endfor %}
+      {%- if _item.button is defined %}
+        {%- include '@oe-bcl/bcl-button/button.html.twig' with _item only %}
+      {%- else %}
+        {%- include '@oe-bcl/bcl-link/link.html.twig' with _item only %}
+      {%- endif %}
+    {%- endif %}
+  {%- endfor %}
 {% endif %}
-{% if _type == 'unordered' %}
+{% if _type == 'unordered' -%}
 </ul>
-{% endif %}
-{% if _type == 'ordered' %}
+{%- endif %}
+{% if _type == 'ordered' -%}
 </ol>
-{% endif %}
-{% if _type == 'actionable' %}
+{%- endif %}
+{% if _type == 'actionable' -%}
 </div>
-{% endif %}
-
-{% endapply %}
+{%- endif -%}

package/templates/bcl-listing/listing.html.twig

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - title_tag: (string) (default: 'h2')
@@ -16,7 +14,7 @@
   - attributes (drupal attrs)
 #}
 
-{% set _title = title|default('') %}
+{%- set _title = title|default('') %}
 {% set _title_tag = title_tag|default('h2') %}
 {% set _title_link = title_link|default({}) %}
 {% set _title_attributes = title_attributes ?: create_attribute() %}
@@ -26,7 +24,7 @@
 {% set _alignment = alignment|default('') %}
 {% set _image_size = image_size|default('') %}
 
-{% set _classes = ['bcl-listing', 'bcl-listing--' ~ _variant] %}
+{%- set _classes = ['bcl-listing', 'bcl-listing--' ~ _variant] %}
 {% set _cards = [] %}
 {% set _card_layout = {
   type: 'grid',
@@ -35,16 +33,16 @@
   attributes: create_attribute(),
 } %}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% set attributes = attributes.addClass(_classes) %}
+{%- set attributes = attributes.addClass(_classes) -%}
 
 <div {{ attributes }}>
 
-{% if _title is not empty %}
-  {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+{%- if _title is not empty %}
+  {%- include '@oe-bcl/bcl-heading/heading.html.twig' with {
     title: _title,
     title_tag: _title_tag,
     title_link: _title_link,
@@ -52,37 +50,37 @@
   } only %}
 {% endif %}
 
-{% if _items is not empty %}
-  {% for _card in _items %}
-    {% set  _alignment_class = '' %}
-    {% set _image_classes = _card.image.classes ?: '' %}
-    {% set _start_col_classes = 'bcl-card-start-col mb-3 mb-lg-0' %}
-    {% set _end_col_classes = 'col-12 col-md' %}
-    {% if _image_size is not empty %}
-      {% set _start_col_classes = _start_col_classes ~ ' bcl-size-' ~ _image_size %}
-    {% endif %}
-    {% if 'd-none' in _image_classes %}
-      {% set _start_col_classes = _start_col_classes ~ ' d-none d-md-block' %}
-    {% endif %}
-    {% if _alignment is not empty %}
-      {% set _alignment_class = ' align-self-' ~ _alignment %}
-    {% endif %}
-    {% set _card_classes = [] %}
-    {% set _card_attributes = card.attributes ? card.attributes : create_attribute() %}
-    {% set _card_title_attributes = card.title_attributes ? card.title_attributes : create_attribute() %}
-    {% set _card = _card|merge({
-      title_attributes: _card_title_attributes.addClass(['fs-5'])
+{%- if _items is not empty %}
+  {%- for _card in _items %}
+    {%- set  _alignment_class = '' %}
+    {%- set _image_classes = _card.image.classes ?: '' %}
+    {%- set _start_col_classes = 'bcl-card-start-col mb-3 mb-lg-0' %}
+    {%- set _end_col_classes = 'col-12 col-md' %}
+    {%- if _image_size is not empty %}
+      {%- set _start_col_classes = _start_col_classes ~ ' bcl-size-' ~ _image_size %}
+    {%- endif %}
+    {%- if 'd-none' in _image_classes %}
+      {%- set _start_col_classes = _start_col_classes ~ ' d-none d-md-block' %}
+    {%- endif %}
+    {%- if _alignment is not empty %}
+      {%- set _alignment_class = ' align-self-' ~ _alignment %}
+    {%- endif %}
+    {%- set _card_classes = [] %}
+    {%- set _card_attributes = card.attributes ? card.attributes : create_attribute() %}
+    {%- set _card_title_attributes = card.title_attributes ? card.title_attributes : create_attribute() %}
+    {%- set _card = _card|merge({
+      title_attributes: _card_title_attributes.addClass(['h5'])
     }) %}
 
-    {% if _variant == 'default-1-col' or _variant == 'default-2-col' or _variant == 'default-3-col'  %}
-      {% set _card_classes = [
+    {%- if _variant == 'default-1-col' or _variant == 'default-2-col' or _variant == 'default-3-col' %}
+      {%- set _card_classes = [
         'listing-item',
         'border-bottom',
         'border-md-0',
         'border-0',
       ] %}
-      {% set _card_attributes = _card_attributes.addClass(_card_classes) %}
-      {% set _card = _card|merge({
+      {%- set _card_attributes = _card_attributes.addClass(_card_classes) %}
+      {%- set _card = _card|merge({
         horizontal: true,
         extra_classes_body: 'p-0 pb-md-0 pb-3',
         attributes: _card_attributes,
@@ -91,109 +89,108 @@
           right_col_classes: _end_col_classes ~ _alignment_class,
         }
       }) %}
-    
-      {% if _variant == 'default-2-col' %}
-        {% set _card_layout = _card_layout|merge({
+
+      {%- if _variant == 'default-2-col' %}
+        {%- set _card_layout = _card_layout|merge({
           responsive_columns: 2,
         }) %}
-      {% elseif _variant == 'default-3-col' %}
-        {% set _card_layout = _card_layout|merge({
+      {%- elseif _variant == 'default-3-col' %}
+        {%- set _card_layout = _card_layout|merge({
           attributes: _card_layout.attributes.addClass(['row-cols-md-2']),
           responsive_columns: 3,
           responsiveness: 'xl',
         }) %}
-      {% endif %}
-    {% endif %}
+      {%- endif %}
+    {%- endif %}
 
-    {% if _variant == 'highlight-1-col' %}
-      {% set _card_classes = [
+    {%- if _variant == 'highlight-1-col' %}
+      {%- set _card_classes = [
         'listing-item--highlight',
         'border-0',
         'bg-lighter'
       ] %}
-     {% set _card_attributes = _card_attributes.addClass(_card_classes) %}
-     {% set _card = _card|merge({
+     {%- set _card_attributes = _card_attributes.addClass(_card_classes) %}
+     {%- set _card = _card|merge({
          wrapper_class: 'col',
          attributes: _card_attributes,
       }) %}
-      {% if _card.image is defined and _card.image is not empty %}
-        {% set _card = _card|merge({
+      {%- if _card.image is defined and _card.image is not empty %}
+        {%- set _card = _card|merge({
           extra_classes_body: "pt-0",
         }) %}
-      {% endif %}
-      {% set _card_layout = _card_layout|merge({
+      {%- endif %}
+      {%- set _card_layout = _card_layout|merge({
         cols_extra_classes: 'mt-4-5',
       }) %}
-      {% if _card.image is not empty %}
-        {% set _image_classes = _card.image.classes ?: '' %}
-        {% if not _alignment == 'center' %}
-          {% set _image_classes = _image_classes ? _image_classes ~ ' mb-3' : 'mb-3' %}
-        {% endif %}
-        {% set _card = _card|merge({image: _card.image|merge({
+      {%- if _card.image is not empty %}
+        {%- set _image_classes = _card.image.classes ?: '' %}
+        {%- if not _alignment == 'center' %}
+          {%- set _image_classes = _image_classes ? _image_classes ~ ' mb-3' : 'mb-3' %}
+        {%- endif %}
+        {%- set _card = _card|merge({image: _card.image|merge({
           classes: _image_classes,
         })}) %}
-      {% endif %}
+      {%- endif %}
 
-    {% endif %}
+    {%- endif %}
 
-    {% if _variant == 'highlight-2-col' or variant == 'highlight-3-col' %}
-      {% set _card_classes  = [
+    {%- if _variant == 'highlight-2-col' or variant == 'highlight-3-col' %}
+      {%- set _card_classes  = [
         'listing-item--highlight',
         'border-0',
         'bg-lighter',
         'h-100',
         'rounded-2'
       ] %}
-      {% set _card_attributes = _card_attributes.addClass(_card_classes) %}
-      {% set _card = _card|merge({
+      {%- set _card_attributes = _card_attributes.addClass(_card_classes) %}
+      {%- set _card = _card|merge({
         wrapper_class: 'col',
         attributes: _card_attributes,
       }) %}
-      {% if _card.image is defined and _card.image is not empty %}
-        {% set _card = _card|merge({
+      {%- if _card.image is defined and _card.image is not empty %}
+        {%- set _card = _card|merge({
           extra_classes_body: 'pt-0',
         }) %}
-      {% endif %}
-      {% if _card.image is not empty %}
-        {% set _image_classes = _card.image.classes ?: '' %}
-        {% if not _alignment == 'center' %}
-          {% set _image_classes = _image_classes ? _image_classes ~ ' mb-3' : 'mb-3' %}
-        {% endif %}
-        {% set _card = _card|merge({image: _card.image|merge({
+      {%- endif %}
+      {%- if _card.image is not empty %}
+        {%- set _image_classes = _card.image.classes ?: '' %}
+        {%- if not _alignment == 'center' %}
+          {%- set _image_classes = _image_classes ? _image_classes ~ ' mb-3' : 'mb-3' %}
+        {%- endif %}
+        {%- set _card = _card|merge({image: _card.image|merge({
           classes: _image_classes,
         })}) %}
-      {% endif %}
-      {% set _card_layout = _card_layout|merge({ gutter: '4' }) %}
-      {% if variant == 'highlight-2-col' %}
-        {% set _card_layout = _card_layout|merge({ responsive_columns: 2 }) %}
-      {% else %}
-        {% set _card_layout = _card_layout|merge({ responsive_columns: 3 }) %}
-      {% endif %}
-    {% endif %}
-
-    {% if _card.image is empty and _card.date is empty %}
-      {% set _card = _card|merge({
+      {%- endif %}
+      {%- set _card_layout = _card_layout|merge({ gutter: '4' }) %}
+      {%- if variant == 'highlight-2-col' %}
+        {%- set _card_layout = _card_layout|merge({ responsive_columns: 2 }) %}
+      {%- else %}
+        {%- set _card_layout = _card_layout|merge({ responsive_columns: 3 }) %}
+      {%- endif %}
+    {%- endif %}
+
+    {%- if _card.image is empty and _card.date is empty %}
+      {%- set _card = _card|merge({
         horizontal: false,
       }) %}
-    {% endif %}
+    {%- endif %}
 
-    {% set _cards = _cards|merge([_card]) %}
-  {% endfor %}
+    {%- set _cards = _cards|merge([_card]) %}
+  {%- endfor %}
 {% endif %}
 
-  {% include "@oe-bcl/bcl-card-layout/card-layout.html.twig" with _card_layout|merge({ items: _cards }) only %}
+  {%- include "@oe-bcl/bcl-card-layout/card-layout.html.twig" with _card_layout|merge({ items: _cards }) only %}
 
-{% if _link is not empty %}
-  {% set _link_attributes = _link.attributes ? _link.attributes : create_attribute() %}
-  {% set _link_attributes = _link_attributes.addClass(['mt-3-5', 'd-inline-block']) %}
-  {% include '@oe-bcl/bcl-link/link.html.twig' with _link|merge({
+{%- if _link is not empty %}
+  {%- set _link_attributes = _link.attributes ? _link.attributes : create_attribute() %}
+  {%- set _link_attributes = _link_attributes.addClass(['mt-3-5', 'd-inline-block']) %}
+  {%- include '@oe-bcl/bcl-link/link.html.twig' with _link|merge({
     attributes: _link_attributes,
     icon: _link.icon|merge({
       name: 'chevron-right',
       size: 'xs',
     }),
   }) only %}
-{% endif %}
+{% endif -%}
 </div>
-
-{% endapply %}
+{#--#}

package/templates/bcl-mega-menu/mega-menu-items.html.twig

@@ -1,35 +1,32 @@
-{% apply spaceless %}
-
 {% set _label = label ?? null %}
 {% set _items = items ?? [] %}
 {% set _icon_path = icon_path ?? '' %}
 {% set _level = level ?? 1 %}
-{% set _see_all = see_all ?? null %}
+{% set _see_all = see_all ?? null -%}
 
 <ul class="bcl-mega-menu__items __level-{{ _level }}">
-  {% for _item in _items %}
-    {% set _li_attributes = _item.li_attributes ?? create_attribute() %}
-    {% if _item.items is defined and _item.items is not empty %}
-      {# This is a parent item. #}
+  {%- for _item in _items %}
+    {%- set _li_attributes = _item.li_attributes ?? create_attribute() %}
+    {%- if _item.items is defined and _item.items is not empty %}
+      {#- This is a parent item. -#}
       <li{{ _li_attributes.addClass('__parent') }}>
-        {% include '@oe-bcl/bcl-mega-menu/mega-menu-submenu.html.twig' with _item|merge({
+        {%- include '@oe-bcl/bcl-mega-menu/mega-menu-submenu.html.twig' with _item|merge({
           icon_path: _icon_path,
           level: _level + 1,
-        }) only %}
+        }) only -%}
       </li>
-    {% else %}
-      {# This is a leaf item. #}
+    {%- else %}
+      {#- This is a leaf item. -#}
       <li{{ _li_attributes.addClass('__leaf') }}>
-        {% if _item.path is empty %}
-          {# This is a nolink item. #}
+        {%- if _item.path is empty %}
+          {#- This is a nolink item. -#}
           <span{{ _item.attributes ?? '' }}>{{ _item.label }}</span>
-        {% else %}
-          {# This is a link. #}
-          {% include '@oe-bcl/bcl-link/link.html.twig' with _item only %}
-        {% endif %}
+        {%- else %}
+          {#- This is a link. #}
+          {%- include '@oe-bcl/bcl-link/link.html.twig' with _item only %}
+        {%- endif -%}
       </li>
-    {% endif %}
-  {% endfor %}
+    {%- endif %}
+  {%- endfor -%}
 </ul>
-
-{% endapply %}
+{#--#}

package/templates/bcl-mega-menu/mega-menu-submenu.html.twig

@@ -1,15 +1,13 @@
-{% apply spaceless %}
-
 {% set _items = items ?? [] %}
 {% set _trigger = trigger ?? null %}
 {% set _icon_path = icon_path ?? '' %}
 {% set _level = level ?? 2 %}
 {% set _see_all = see_all ?? null %}
 
-{% set _trigger_id = _trigger.id|default('mm-trigger-' ~ random(10000)) %}
+{%- set _trigger_id = _trigger.id|default('mm-trigger-' ~ random(10000)) %}
 {% set _panel_id = 'mm-panel-' ~ _trigger_id %}
 
-{% set _trigger_attributes = _trigger.attributes ?? create_attribute() %}
+{%- set _trigger_attributes = _trigger.attributes ?? create_attribute() %}
 {% set _trigger = _trigger|merge({
   attributes: _trigger_attributes
     .setAttribute('id', _trigger_id)
@@ -21,45 +19,49 @@
 }) %}
 {% include '@oe-bcl/bcl-button/button.html.twig' with _trigger only %}
 
-{# Add an optional "See all" link as last item. #}
+{%- set _see_all_link = null %}
+{# Prepare an optional "See all" link rendered outside the list. #}
 {% if _see_all is not empty %}
-  {# Wrap the label for an ellipsis. #}
-  {% set _see_all_label %}
+  {%- set _see_all_label -%}
     <span>{{- _see_all.label -}}</span>
-  {% endset %}
-  {% set _see_all_attr = (_see_all.attributes is defined ? _see_all.attributes : create_attribute()) %}
-  {% set _see_all = _see_all|merge({
+  {%- endset %}
+  {%- set _see_all_attr = (_see_all.attributes is defined ? _see_all.attributes : create_attribute()) %}
+  {%- set _see_all_link = _see_all|merge({
     label: _see_all_label,
     icon: {
+      size: 'xs',
       name: 'arrow-right',
       path: _icon_path,
     },
-    li_attributes: create_attribute()
-      .addClass('__see_all'),
     attributes: _see_all_attr
       .addClass(['see-all-button'])
       .setAttribute('aria-label', 'See all items in ‘' ~ _trigger.label ~ '’')
   }) %}
-  {% set _items = _items|merge([_see_all]) %}
 {% endif %}
 {% set submenu_attributes = create_attribute()
   .setAttribute('id', _panel_id)
-  .setAttribute('hidden', '')
+  .setAttribute('hidden', true)
   .setAttribute('role', 'group')
   .setAttribute('aria-labelledby', _trigger_id)
   .addClass('bcl-mega-menu__submenu', '__level-' ~ _level)
-%}
+-%}
 <div{{ submenu_attributes }}>
-  {% if _trigger %}
-  <div class="__header">
-      <p class="__label">{{ _trigger.label }}</p>
+  {%- if _trigger -%}
+  <div class="__header">{# -#}
+      <p class="__label">{{ _trigger.label }}</p>{# -#}
+  </div>
+  {%- endif %}
+  <div class="__submenu_body">
+    {%- include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with {
+      items: _items,
+      icon_path: _icon_path,
+      level: _level,
+    } only -%}
+    {%- if _see_all_link -%}
+      <div class="__see_all">
+        {% include '@oe-bcl/bcl-link/link.html.twig' with _see_all_link only %}
+      </div>
+    {%- endif -%}
   </div>
-  {% endif %}
-  {% include '@oe-bcl/bcl-mega-menu/mega-menu-items.html.twig' with {
-    items: _items,
-    icon_path: _icon_path,
-    level: _level,
-  } only %}
 </div>
-
-{% endapply %}
+{#--#}