@openeuropa/bcl-theme-joinup 0.26.0 → 0.28.0

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

@@ -1,5 +1,5 @@
 {% import _self as navigation %}
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - id (string) (default: '')
@@ -27,7 +27,7 @@
 
 {# Define main macro #}
 {% macro render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) %}
-{% spaceless %}
+{% apply spaceless %}
   {% import _self as navigation %}
 
   {% set _id = id|default('') %}
@@ -171,9 +171,9 @@
     {%- endblock -%}
   </div>
   {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 
 {{ navigation.render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) }}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - title: (string) (default: '')
@@ -115,4 +115,4 @@
 {%- endif -%}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - size (string) (default: '')
@@ -56,15 +56,15 @@
 {% set _size = size|default('') %}
 {% set _alignment = alignment|default('') %}
 {% set _aria_label = aria_label|default('') %}
+{% set _variant = variant|default('') %}
 {% set _enable_prev_next_icon = enable_prev_next_icon|default(false) %}
 {% set _enable_first_last_icon = enable_first_last_icon ?? true %}
-{% set _items = items|default([]) %}
 {% set _first = first|default({}) %}
-{% set _next = next|default({}) %}
 {% set _prev = prev|default({}) %}
+{% set _next = next|default({}) %}
 {% set _last = last|default({}) %}
-{% set _variant = variant|default('') %}
-{% set _icon_path = icon_path|default({}) %}
+{% set _items = items|default([]) %}
+{% set _icon_path = icon_path|default('') %}
 
 {% set _classes = 'pagination' %}
 {% if _size is not empty %}
@@ -83,6 +83,10 @@
 
 {% set attributes = attributes.setAttribute('role', 'navigation') %}
 
+{% if _variant == 'glossary' %}
+  {% set attributes = attributes.setAttribute('class', 'bcl-glossary') %}
+{% endif %}
+
 {% if _aria_label is not empty %}
   {% set attributes = attributes.setAttribute('aria-label', aria_label) %}
 {% endif %}
@@ -271,4 +275,4 @@
   </ul>
 </nav>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - width (int) (default: 0) - between 0-100
@@ -15,6 +15,7 @@
 {% set _variant = variant|default('') %}
 {% set _size = size|default('') %}
 {% set _animation = animation|default('') %}
+
 {% set _classes = ['placeholder'] %}
 
 {% if _size is not empty %}
@@ -41,4 +42,4 @@
   </p>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - progress (int) (default: 0)
@@ -70,4 +70,4 @@
   <small class="form-text text-muted progress-bar-message">{{ _message }}</small>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-project/project-lists.html.twig

@@ -1,9 +1,12 @@
-{% spaceless %}
+{% apply spaceless %}
 
 
 {#
   Parameters:
-  - title (heading object) (default: {})
+  - title: (string) (default: '')
+  - title_tag: (string) (default: 'h2')
+  - title_link: (link object) (default: {})
+  - title_attributes (drupal attrs)
   - items (array) (default: [])
     {
       title: (heading object),
@@ -67,4 +70,4 @@
 {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-project-status/project-contributions.html.twig

@@ -1,8 +1,8 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - corporate_contributions (string) (default: '') // value every 5 percent
-  - legend (boolean or object (default: false)
+  - legend (description list object) (default: false)
   - chart (boolean) (default: false)
 
   Blocks - 
@@ -11,7 +11,7 @@
 #}
 
 {% set _corporate_contributions = corporate_contributions|default('') %}
-{% set _legend = legend|default(false) %}
+{% set _legend = legend|default({}) %}
 {% set _chart = chart|default(false) %}
 
 {% if attributes is empty %}
@@ -53,4 +53,4 @@
   </div> 
 </div>
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-project-status/project-status.html.twig

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - status (string) (default: 'planned')
@@ -97,4 +97,4 @@
 
 
 
-{% endspaceless %}
+{% endapply %}

package/templates/bcl-recent-activities/recent-activities.html.twig

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - activities (array of custom object) (default: [])
@@ -60,4 +60,4 @@
 {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - pill (boolean) (default: false)
@@ -50,4 +50,4 @@
   </div>
 </form>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -22,21 +22,21 @@
 #}
 
 {% set _id = id|default('') %}
+{% set _label = label|default('') %}
+{% set _label_extra_classes = label_extra_classes|default('') %}
+{% set _hidden_label = hidden_label|default(false) %}
+{% set _helper_text = helper_text|default('') %}
+{% set _helper_text_id = helper_text_id|default('') %}
 {% set _disabled = disabled|default(false) %}
-{% set _options = options|default([]) %}
-{% set _aria_label = aria_label|default('') %}
-{% set _required = required|default(false) %}
-{% set _multiple = multiple|default(false) %}
 {% set _invalid = invalid|default(false) %}
 {% set _valid = valid|default(false) %}
 {% set _invalid_feedback = invalid_feedback|default('') %}
 {% set _valid_feedback = valid_feedback|default('') %}
-{% set _helper_text = helper_text|default('') %}
-{% set _helper_text_id = helper_text_id|default('') %}
-{% set _label = label|default('') %}
-{% set _label_extra_classes = label_extra_classes|default('') %}
+{% set _required = required|default(false) %}
+{% set _multiple = multiple|default(false) %}
+{% set _options = options|default([]) %}
+{% set _aria_label = aria_label|default('') %}
 {% set _clean_class = clean_class|default(false) %}
-{% set _hidden_label = hidden_label|default(false) %}
 
 {% set _classes = ['form-select'] %}
 {% set _label_class = 'form-label' %}
@@ -167,4 +167,4 @@
 </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - type (string) (default: 'border')
@@ -37,4 +37,4 @@
 {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,3 +1,5 @@
+{% extends "@oe-bcl/bcl-modal/modal.html.twig" %}
+
 {# Parameters:
   - form: (form object) (default: {})
   - success_alert: (alert object) (default: {})
@@ -12,8 +14,6 @@
 {% set _success_alert = success_alert|default({}) %}
 {% set _error_alert = error_alert|default({}) %}
 
-{% extends "@oe-bcl/bcl-modal/modal.html.twig" %}
-
 {% block body %}
   {% include '@oe-bcl/bcl-form/form.html.twig' with _form only %}
 {% endblock %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - title: (string) (default: '')
@@ -7,7 +7,7 @@
   - attributes (drupal attrs)
 #}
 
-{% set _title = title|default(false) %}
+{% set _title = title|default('') %}
 {% set _content = content|default('') %}
 {% set _button = button|default({}) %}
 
@@ -35,4 +35,4 @@
   {% endif %}
 </div>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {# Parameters:
   - striped (boolean) (default: false)
@@ -192,4 +192,4 @@
   </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -7,8 +7,8 @@
   - required (boolean) (default: false)
   - disabled (boolean) (default: false)
   - readonly (boolean) (default: false)
-  - valid (boolean) (default: false)
   - invalid (boolean) (default: false)
+  - valid (boolean) (default: false)
   - invalid_feedback (string) (default: '')
   - valid_feedback (string) (default: '')
   - helper_text (string) (default: '')
@@ -146,4 +146,4 @@
 {% if _floating or _horizontal %}
 </div>
 {% endif %}
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
 Parameters:
@@ -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"
@@ -117,4 +112,4 @@ Parameters:
   {% endif %}
 </ol>
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 
 {#
   Parameters:
@@ -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 %}
@@ -119,4 +120,4 @@
 </div>
 {% endif %}
 
-{% endspaceless %}
+{% endapply %}

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

@@ -1,18 +1,24 @@
-{% spaceless %}
+{% 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 _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'] %}
 
@@ -22,8 +28,8 @@
 
 {% set attributes = attributes.addClass(_classes) %}
 
-{% if picture is not empty and picture.classes is not empty %}
-  {% set _picture_classes = _picture_classes ~ ' ' ~ picture.classes %}
+{% if _picture is not empty and _picture.classes is not empty %}
+  {% set _picture_classes = _picture_classes ~ ' ' ~ _picture.classes %}
 {% endif %}
 
 <div
@@ -32,22 +38,27 @@
   <div class="flex-shrink-0">
     <img
       class="{{ _picture_classes }}"
-      src="{{ picture.path }}"
-      alt="{{ picture.alt }}"
+      src="{{ _picture.path }}"
+      alt="{{ _picture.alt }}"
     >
   </div>
   <div class="flex-grow-1 ms-3">
-    {% if name.link is not empty %}
-      <a href="{{ name.link }}" class="fs-5 standalone mb-0">{{ name.text }}</a>
-    {% else %}
-      <p class="fs-5 mb-0 text-primary">{{ name.text }}</p>
-    {% endif %}
+  {% if _name.link is not empty %}
+    <a href="{{ _name.link }}" class="fs-5 standalone mb-0">{{ _name.text }}</a>
+  {% else %}
+    <p class="fs-5 mb-0 text-primary">{{ _name.text }}</p>
+  {% endif %}
+
+  {% if _infos is not empty %}
     <div class="d-flex flex-wrap">
-      {% for info in infos %}
-        <span class="text-muted text-nowrap{{ loop.last ? '' :' me-4-5'}}">{{ info }}</span>
-      {% endfor %}
+    {% for _info in _infos %}
+      {% if _info is not empty %}
+      <span class="text-muted text-nowrap{{ loop.last ? '' :' me-4-5'}}">{{ _info }}</span>
+      {% endif %}
+    {% endfor %}
     </div>
+  {% endif %}
   </div>
 </div>
 
-{% endspaceless %}
+{% endapply %}