@openeuropa/bcl-theme-default 0.27.0 → 0.28.1

package/templates/bcl-timeline/timeline-item.html.twig

@@ -0,0 +1,34 @@
+{% apply spaceless %}
+
+{# Parameters:
+  - id (string) (default: '')
+  - label (string) (default: '')
+  - title (string) (default: '')
+  - content (string) (default: '')
+#}
+
+{% set _id = id|default('') %}
+{% set _label = label|default('') %}
+{% set _title = title|default('') %}
+{% set _content = content|default('') %}
+
+{% if attributes is empty %}
+  {% set attributes = create_attribute() %}
+{% endif %}
+
+{% if _id is not empty %}
+  {% set attributes = attributes.setAttribute('id', _id) %}
+{% endif %}
+
+<li
+  {{ attributes }}>
+  <p class="fs-5 mb-1 fw-medium">{{ _label }}</p>
+  {% if _title is not empty %}
+  <p class="fs-6 mb-1 fw-medium">{{ _title }}</p>
+  {% endif %}
+  {% if _content is not empty %}
+  <div>{{ _content }}</div>
+  {% endif %}
+</li>
+
+{% endapply %}

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

@@ -17,8 +17,11 @@ Parameters:
       content: (block) (default: '')
     }
   ]
-  - hide_from (integer) (default: items.length) Item index after which to start hiding timeline items
-  - hide_to (integer) (default: items.length) Item index after which to resume displaying timeline items
+  - hide: (object)
+    format: {
+      from (integer) (default: items.length) Item index after which to start hiding timeline items
+      to (integer) (default: items.length) Item index after which to resume displaying timeline items
+    }
   - icon_path (string) (default: ''): file containing the svg icons
 #}
 
@@ -34,8 +37,6 @@ Parameters:
 {% set _hide_to = hide.to|default(items|length) %}
 {% set _icon_path = icon_path|default('') %}
 
-{% set _toggler = false %}
-
 {% if attributes is empty %}
   {% set attributes = create_attribute() %}
 {% endif %}
@@ -75,25 +76,19 @@ Parameters:
   {% if _items is not empty %}
     {% for _item in _items %}
       {# Decide on per item if it should display. #}
-      {% set extra_class = (loop.index > _display_amount and loop.revindex > _bottom_amount) ? "collapse collapse-#{_id}" %}
-      <li
-        {% if extra_class is not empty %}
-          class="{{ extra_class }}"
-        {% endif %}
-        {% if _item.id is defined and _item.id is not empty %}
-          id="{{ _item.id }}"
-        {% endif %}>
-          <p class="fs-5 mb-1 fw-medium">{{ _item.label }}</p>
-          {% if _item.title is defined and _item.title is not empty %}
-          <p class="fs-6 mb-1 fw-medium">{{ _item.title }}</p>
-          {% endif %}
-          {% if _item.content is defined and _item.content is not empty %}
-          <div>{{ _item.content }}</div>
-          {% endif %}
-      </li>
+      {% if _item.attributes is empty %}
+        {% set _item = _item|merge({
+          attributes: create_attribute()
+        }) %}
+      {% endif %}
+      {% if loop.index > _display_amount and loop.revindex > _bottom_amount %}
+        {% set _item = _item|merge({
+          attributes: _item.attributes.addClass('collapse',  'collapse-' ~ _id)
+        }) %}
+      {% endif %}
+      {% include '@oe-bcl/bcl-timeline/timeline-item.html.twig' with _item only %}
       {# Display the show more button if required. #}
       {% if (_hide_amount > 0 and loop.revindex == _bottom_amount + 1) or (_hide_amount > 0 and _hide_to == 0 and loop.revindex == 1) %}
-        {% set _toggler = true %}
         <li class="bcl-timeline__item--toggle">
           <button
             aria-expanded="false"

package/templates/bcl-toast/toasts.html.twig

@@ -21,11 +21,12 @@
   - attributes (drupal attrs)
 #}
 
-{% set _toasts = toasts|default([]) %}
 {% set _with_wrapper = with_wrapper|default(false) %}
 {% set _wrapper_classes = wrapper_classes|default('') %}
 {% set _wrapper_aria_live = wrapper_aria_live|default('') %}
 {% set _with_container = with_container|default(false) %}
+{% set _toasts = toasts|default([]) %}
+
 {% set _container_classes = 'toast-container' %}
 
 {% if container_classes %}

package/templates/bcl-user/user-compact.html.twig

@@ -1,21 +1,24 @@
 {% apply spaceless %}
 
 {# Parameters:
-  - picture (object) format: {
-    - "path" (string) (default: '')
-    - "alt" (string) (default: '')
-    - "classes": (string) (default: '')
-  }
-  - name (object) format: {
-    - "text" (string) (default: '')
-    - "link" (string) (default: '')
-  }
+  - picture (object) (default: {})
+    format: {
+    - path (string) (default: '')
+    - alt (string) (default: '')
+    - classes (string) (default: '')
+    }
+  - name (object) (default: {})
+    format: {
+    - text (string) (default: '')
+    - link (string) (default: '')
+    }
   - infos (array of strings) (default: [])
 #}
 
-{% set _infos = infos|default([]) %}
-{% set _name = name|default({}) %}
 {% set _picture = picture|default({}) %}
+{% set _name = name|default({}) %}
+{% set _infos = infos|default([]) %}
+
 {% set _picture_classes = 'rounded-pill' %}
 {% set _classes = ['bcl-user-compact', 'd-flex', 'mb-3'] %}
 

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

@@ -1,41 +0,0 @@
-{% spaceless %}
-
-  {# Parameters:
-  - title (string) (default: '')
-  - content (string)
-  - id (string) (default: '')
-  #}
-
-  {% set _title = title|default('') %}
-  {% set _content = content %}
-  {% set _id = id|default('') %}
-
-  {% if attributes is empty %}
-    {% set attributes = create_attribute() %}
-  {%  endif %}
-
-  {% if attributes.class is empty %}
-    {% set attributes = attributes.addClass(['mb-5']) %}
-  {% endif %}
-
-  {% if _id is not empty %}
-    {# Put the id directly on the <section> instead of the title, should work fine. #}
-    {% set attributes = attributes.setAttribute('id', _id) %}
-  {% endif %}
-
-  {% set _content_rendered %}{{ _content }}{% endset %}
-
-  {% if _content_rendered|trim is not empty %}
-    <section{{ attributes }}>
-      {% if _title is not empty %}
-        {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
-          title: _title,
-          title_tag: 'h2',
-          attributes: create_attribute().addClass(['mb-4'])
-        } only %}
-      {% endif %}
-      {{ _content_rendered }}
-    </section>
-  {% endif %}
-
-{% endspaceless %}