@openeuropa/bcl-theme-joinup 1.10.9 → 1.10.11

package/templates/bcl-content-banner/content-banner.html.twig

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
     - title: (string) (default: '')
@@ -36,7 +34,7 @@
     - "action_bar" (string)
 #}
 
-{% set _title = title|default('') %}
+{%- set _title = title|default('') %}
 {% set _title_tag = title_tag|default('h1') %}
 {% set _title_link = title_link|default({}) %}
 {% set _title_attributes = title_attributes ?: create_attribute() %}
@@ -45,67 +43,72 @@
 {% set _image_size = image_size|default('md') %}
 {% set _action_bar = action_bar|default('') %}
 {% set _date = date|default({}) %}
+{%- set _action_bar_content -%}
+  {%- block action_bar -%}
+    {{ _action_bar }}
+  {%- endblock -%}
+{%- endset -%}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% set _classes = [
+{%- set _classes = [
   'bcl-content-banner',
 ] %}
 
-{% if _background != 'white' %}
-  {% set _classes = _classes|merge([
+{%- if _background != 'white' %}
+  {%- set _classes = _classes|merge([
     'pb-md-4-75',
     'pb-4',
     'pt-4',
     'pt-md-4-75',
   ]) %}
 {% else %}
-  {% set _classes = _classes|merge([
+  {%- set _classes = _classes|merge([
     'pt-4',
     'pt-md-4-75',
   ]) %}
 {% endif %}
 
-{% set _modifiers = {
+{%- set _modifiers = {
   'white': 'bg-white',
   'gray': 'bg-lighter',
 } %}
 
-{% set _body_classes = 'pt-0 px-0 pb-0' %}
+{%- set _body_classes = 'pt-0 px-0 pb-0' %}
 {% set _right_col_classes = 'col-md col-lg-9 col-xxl-8' %}
 
-{% if _image is not empty %}
-  {% set _left_col_classes = 'bcl-card-start-col' %}
-  {% set _body_classes = 'pt-4 pt-md-0 px-0 px-md-1-5 pb-0' %}
-  {% if _image_size == 'lg' %}
-    {% set _left_col_classes = _left_col_classes ~ ' bcl-size-large' %}
-    {% set _right_col_classes = 'col-md col-xl-9 col-xxl-8' %}
-  {% endif %}
-  {% if _image_size == 'xl' %}
-    {% set _left_col_classes = _left_col_classes ~ ' bcl-size-extra-large' %}
-    {% set _body_classes = 'pt-4 pt-lg-0 px-0 px-lg-1-5 pb-0' %}
-    {% set _right_col_classes = 'col-lg' %}
-  {% endif %}
+{%- if _image is not empty %}
+  {%- set _left_col_classes = 'bcl-card-start-col' %}
+  {%- set _body_classes = 'pt-4 pt-md-0 px-0 px-md-1-5 pb-0' %}
+  {%- if _image_size == 'lg' %}
+    {%- set _left_col_classes = _left_col_classes ~ ' bcl-size-large' %}
+    {%- set _right_col_classes = 'col-md col-xl-9 col-xxl-8' %}
+  {%- endif %}
+  {%- if _image_size == 'xl' %}
+    {%- set _left_col_classes = _left_col_classes ~ ' bcl-size-extra-large' %}
+    {%- set _body_classes = 'pt-4 pt-lg-0 px-0 px-lg-1-5 pb-0' %}
+    {%- set _right_col_classes = 'col-lg' %}
+  {%- endif %}
 {% endif %}
 {% if _date is not empty %}
-  {% set _left_col_classes = 'bcl-card-start-col' %}
-  {% set _right_col_classes = 'col-12 col-md col-xxl-9' %}
-  {% if _image is empty %}
-    {% set _body_classes = 'pt-4 pt-md-0 px-0 px-md-1-5 pb-0' %}
-  {% endif %}
+  {%- set _left_col_classes = 'bcl-card-start-col' %}
+  {%- set _right_col_classes = 'col-12 col-md col-xxl-9' %}
+  {%- if _image is empty %}
+    {%- set _body_classes = 'pt-4 pt-md-0 px-0 px-md-1-5 pb-0' %}
+  {%- endif %}
 {% endif %}
 {% if _image is empty and _date is empty %}
-  {% set _right_col_classes = 'col-lg-10 col-xl-9 col-xxl-8' %}
+  {%- set _right_col_classes = 'col-lg-10 col-xl-9 col-xxl-8' %}
 {% endif %}
 
-{% set _horizontal_classes = {
+{%- set _horizontal_classes = {
   left_col_classes: _left_col_classes,
   right_col_classes: _right_col_classes,
 } %}
 
-{% set _card = {
+{%- set _card = {
   title: _title,
   title_tag: _title_tag,
   title_link: _title_link,
@@ -117,23 +120,23 @@
   attributes: create_attribute().addClass(['bg-transparent', 'border-0']),
 } %}
 
-{% set _classes = _classes|merge([_modifiers[_background]]) %}
+{%- set _classes = _classes|merge([_modifiers[_background]]) %}
 {% set attributes = attributes.addClass(_classes) %}
 
-{% if _button is not empty %}
-  {% set _card =  _card|merge({
+{%- if _button is not empty %}
+  {%- set _card =  _card|merge({
     attributes: _card.attributes.addClass(['col-md-10']),
   }) %}
-{% endif %}
+{% endif -%}
 
-<div {{ attributes }}>
+<div {{ attributes }}>{# -#}
   <div class="container">
-  {% include '@oe-bcl/bcl-card/card.html.twig' with _card %}
-
-  {%- block action_bar -%}
-    {{ _action_bar }}
-  {%- endblock -%}
-  </div>
+  {%- include '@oe-bcl/bcl-card/card.html.twig' with _card %}
+    {%- if _action_bar_content|trim is not empty -%}
+      <div class="position-relative z-1">{# -#}
+        {{- _action_bar_content -}}
+      </div>{# -#}
+    {%- endif -%}
+  </div>{# -#}
 </div>
-
-{% endapply %}
+{#--#}

package/templates/bcl-date-block/date-block.html.twig

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
     - day (integer) (default: '')
@@ -12,7 +10,7 @@
     - icon_path (string) (default: '')
 #}
 
-{% set _day = day|default('') %}
+{%- set _day = day|default('') %}
 {% set _month = month|default('') %}
 {% set _date_time = date_time|default('') %}
 {% set _year = year|default('') %}
@@ -21,7 +19,7 @@
 {% set _end_year = end_year|default('') %}
 {% set _icon_path = icon_path|default('') %}
 
-{% set _classes = [
+{%- set _classes = [
   'bcl-date-block',
   'bg-date',
   'rounded',
@@ -33,48 +31,47 @@
   'ratio-1x1'
 ] %}
 
-{% 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) %}
 
-{% if _date_time is not empty %}
-  {% set attributes = attributes.setAttribute('datetime', _date_time) %}
-{% endif %}
+{%- if _date_time is not empty %}
+  {%- set attributes = attributes.setAttribute('datetime', _date_time) %}
+{% endif -%}
 
-<time {{ attributes }}>
-  <div class="d-flex flex-column pt-2">
-    <div class="d-flex align-item-center bg-white border border-bottom-0 w-100 h-100 text-uppercase justify-content-center gap-2">
-      <div class="d-flex flex-column align-item-center justify-content-center">
-        <div class="date-month lh-1">{{- _month -}}</div>
-        <div class="date-day fw-bold fs-4 lh-1">{{- _day -}}</div>
+<time {{ attributes }}>{# -#}
+  <div class="d-flex flex-column pt-2">{# -#}
+    <div class="d-flex align-item-center bg-white border border-bottom-0 w-100 h-100 text-uppercase justify-content-center gap-2">{# -#}
+      <div class="d-flex flex-column align-item-center justify-content-center">{# -#}
+        <div class="date-month lh-1">{{- _month -}}</div>{# -#}
+        <div class="date-day fw-bold fs-4 lh-1">{{- _day -}}</div>{# -#}
       </div>
-      {% if _end_day or _end_month %}
+      {%- if _end_day or _end_month -%}
         <div class="d-flex flex-column align-item-center justify-content-center">
           {%- include '@oe-bcl/bcl-icon/icon.html.twig' with {
             name: "chevron-right",
             size: "xs",
             path: _icon_path,
           } only -%}
-        </div>
+        </div>{# -#}
         <div class="d-flex flex-column align-item-center justify-content-center">
-          {%- if _end_month is not empty %}
+          {%- if _end_month is not empty -%}
             <div class="date-month lh-1">{{- _end_month -}}</div>
-          {% endif -%}
-          {%- if _end_day is not empty %}
+          {%- endif -%}
+          {%- if _end_day is not empty -%}
             <div class="date-day fw-bold fs-4 lh-1">{{- _end_day -}}</div>
-          {% endif -%}
+          {%- endif -%}
         </div>
-      {% endif %}
-    </div>
-    <div class="bg-lighter border w-100 rounded-bottom py-1 d-flex gap-4 justify-content-center">
+      {%- endif -%}
+    </div>{# -#}
+    <div class="bg-lighter border w-100 rounded-bottom py-1 d-flex gap-4 justify-content-center">{# -#}
       <div class="date-year year-start">{{- _year -}}</div>
       {%- if _end_year is not empty -%}
         <div class="date-year year-end">{{ _end_year }}</div>
       {%- endif -%}
-    </div>
-  </div>
+    </div>{# -#}
+  </div>{# -#}
 </time>
-
-{% endapply %}
+{#--#}

package/templates/bcl-description-list/description-list-details.html.twig

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - button: (button object) (default: {})
@@ -11,10 +9,10 @@
   - definition
 #}
 
-{% set _button = button|default({}) %}
+{%- set _button = button|default({}) %}
 {% set _link = link|default({}) %}
 {% set _icon = icon|default({}) %}
-{% set _label = label|default('') %}
+{% set _label = label|default('') -%}
 
 
 <dd>
@@ -22,12 +20,12 @@
   {%- if _button is not empty -%}
     {% include '@oe-bcl/bcl-button/button.html.twig' with _button only %}
   {%- elseif _link is not empty %}
-    {% include '@oe-bcl/bcl-link/link.html.twig' with _link only -%}
+    {%- include '@oe-bcl/bcl-link/link.html.twig' with _link only -%}
   {%- else -%}
     {%- if _icon is not empty -%}
       {%- set _icon_classes = ["me-2", "align-self-center", "flex-shrink-0"] -%}
       {% set _icon_attributes = _icon.attributes ?: create_attribute() %}
-      {% set _icon_attributes = _icon_attributes.addClass(_icon_classes) %}
+      {%- set _icon_attributes = _icon_attributes.addClass(_icon_classes) %}
       {%- include '@oe-bcl/bcl-icon/icon.html.twig' with _icon|merge({
         attributes: _icon_attributes,
       }) only -%}
@@ -38,7 +36,6 @@
       <div>{{- _label -}}</div>
     {%- endif -%}
   {%- endif -%}
-{% endblock %}
+{% endblock -%}
 </dd>
-
-{% endapply %}
+{#--#}

package/templates/bcl-description-list/description-list-title.html.twig

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - icon: (icon object) (default: {})
@@ -8,26 +6,25 @@
   - label: (string) (default: '')
 #}
 
-{% set _icon = icon|default({}) %}
+{%- set _icon = icon|default({}) %}
 {% set _color = color|default('') %}
-{% set _label = label|default('') %}
+{% set _label = label|default('') -%}
 
-<dt>
+<dt>{# -#}
   <div class="d-flex">
   {%- if _icon is not empty -%}
     {% set _icon_classes = ["me-2", "align-self-center", "flex-shrink-0"] %}
-    {% set _icon_attributes = _icon.attributes ?: create_attribute() %}
-    {% set _icon_attributes = _icon_attributes.addClass(_icon_classes) %}
-    {% include '@oe-bcl/bcl-icon/icon.html.twig' with _icon|merge({
+    {%- set _icon_attributes = _icon.attributes ?: create_attribute() %}
+    {%- set _icon_attributes = _icon_attributes.addClass(_icon_classes) %}
+    {%- include '@oe-bcl/bcl-icon/icon.html.twig' with _icon|merge({
       attributes: _icon_attributes,
     }) only %}
   {%- elseif _color is not empty -%}
-    <div class="align-self-center">
-      <span class="p-2 me-2 d-inline-block rounded-1 {{ _color }}"></span>
+    <div class="align-self-center">{# -#}
+      <span class="p-2 me-2 d-inline-block rounded-1 {{ _color }}"></span>{# -#}
     </div>
   {%- endif -%}
-    <div>{{- _label -}}</div>
-  </div>
+    <div>{{- _label -}}</div>{# -#}
+  </div>{# -#}
 </dt>
-
-{% endapply %}
+{#--#}

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

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - title: (string) (default: '')
@@ -15,11 +13,11 @@
       },
       ...
     ]
-  - variant (string) (default: '') 
+  - variant (string) (default: '')
     - option: ['horizontal']
 #}
 
-{% 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() %}
@@ -28,22 +26,22 @@
 {% set _items = items|default([]) %}
 {% set _variant = variant|default('') %}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% set _item_classes = ['mb-3'] %}
+{%- set _item_classes = ['mb-3'] %}
 
-{% if _bordered %}
-  {% set _item_classes = ['border-bottom', 'pb-2-5', 'mb-2-5'] %}
+{%- if _bordered %}
+  {%- set _item_classes = ['border-bottom', 'pb-2-5', 'mb-2-5'] %}
 {% endif %}
 
-{% if _variant == 'horizontal' %}
-  {% set _item_classes = _item_classes|merge(['row']) %}
+{%- if _variant == 'horizontal' %}
+  {%- set _item_classes = _item_classes|merge(['row']) %}
 {% endif %}
 
-{% 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,
@@ -51,71 +49,69 @@
   } only %}
 {% endif %}
 
-{% set attributes = attributes.addClass(['bcl-description-list']) %}
+{%- set attributes = attributes.addClass(['bcl-description-list']) %}
 
-{% if _variant != 'horizontal' %}
+{%- if _variant != 'horizontal' -%}
 <dl
   {{ attributes }}
 >
-{% else %}
+{%- else -%}
 <div
   {{ attributes }}
 >
-{% endif %}
-  {% for _item in _items %}
-  {% if _variant == 'horizontal' %}
+{%- endif %}
+  {%- for _item in _items %}
+  {%- if _variant == 'horizontal' -%}
   <dl
     {{ create_attribute().addClass(_item_classes) }}
   >
-  {% else %}
+  {%- else -%}
   <div
     {{ create_attribute().addClass(_item_classes) }}
   >
-  {% endif %}
-  {% if _item.term is not empty %}
-    {% if _variant == 'horizontal' %}
+  {%- endif %}
+  {%- if _item.term is not empty %}
+    {%- if _variant == 'horizontal' -%}
     <div class="{{ _col_classes }}">
-    {% endif %}
-    {% if _item.term is iterable %}
-      {% for _term in _item.term %}
+    {%- endif %}
+    {%- if _item.term is iterable %}
+      {%- for _term in _item.term %}
         {%- include '@oe-bcl/bcl-description-list/description-list-title.html.twig' with _term only -%}
       {% endfor %}
-    {% else %}
+    {%- else %}
       {%- include '@oe-bcl/bcl-description-list/description-list-title.html.twig' with {
         label: _item.term
       } only -%}
     {% endif %}
-    {% if _variant == 'horizontal' %}
+    {%- if _variant == 'horizontal' -%}
     </div>
-    {% endif %}
-  {% endif %}
-  {% if _item.definition is not empty %}
-    {% if _variant == 'horizontal' %}
+    {%- endif %}
+  {%- endif %}
+  {%- if _item.definition is not empty %}
+    {%- if _variant == 'horizontal' -%}
     <div class="col">
-    {% endif %}
-    {% if _item.definition is iterable %}
-      {% for _definition in _item.definition %}
+    {%- endif %}
+    {%- if _item.definition is iterable %}
+      {%- for _definition in _item.definition %}
         {%- include '@oe-bcl/bcl-description-list/description-list-details.html.twig' with _definition only -%}
       {% endfor %}
-    {% else %}
+    {%- else %}
       {%- include '@oe-bcl/bcl-description-list/description-list-details.html.twig' with {
         label: _item.definition
       } only -%}
     {% endif %}
-    {% if _variant == 'horizontal' %}
+    {%- if _variant == 'horizontal' -%}
     </div>
-    {% endif %}
-  {% endif %}
-  {% if _variant == 'horizontal' %}
+    {%- endif %}
+  {%- endif %}
+  {%- if _variant == 'horizontal' -%}
   </dl>
-  {% else %}
+  {%- else -%}
   </div>
-  {% endif %}
-  {% endfor %}
-{% if _variant != 'horizontal' %}
+  {%- endif %}
+  {%- endfor %}
+{% if _variant != 'horizontal' -%}
 </dl>
-{% else %}
+{%- else -%}
 </div>
-{% endif %}
-
-{% endapply %}
+{%- endif -%}

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

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - id (string) (default: dropdown-random(10000))
   - trigger (link or button)
@@ -35,7 +33,7 @@
   - attributes (drupal attrs)
 #}
 
-{% set _id = id|default('dropdown-' ~ random(1000)) %}
+{%- set _id = id|default('dropdown-' ~ random(1000)) %}
 {% set _trigger = trigger|default({}) %}
 {% set _link = link ?? false %}
 {% set _direction = direction|default('') %}
@@ -45,27 +43,27 @@
 {% set _inside_navigation = inside_navigation ?? false %}
 {% set _items = items|default([]) %}
 
-{% set _class = 'dropdown' %}
+{%- set _class = 'dropdown' %}
 {% set _dropdown_classes = ['dropdown-menu'] %}
 
-{% if _dark %}
-  {% set _dropdown_classes = _dropdown_classes|merge(['dropdown-menu-dark']) %}
+{%- if _dark %}
+  {%- set _dropdown_classes = _dropdown_classes|merge(['dropdown-menu-dark']) %}
 {% endif %}
 {% if _alignment %}
-  {% set _dropdown_classes = _dropdown_classes|merge([_alignment]) %}
+  {%- set _dropdown_classes = _dropdown_classes|merge([_alignment]) %}
 {% endif %}
 {% if _direction %}
-  {% set _class = _class ~ ' ' ~ _direction %}
+  {%- set _class = _class ~ ' ' ~ _direction %}
 {% endif %}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% set attributes = attributes.setAttribute('aria-labelledby', _id).addClass(_dropdown_classes) %}
+{%- set attributes = attributes.setAttribute('aria-labelledby', _id).addClass(_dropdown_classes) %}
 
-{% if _trigger.attributes is empty %}
-  {% set _trigger = _trigger|merge({
+{%- if _trigger.attributes is empty %}
+  {%- set _trigger = _trigger|merge({
     attributes: create_attribute()
   }) %}
 {% endif %}
@@ -76,60 +74,58 @@
                       .setAttribute('id', _id)
 }) %}
 
-{% if not _inside_navigation %}
-  {% if _link %}
-    {% set _trigger = _trigger|merge({
-      attributes: _trigger.attributes.setAttribute('role', 'button') 
+{%- if not _inside_navigation %}
+  {%- if _link %}
+    {%- set _trigger = _trigger|merge({
+      attributes: _trigger.attributes.setAttribute('role', 'button')
     }) %}
-  {% else %}
-    {% set _trigger = _trigger|merge({
-      attributes: _trigger.attributes.setAttribute('autocomplete', 'off') 
+  {%- else %}
+    {%- set _trigger = _trigger|merge({
+      attributes: _trigger.attributes.setAttribute('autocomplete', 'off')
     }) %}
-  {% endif %}
+  {%- endif %}
 {% else %}
-  {% set attributes = attributes.setAttribute('aria-hidden', 'true').setAttribute('role', 'presentation') %}
+  {%- set attributes = attributes.setAttribute('aria-hidden', 'true').setAttribute('role', 'presentation') %}
 {% endif %}
 
-{% if not _remove_wrapper %}
+{%- if not _remove_wrapper -%}
 <div class="{{ _class }}">
-{% endif %}
-  {% if _link %}
-    {% include '@oe-bcl/bcl-link/link.html.twig' with _trigger only %}
-  {% else %}
-    {% include '@oe-bcl/bcl-button/button.html.twig' with _trigger only %}
-  {% endif %}
+{%- endif %}
+  {%- if _link %}
+    {%- include '@oe-bcl/bcl-link/link.html.twig' with _trigger only %}
+  {%- else %}
+    {%- include '@oe-bcl/bcl-button/button.html.twig' with _trigger only %}
+  {%- endif -%}
   <ul
     {{ attributes }}
   >
-    {% if _items is not empty and _items is iterable %}
-      {% for _item in _items %}
-        {% if _item.attributes is empty %}
-          {% set _item = _item|merge({
+    {%- if _items is not empty and _items is iterable %}
+      {%- for _item in _items %}
+        {%- if _item.attributes is empty %}
+          {%- set _item = _item|merge({
             attributes: create_attribute()
           }) %}
-        {% endif %}
-        {% set _item_classes = ['dropdown-item'] %}
-        {% if _item.active %}
-          {% set _item_classes = _item_classes|merge(['active']) %}
-        {% endif %}
-        {% set _item = _item|merge({
+        {%- endif %}
+        {%- set _item_classes = ['dropdown-item'] %}
+        {%- if _item.active %}
+          {%- set _item_classes = _item_classes|merge(['active']) %}
+        {%- endif %}
+        {%- set _item = _item|merge({
           clean_class: true,
           attributes: _item.attributes.addClass(_item_classes)
-        }) %}
+        }) -%}
         <li>
-        {% if _item.divider is defined %}
+        {%- if _item.divider is defined -%}
           <hr class="dropdown-divider">
-        {% elseif _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 %}
+        {%- elseif _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 -%}
         </li>
-      {% endfor %}
-    {% endif %}
+      {%- endfor %}
+    {%- endif -%}
   </ul>
-{% if not _remove_wrapper %}
+{%- if not _remove_wrapper -%}
 </div>
-{% endif %}
-
-{% endapply %}
+{%- endif -%}