@openeuropa/bcl-theme-joinup 1.10.7 → 1.10.8

package/package.json

@@ -2,7 +2,7 @@
   "name": "@openeuropa/bcl-theme-joinup",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "1.10.7",
+  "version": "1.10.8",
   "description": "OE - BCL theme joinup",
   "scripts": {
     "align-templates": "lerna --scope \"@openeuropa/bcl-twig-templates\" run prepublish",
@@ -20,23 +20,23 @@
     "update:templates": "npm-run-all -s align-templates build:copy"
   },
   "devDependencies": {
-    "@babel/core": "7.27.4",
-    "@babel/plugin-transform-runtime": "7.27.4",
-    "@babel/preset-env": "7.27.2",
+    "@babel/core": "7.28.4",
+    "@babel/plugin-transform-runtime": "7.28.3",
+    "@babel/preset-env": "7.28.3",
     "@babel/preset-react": "7.27.1",
     "@ecl/resources-ec-logo": "3.7.1",
     "@ecl/resources-eu-logo": "3.7.1",
     "@ecl/resources-flag-icons": "3.7.1",
-    "@fontsource/roboto": "5.1.1",
-    "@openeuropa/bcl-bootstrap": "^1.10.7",
-    "@openeuropa/bcl-builder": "^1.10.7",
-    "@openeuropa/bcl-theme-default": "^1.10.7",
-    "@openeuropa/bcl-twig-templates": "^1.10.7",
+    "@fontsource/roboto": "5.2.8",
+    "@openeuropa/bcl-bootstrap": "^1.10.8",
+    "@openeuropa/bcl-builder": "^1.10.8",
+    "@openeuropa/bcl-theme-default": "^1.10.8",
+    "@openeuropa/bcl-twig-templates": "^1.10.8",
     "@rollup/plugin-replace": "6.0.2",
     "copyfiles": "2.4.1",
-    "cross-env": "7.0.3",
+    "cross-env": "10.1.0",
     "flag-icons": "6.9.2",
-    "glob": "11.0.1",
+    "glob": "11.0.3",
     "npm-run-all": "4.1.5",
     "slim-select": "1.27.1"
   },
@@ -57,5 +57,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "5f7e5c2fd90eceb81c0ffcf52dcf8e3921c3acae"
+  "gitHead": "9c2e64443ae179948cbf748c41d438af7a0f2421"
 }

package/src/scss/oe-bcl-joinup.scss

@@ -90,11 +90,12 @@
 @import "@openeuropa/bcl-theme-default/src/scss/carousel";
 @import "@openeuropa/bcl-theme-default/src/scss/gallery";
 @import "@openeuropa/bcl-theme-default/src/scss/pagination";
+@import "@openeuropa/bcl-theme-default/src/scss/inpage-navigation";
+@import "@openeuropa/bcl-theme-default/src/scss/language-list";
+@import "@openeuropa/bcl-theme-default/src/scss/pagination-v2";
 
 // JoinUp Custom styles
 @import "@openeuropa/bcl-theme-joinup/src/scss/badges";
 @import "@openeuropa/bcl-theme-joinup/src/scss/buttons";
 @import "@openeuropa/bcl-theme-joinup/src/scss/form";
 @import "@openeuropa/bcl-theme-joinup/src/scss/pagination";
-@import "@openeuropa/bcl-theme-default/src/scss/inpage-navigation";
-@import "@openeuropa/bcl-theme-default/src/scss/language-list";

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

@@ -8,20 +8,16 @@
   - pagination (object) (default: {})
   - sidebar (object) (default: '')
 #}
+{% extends "@oe-bcl/bcl-base-templates/content-type.html.twig" -%}
 
-{% extends "@oe-bcl/bcl-base-templates/content-type.html.twig" %}
-
-{% set _title = title|default('') %}
-{% set _title_tag = title_tag|default('h2') %}
-{% set _title_link = title_link|default({}) %}
-{% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _listing = listing|default({}) %}
-{% set _pagination = pagination|default({}) %}
-{% set _sidebar = sidebar|default({}) %}
-
-{% set _title_attributes = _title_attributes ?: create_attribute() %}
 
-{% block content_top %}
+{%- block content_top %}
+  {% set _title = title|default('') %}
+  {% set _title_tag = title_tag|default('h2') %}
+  {% set _title_link = title_link|default({}) %}
+  {% set _title_attributes = title_attributes ?: create_attribute() %}
+  {% set _title_attributes = _title_attributes ?: create_attribute() %}
 {% if filter_button %}
   {% include '@oe-bcl/bcl-button/button.html.twig' with filter_button only %}
 {% endif %}
@@ -29,7 +25,7 @@
     <div class="col-md-6 col-lg-8 align-self-center">
       {% if _title is not empty %}
         {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
-          title: _title ~ ' (' ~ listing.items.length ~ ')',
+          title: _title ~ ' (' ~ (_listing.items|length) ~ ')',
           title_tag: _title_tag,
           title_link: _title_link,
           attributes: _title_attributes.addClass(['mb-0', 'text-capitalize']),
@@ -54,21 +50,23 @@
     </div>
   </div>
   <hr class="d-none d-md-block mb-4-75"/>
-{% endblock %}
+{%- endblock -%}
 
-{% block content %}
+{%- block content %}
   {% if _listing is not empty %}
     {% include '@oe-bcl/bcl-listing/listing.html.twig' with  _listing only %}
   {% endif %}
-{% endblock %}
+{%- endblock -%}
 
-{% block content_bottom %}
+{%- block content_bottom %}
+  {% set _pagination = pagination|default({}) %}
   {% if _pagination is not empty %}
     <hr class="d-none d-md-block mt-4-5">
     {% include '@oe-bcl/bcl-pagination/pagination.html.twig' with _pagination only %}
   {% endif %}
-{% endblock %}
+{%- endblock -%}
 
-{% block sidebar %}
+{%- block sidebar %}
+  {% set _sidebar = sidebar|default({}) %}
   {% include '@oe-bcl/bcl-base-templates/sidebar-search.html.twig' with _sidebar only %}
-{% endblock %}
+{%- endblock -%}

package/templates/bcl-contact-form/contact-form.html.twig

@@ -1,5 +1,5 @@
-{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' %}
+{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' -%}
 
-{% block content %}
+{%- block content %}
   {% include '@oe-bcl/bcl-form/form.html.twig' with form only %}
-{% endblock %}
+{%- endblock -%}

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

@@ -92,6 +92,9 @@
 {% 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 %}
 {% endif %}
 {% if _image is empty and _date is empty %}
   {% set _right_col_classes = 'col-lg-10 col-xl-9 col-xxl-8' %}

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

@@ -42,6 +42,7 @@
 {% set _alignment = alignment|default('') %}
 {% set _dark = dark ?? false %}
 {% set _remove_wrapper = remove_wrapper ?? false %}
+{% set _inside_navigation = inside_navigation ?? false %}
 {% set _items = items|default([]) %}
 
 {% set _class = 'dropdown' %}
@@ -75,14 +76,18 @@
                       .setAttribute('id', _id)
 }) %}
 
-{% 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') 
+    }) %}
+  {% endif %}
 {% else %}
-  {% set _trigger = _trigger|merge({
-    attributes: _trigger.attributes.setAttribute('autocomplete', 'off') 
-  }) %}
+  {% set attributes = attributes.setAttribute('aria-hidden', 'true').setAttribute('role', 'presentation') %}
 {% endif %}
 
 {% if not _remove_wrapper %}

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

@@ -1,10 +1,10 @@
-{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' %}
+{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' -%}
 
-{% block sidebar %}
+{%- block sidebar %}
   {% include '@oe-bcl/bcl-inpage-navigation/inpage-navigation.html.twig' with sidebar only %}
-{% endblock %}
+{%- endblock -%}
 
-{% block content %}
+{%- block content %}
   {% include '@oe-bcl/bcl-description-list/description-list.html.twig' with details_list only %}
 
   <h2 id="item-1" class="my-4">Description</h2>
@@ -21,4 +21,4 @@
   <h2 id="item-2" class="my-4">Related documents</h2>
   {% include '@oe-bcl/bcl-file/file.html.twig' with files[0] only %}
   {% include '@oe-bcl/bcl-file/file.html.twig' with files[1] only %}
-{% endblock %}
+{%- endblock -%}

package/templates/bcl-glossary/glossary-detail.html.twig

@@ -1,6 +1,6 @@
-{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' %}
+{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' -%}
 
-{% block  content %}
+{%- block  content %}
 	{% include  '@oe-bcl/bcl-heading/heading.html.twig' with {
 		title: 'Description',
 		title_tag: 'h2',
@@ -38,6 +38,5 @@
     <div {{ file_classes ? 'class="' ~ file_classes ~ '"' }}>
       {% include '@oe-bcl/bcl-file/file.html.twig' with file only %}
     </div>
-  {% endfor %}
-
-{% endblock %}
+	{% endfor %}
+{%- endblock -%}

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

@@ -1,6 +1,6 @@
-{% extends '@oe-bcl/bcl-base-templates/listing-page.html.twig' %}
+{% extends '@oe-bcl/bcl-base-templates/listing-page.html.twig' -%}
 
-{% block content_row %}
+{%- block content_row %}
 		{% include '@oe-bcl/bcl-pagination/pagination.html.twig' with glossary only %}
 	<div class="col-12">
 	  <div class="d-md-flex justify-content-end mb-md-4-75 align-items-center border-bottom-md border-top-md border-gray-300 py-3">
@@ -8,12 +8,12 @@
 	    {% include '@oe-bcl/bcl-select/select.html.twig' with itemsPerPage only %}
 	  </div>
   </div>
-{% endblock %}
+{%- endblock -%}
 
-{% block content_top %}
+{%- block content_top %}
 	{% include '@oe-bcl/bcl-heading/heading.html.twig' with {
 	  title: 'Starting with "A" (48)',
 	  title_tag: 'h2',
 	} only %}
 
-{% endblock %}
+{%- endblock -%}

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

@@ -1,6 +1,6 @@
-{% extends "@oe-bcl/bcl-base-templates/content-type.html.twig" %}
+{% extends "@oe-bcl/bcl-base-templates/content-type.html.twig" -%}
 
-{% block banner %}
+{%- block banner %}
 <div class="container">
   {% if banner is not empty %}
   <div class="mt-4 mt-md-5">
@@ -70,9 +70,9 @@
   </div>
   {% endif %}
 </div>
-{% endblock %}
+{%- endblock -%}
 
-{% block content %}
+{%- block content %}
   {% if recent is not empty and members is not empty %}
   <div class="row mt-3">
     <div class="col-md-8">
@@ -98,4 +98,4 @@
       {% include '@oe-bcl/bcl-listing/listing.html.twig' with contributions.listing only %}
     {% endif %}
   {% endif %}
-{% endblock %}
+{%- endblock -%}

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

@@ -1,6 +1,6 @@
-{% extends "@oe-bcl/bcl-base-templates/listing-page.html.twig" %}
+{% extends "@oe-bcl/bcl-base-templates/listing-page.html.twig" -%}
 
-{% block banner %}
+{%- block banner %}
 <div class="container mt-4 mt-md-5">
   <div class="col-xxl-11">
     <div class="p-md-3-5 pt-3 bg-lighter d-md-flex n-mx-container">
@@ -24,4 +24,4 @@
   {% endif %}
   </div>
 </div>
-{% endblock %}
+{%- endblock -%}

package/templates/bcl-landing-page/landing-page.html.twig

@@ -1,13 +1,11 @@
-{% extends "@oe-bcl/bcl-base-templates/content-type.html.twig" %}
+{% extends "@oe-bcl/bcl-base-templates/content-type.html.twig" -%}
 
-{% block banner %}
+{%- block banner %}
   {% if banner is defined %}
     {% include '@oe-bcl/bcl-banner/banner.html.twig' with banner only %}
   {% endif %}
-{% endblock %}
-
-{% block content %}
-
+{%- endblock -%}
+{%- block content %}
 <div class="container">
   {% if featured_section is defined %}
     <div class="my-4">
@@ -55,5 +53,4 @@
     </div>
   {% endif %}
 </div>
-
-{% endblock %}
+{%- endblock -%}

package/templates/bcl-language-list/language-list-modal.html.twig

@@ -19,7 +19,7 @@
 {% block header %}
   {% if size == 'fullscreen' %}
   <div class="container">
-    {% if variant == 'eu' or variant == 'ec' %}
+    {% if _variant == 'eu' or _variant == 'ec' %}
     <div class="border-bottom mx-n3 px-3 px-md-0 pt-md-4-5">
       <div class="py-3-5 px-3 px-sm-0 px-md-3">
     {% endif %}
@@ -43,7 +43,7 @@
   ></button>
   {% if size == 'fullscreen' %}
     </div>
-    {% if variant == 'eu' or variant == 'ec' %}
+    {% if _variant == 'eu' or _variant == 'ec' %}
       </div>
     </div>
     {% endif %}
@@ -52,7 +52,60 @@
 {% endblock %}
 
 {% block body %}
-  {% include '@oe-bcl/bcl-language-list/language-list.html.twig' with {
-    attributes: create_attribute()
-  } %}
+  {% set attributes = create_attribute().addClass(['bcl-language-list', 'bcl-language-list--' ~ _variant]) %}
+  <div
+    {{ attributes }}
+  >
+    {% if _logo is not empty %}
+    <div class="container">
+      {% if _title is empty %}
+      <div class="text-center">
+      {% endif %}
+      <div class="d-inline-flex align-items-center">
+        <img
+          {% if _logo.path is not empty %}
+          src="{{ _logo.path }}"
+          {% endif %}
+          {% if _logo.alt is not empty %}
+          alt="{{ _logo.alt }}"
+          {% endif %}
+          {% if _logo.class is not empty %}
+          class="{{ _logo.class }}"
+          {% endif %}
+        />
+        {% if _title is not empty %}
+        <h5 class="h5 ms-4">{{ _title }}</h5>
+        {% endif %}
+      </div>
+      {% if _title is empty %}
+      </div>
+      {% endif %}
+    </div>
+    {% endif %}
+
+    {% if _items is not empty or _non_eu_items is not empty %}
+    <div class="main pt-4">
+      {% if not (_variant == 'neutral' and _inside_container) %}
+      <div class="container">
+      {% endif %}
+      {% if _items is not empty and _items is iterable %}
+        {% include '@oe-bcl/bcl-language-list/language-list-grid.html.twig' with {
+            items: _items,
+            icon_path: _icon_path,
+            category: eu_category,
+        } only %}
+      {% endif %}
+      {% if _non_eu_items is not empty and _non_eu_items is iterable %}
+        {% include '@oe-bcl/bcl-language-list/language-list-grid.html.twig' with {
+            items: _non_eu_items,
+            icon_path: _icon_path,
+            category: non_eu_category,
+        } only %}
+      {% endif %}
+      {% if not (_variant == 'neutral' and _inside_container) %}
+      </div>
+      {% endif %}
+    </div>
+    {% endif %}
+  </div>
 {% endblock %}

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

@@ -14,7 +14,10 @@
   - body (block) (default: '')
   - footer (block) (default: '')
   - attributes (drupal attrs)
-  
+  - header_attributes (drupal attrs)
+  - body_attributes (drupal attrs)
+  - footer_attributes (drupal attrs)
+
   Blocks
     - header
     - messages
@@ -29,9 +32,12 @@
 {% set _verticaly_centered = verticaly_centered ?? false %}
 {% set _scrollable = scrollable ?? false %}
 {% set _header = header|default('') %}
+{% set _header_attributes = header_attributes ?: create_attribute() %}
 {% set _messages = messages|default('') %}
 {% set _body = body|default('') %}
+{% set _body_attributes = body_attributes ?: create_attribute() %}
 {% set _footer = footer|default('') %}
+{% set _footer_attributes = footer_attributes ?: create_attribute() %}
 
 {% set _classes = ['modal', 'fade'] %}
 
@@ -62,16 +68,22 @@
   >
     <div class="modal-content">
       {% if header is not empty %}
-      <div class="modal-header">
+      <div
+        {{- _header_attributes.addClass(['modal-header']) -}}
+      >
         {%- block header _header -%}
       </div>
       {% endif %}
       {%- block messages _messages -%}
-      <div class="modal-body">
+      <div
+          {{- _body_attributes.addClass(['modal-body']) -}}
+      >
         {%- block body _body -%}
       </div>
       {% if footer is not empty %}
-      <div class="modal-footer">
+      <div
+          {{- _footer_attributes.addClass(['modal-footer']) -}}
+      >
         {%- block footer _footer -%}
       </div>
       {% endif %}

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

@@ -121,6 +121,14 @@
           %}
         {% endif %}
         {% if _item.dropdown is defined %}
+            {% if _tabs %}
+              {% set _item = _item|merge({
+                inside_navigation: true,
+                trigger: _item.trigger|merge({
+                  attributes: _item.trigger.attributes.setAttribute("role", "tab"),
+                }),
+              }) %}
+            {% endif %}
           {% include '@oe-bcl/bcl-dropdown/dropdown.html.twig' with _item only %}
         {% elseif _item.button is defined %}
           {% include '@oe-bcl/bcl-button/button.html.twig' with _item only %}

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

@@ -1,10 +1,10 @@
-{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' %}
+{% extends '@oe-bcl/bcl-base-templates/content-type.html.twig' -%}
 
-{% block sidebar %}
+{%- block sidebar %}
   {% include '@oe-bcl/bcl-inpage-navigation/inpage-navigation.html.twig' with sidebar only %}
-{% endblock %}
+{%- endblock -%}
 
-{% block content %}
+{%- block content %}
   <p id="content">{{ get_dummy_text(6) }}
   </p>
   <h2 id="item-1" class="my-4">Section 1</h2>
@@ -42,4 +42,4 @@
 
   {% include '@oe-bcl/bcl-file/file.html.twig' with files[0] only %}
   {% include '@oe-bcl/bcl-file/file.html.twig' with files[1] only %}
-{% endblock %}
+{%- endblock -%}

package/templates/bcl-pagination-v2/pagination-item.html.twig

@@ -0,0 +1,90 @@
+{% apply spaceless %}
+
+{# Parameters:
+  - path (string) (default: '')
+  - label (string) (default: '')
+  - disabled (boolean) (default: false)
+  - active (boolean) (default: false)
+  - icon (icon object) (default: {})
+  - attributes (drupal attrs)
+#}
+
+{% set _path = path|default('') %}
+{% set _label = label|default('') %}
+{% set _disabled = disabled ?? false %}
+{% set _active = active ?? false %}
+{% set _aria_label = aria_label|default('') %}
+{% set _icon = icon|default({}) %}
+{% set _icon_path = icon_path|default('') %}
+{% set _icon_name = icon_name|default('') %}
+{% set _icon_html = icon_html|default('') %}
+{% set _icon_position = icon_position|default('after') %}
+{% set _current_mobile_label = current_mobile_label|default('') %}
+{% set _classes = ['page-link'] %}
+
+{% if _icon_path is not empty and _icon is empty %}
+  {% if _icon_name is not empty %}
+    {% set _icon = _icon|merge({
+      name: _icon_name,
+      path: _icon_path,
+      size: "fluid"
+    }) %}
+    {% set _label = "" %}
+  {% endif %}
+{% else %}
+  {% if _icon_html is not empty %}
+    {% set _label %}
+      <span aria-hidden="true">{{- _icon_html -}}</span>
+    {% endset %}
+  {% endif %}
+{% endif %}
+
+{% if _icon is not empty %}
+  {% set _icon = _icon|merge({
+    path: _icon_path,
+  }) %}
+{% endif %}
+
+{% if attributes is empty %}
+  {% set attributes = create_attribute() %}
+{% endif %}
+
+{% if _aria_label is not empty %}
+  {% set attributes = attributes.setAttribute('aria-label', _aria_label) %}
+{% endif %}
+
+{% if _active %}
+  {% set attributes = attributes.setAttribute('aria-current', 'page') %}
+  {% set attributes = attributes.setAttribute('tabindex', '0') %}
+{% endif %}
+
+{% set attributes = attributes.addClass(_classes) %}
+
+{% if _path and not _active %}
+  {% if _disabled %}
+    {% set attributes = attributes.setAttribute('aria-disabled', 'true') %}
+  {% endif %}
+  {% set attributes = attributes.setAttribute('aria-hidden', 'false') %}
+
+  {%- include '@oe-bcl/bcl-link/link.html.twig' with {
+    label: _label,
+    path: _path,
+    disabled: _disabled,
+    icon: _icon,
+    icon_position: _icon_position,
+    attributes: attributes,
+  } only -%}
+{% else %}
+  <div{{ attributes }}>
+    {% if _current_mobile_label %}
+      <span class="d-none d-md-inline-block">{{- _label -}}</span>
+      <span class="d-inline-block d-md-none">{{- _current_mobile_label -}}</span>
+    {% else %}
+      <span class="d-inline-block">
+        {{- _label -}}
+      </span>
+    {% endif %}
+  </div>
+{% endif %}
+
+{% endapply %}