@openeuropa/bcl-theme-joinup 0.4298.202511051800 → 0.4360.202601141610

package/templates/bcl-base-templates/content-type.html.twig

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - with_header (boolean) (default: false)
@@ -25,7 +23,7 @@
   - messages_area
 #}
 
-{% set _with_header = header ?? false %}
+{%- set _with_header = header ?? false %}
 {% set _with_footer = footer ?? false %}
 {% set _with_banner = banner ?? false %}
 {% set _with_sidebar = sidebar ?? false %}
@@ -34,8 +32,8 @@
 {% set _content_type = content_type|default('') %}
 {% set _classes = ['bcl-node-type'] %}
 
-{% if _with_sidebar %}
-  {% set _col_classes = {
+{%- if _with_sidebar %}
+  {%- set _col_classes = {
     left: [
       'col-12',
       'bcl-sidebar',
@@ -45,95 +43,93 @@
     ],
   } %}
 
-  {% if _sidebar_size == 'normal' %}
-    {% set _col_classes = _col_classes|merge({
+  {%- if _sidebar_size == 'normal' %}
+    {%- set _col_classes = _col_classes|merge({
       left: _col_classes.left|merge(['col-lg-3']),
       right: _col_classes.right|merge(['col-lg-9', 'col-xxl-8']),
     }) %}
-  {% endif %}
+  {%- endif %}
 
-  {% if _sidebar_size == 'large' %}
-    {% set _col_classes = _col_classes|merge({
+  {%- if _sidebar_size == 'large' %}
+    {%- set _col_classes = _col_classes|merge({
       left: _col_classes.left|merge(['col-lg-4']),
       right: _col_classes.right|merge(['col-lg-8']),
     }) %}
-  {% endif %}
+  {%- endif %}
 {% endif %}
 
-{% if _content_type is not empty %}
-  {% set _classes = _classes|merge(['bcl-' ~ _content_type]) %}
+{%- if _content_type is not empty %}
+  {%- set _classes = _classes|merge(['bcl-' ~ _content_type]) %}
 {% endif %}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% if _with_header %}
-  {% include '@oe-bcl/bcl-header/header.html.twig' with header only %}
-{% endif %}
+{%- if _with_header %}
+  {%- include '@oe-bcl/bcl-header/header.html.twig' with header only %}
+{% endif -%}
 
 <main {{ attributes }}>
-{% if messages is defined and messages is not empty %}
-  {% block messages_area %}
+{%- if messages is defined and messages is not empty %}
+  {%- block messages_area -%}
   <div class="container">
-    {% for message in messages %}
-    {% set message_attributes = create_attribute().addClass(['mt-lg-5', 'mt-2']) %}
-      {% include '@oe-bcl/bcl-alert/alert.html.twig' with message|merge({
+    {%- for message in messages %}
+    {%- set message_attributes = create_attribute().addClass(['mt-lg-5', 'mt-2']) %}
+      {%- include '@oe-bcl/bcl-alert/alert.html.twig' with message|merge({
         attributes: message_attributes,
       }) only %}
-    {% endfor %}
+    {%- endfor -%}
   </div>
-  {% endblock %}
+  {%- endblock %}
 {% endif %}
 
-{% if _with_banner %}
-  {% block banner %}
-    {% include '@oe-bcl/bcl-content-banner/content-banner.html.twig' with banner only %}
-  {% endblock %}
-{% endif %}
+{%- if _with_banner %}
+  {%- block banner %}
+    {%- include '@oe-bcl/bcl-content-banner/content-banner.html.twig' with banner only %}
+  {%- endblock %}
+{% endif -%}
 
-  <div class="container mt-md-4-75 mt-4">
+  <div class="container mt-md-4-75 mt-4">{# -#}
     <div class="row">
-      {% block content_row %}
-        {{ content_row }}
-      {% endblock %}
-    {% if _with_sidebar %}
+      {%- block content_row %}
+        {{- content_row }}
+      {%- endblock %}
+    {%- if _with_sidebar -%}
       <div class="{{ _col_classes.left|join(' ') }}">
-        {% block sidebar %}{% endblock %}
-      </div>
+        {%- block sidebar %}{% endblock -%}
+      </div>{# -#}
       <div class="{{ _col_classes.right|join(' ') }}">
-    {% else %}
-      {% if _landing %}
+    {%- else %}
+      {%- if _landing -%}
       <div class="col-12">
-      {% else %}
+      {%- else -%}
       <div class="col-lg-10 col-xl-9 col-xxl-8">
-      {% endif %}
-    {% endif %}
-      {% block content_top %}
-        {{ content_top }}
-      {% endblock %}
-      {% block content %}
-        {{ content }}
-      {% endblock %}
-      {% block content_bottom %}
-        {{ content_bottom }}
-      {% endblock %}
-      {% block related %}
-        {{ related }}
-      {% endblock %}
-      {% block share %}
-        {{ share }}
-      {% endblock %}
-    </div>
-  </div>
+      {%- endif %}
+    {%- endif %}
+      {%- block content_top %}
+        {{- content_top }}
+      {%- endblock %}
+      {%- block content %}
+        {{- content }}
+      {%- endblock %}
+      {%- block content_bottom %}
+        {{- content_bottom }}
+      {%- endblock %}
+      {%- block related %}
+        {{- related }}
+      {%- endblock %}
+      {%- block share %}
+        {{- share }}
+      {%- endblock -%}
+    </div>{# -#}
+  </div>{# -#}
 </main>
 
-{% block feedback %}
-  {{ feedback }}
-{% endblock %}
-
-{% if _with_footer %}
-  {% include '@oe-bcl/bcl-footer/footer.html.twig' with footer only %}
-{% endif %}
+{%- block feedback %}
+  {{- feedback }}
+{%- endblock %}
 
-{% endapply %}
+{%- if _with_footer %}
+  {%- include '@oe-bcl/bcl-footer/footer.html.twig' with footer only %}
+{% endif -%}

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

@@ -13,60 +13,60 @@
 {% set _listing = listing|default({}) %}
 
 {%- 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() %}
+  {%- 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 %}
-  <div class="row">
+  {%- include '@oe-bcl/bcl-button/button.html.twig' with filter_button only %}
+{% endif -%}
+  <div class="row">{# -#}
     <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 {
+      {%- if _title is not empty %}
+        {%- include '@oe-bcl/bcl-heading/heading.html.twig' with {
           title: _title ~ ' (' ~ (_listing.items|length) ~ ')',
           title_tag: _title_tag,
           title_link: _title_link,
           attributes: _title_attributes.addClass(['mb-0', 'text-capitalize']),
         } only %}
-      {% endif %}
+      {%- endif -%}
     </div>
-    {% if badges is not empty and badges is iterable %}
+    {%- if badges is not empty and badges is iterable -%}
       <div class="col-md-12 order-md-2 mt-3">
-      {% for badge in badges %}
-        {% include '@oe-bcl/bcl-badge/badge.html.twig' with badge|merge({
+      {%- for badge in badges %}
+        {%- include '@oe-bcl/bcl-badge/badge.html.twig' with badge|merge({
           attributes: create_attribute().addClass(["mb-2", "me-2"])
         }) only %}
-      {% endfor %}
+      {%- endfor -%}
       </div>
-    {% endif %}
-    <div class="col-md-6 col-lg-4 mt-3 mt-md-0">
+    {%- endif -%}
+    <div class="col-md-6 col-lg-4 mt-3 mt-md-0">{# -#}
       <div class="float-md-end d-md-flex align-items-center mb-4 mb-md-0">
-        {% include '@oe-bcl/bcl-select/select.html.twig' with sort_select|merge({
+        {%- include '@oe-bcl/bcl-select/select.html.twig' with sort_select|merge({
           attributes: create_attribute().addClass(['ms-md-2']),
-        }) only %}
-      </div>
-    </div>
-  </div>
+        }) only -%}
+      </div>{# -#}
+    </div>{# -#}
+  </div>{# -#}
   <hr class="d-none d-md-block mb-4-75"/>
 {%- endblock -%}
 
 {%- block content %}
-  {% if _listing is not empty %}
-    {% include '@oe-bcl/bcl-listing/listing.html.twig' with  _listing only %}
-  {% endif %}
+  {%- if _listing is not empty %}
+    {%- include '@oe-bcl/bcl-listing/listing.html.twig' with  _listing only %}
+  {%- endif %}
 {%- endblock -%}
 
 {%- block content_bottom %}
-  {% set _pagination = pagination|default({}) %}
-  {% if _pagination is not empty %}
+  {%- 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 %}
+    {%- include '@oe-bcl/bcl-pagination/pagination.html.twig' with _pagination only %}
+  {%- endif %}
 {%- endblock -%}
 
 {%- block sidebar %}
-  {% set _sidebar = sidebar|default({}) %}
-  {% include '@oe-bcl/bcl-base-templates/sidebar-search.html.twig' with _sidebar only %}
+  {%- set _sidebar = sidebar|default({}) %}
+  {%- include '@oe-bcl/bcl-base-templates/sidebar-search.html.twig' with _sidebar only %}
 {%- endblock -%}

package/templates/bcl-base-templates/sidebar-search.html.twig

@@ -1,20 +1,20 @@
 {% extends "@oe-bcl/bcl-offcanvas/offcanvas.html.twig" %}
 
-{% set responsiveness = 'lg' %}
+{%- set responsiveness = 'lg' %}
 {% if extra_classes_header is empty %}
-  {% set extra_classes_header = 'd-lg-block' %}
+  {%- set extra_classes_header = 'd-lg-block' %}
 {% else %}
-  {% set extra_classes_header = extra_classes_header ~ ' d-lg-block' %}
+  {%- set extra_classes_header = extra_classes_header ~ ' d-lg-block' %}
 {% endif %}
 
-{% block body %}
-  {% if search_form.attributes is empty %}
-    {% set attributes = search_form.create_attribute() %}
-  {% endif %}
+{%- block body %}
+  {%- if search_form.attributes is empty %}
+    {%- set attributes = search_form.create_attribute() %}
+  {%- endif -%}
 
   <div class="offcanvas-body p-lg-0">
-    {% include '@oe-bcl/bcl-form/form.html.twig' with search_form|merge({
+    {%- include '@oe-bcl/bcl-form/form.html.twig' with search_form|merge({
       attributes: search_form.attributes.addClass('w-100')
-    }) only %}
+    }) only -%}
   </div>
-{% endblock %}
+{%- endblock %}

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

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title (string) (default: '')
   - title_tag (string) (default: 'h2')
@@ -13,7 +11,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() %}
@@ -22,7 +20,7 @@
 {% set _cite = cite|default('') %}
 {% set _alignment = alignment|default('left') %}
 
-{% set _classes = [
+{%- set _classes = [
   'text-' ~ _alignment,
   "bg-lighter",
   "p-2",
@@ -31,19 +29,19 @@
   "border-secondary"
 ] %}
 
-{% if _alignment == "center" %}
-  {% set _classes = _classes|merge(["border-top"]) %}
+{%- if _alignment == "center" %}
+  {%- set _classes = _classes|merge(["border-top"]) %}
 {% elseif _alignment == "end" %}
-  {% set _classes = _classes|merge(["border-end"]) %}
+  {%- set _classes = _classes|merge(["border-end"]) %}
 {% else %}
-  {% set _classes = _classes|merge(["border-start"]) %}
+  {%- set _classes = _classes|merge(["border-start"]) %}
 {% endif %}
 
-{% 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 _title is not empty -%}
   {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
@@ -56,18 +54,17 @@
 
 <figure
   {{ attributes }}
->
-  <blockquote class="blockquote mb-2">
-    <p>{{- _quote -}}</p>
+>{# -#}
+  <blockquote class="blockquote mb-2">{# -#}
+    <p>{{- _quote -}}</p>{# -#}
   </blockquote>
-{% if _attribution is not empty %}
+{%- if _attribution is not empty -%}
   <figcaption class="blockquote-footer m-0">
     {{- _attribution -}}
-  {% if _cite is not empty %}
+  {% if _cite is not empty -%}
     <cite title="{{ _cite }}">{{- _cite -}}</cite>
-  {% endif %}
+  {%- endif -%}
   </figcaption>
-{% endif %}
+{%- endif -%}
 </figure>
-
-{% endapply %}
+{#--#}

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

@@ -1,46 +1,44 @@
-{% apply spaceless %}
-
 {# Parameters:
   - links (link[]) (default: [])
   - icon_path (string) (default: '')
   - attributes (drupal attrs)
 #}
 
-{% set _links = links|default([]) %}
+{%- set _links = links|default([]) %}
 {% set _icon_path = icon_path|default('') %}
 
-{% set _classes = 'breadcrumb' %}
+{%- set _classes = 'breadcrumb' %}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% set attributes = attributes.setAttribute('aria-label', 'breadcrumb') %}
+{%- set attributes = attributes.setAttribute('aria-label', 'breadcrumb') %}
 
-{% if _links is not empty %}
+{%- if _links is not empty -%}
 <nav
   {{ attributes }}
->
+>{# -#}
   <ol
     class="{{ _classes }}"
   >
-    {% for _link in _links %}
-      {% set _segment_classes = 'breadcrumb-item d-none d-md-block' %}
-      {% if loop.revindex == 2 %}
-        {% set _segment_classes = 'breadcrumb-item' %}
-      {% endif %}
-      {% set _segment_attrs = '' %}
-      {% if loop.last %}
-        {% set _segment_classes = _segment_classes ~ ' active' %}
-        {% set _segment_attrs = 'aria-current="page"' %}
-      {% endif %}
+    {%- for _link in _links %}
+      {%- set _segment_classes = 'breadcrumb-item d-none d-md-block' %}
+      {%- if loop.revindex == 2 %}
+        {%- set _segment_classes = 'breadcrumb-item' %}
+      {%- endif %}
+      {%- set _segment_attrs = '' %}
+      {%- if loop.last %}
+        {%- set _segment_classes = _segment_classes ~ ' active' %}
+        {%- set _segment_attrs = 'aria-current="page"' %}
+      {%- endif -%}
       <li
         class="{{ _segment_classes }}"
         {{ _segment_attrs|raw }}
       >
         {%- if _link.path -%}
           {% if loop.revindex == 2 %}
-            {% set _link = _link|merge({
+            {%- set _link = _link|merge({
               icon_position: 'before',
                 icon: {
                   name: "arrow-left",
@@ -48,15 +46,13 @@
                   attributes: create_attribute().addClass(['d-md-none ms-0 me-2']),
                 },
              }) %}
-          {% endif %}
-          {% include '@oe-bcl/bcl-link/link.html.twig' with _link only %}
-        {% else %}
+          {%- endif %}
+          {%- include '@oe-bcl/bcl-link/link.html.twig' with _link only %}
+        {%- else %}
           {{- _link.label -}}
         {%- endif -%}
       </li>
-    {% endfor %}
-  </ol>
+    {%- endfor -%}
+  </ol>{# -#}
 </nav>
-{% endif %}
-
-{% endapply %}
+{%- endif -%}

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

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - label (string) (default: '')
@@ -23,7 +21,7 @@
   - attributes (drupal attrs)
 #}
 
-{% set _label = label|default('') %}
+{%- set _label = label|default('') %}
 {% set _variant = variant|default('primary') %}
 {% set _size = size|default('md') %}
 {% set _type = type|default('button') %}
@@ -40,58 +38,58 @@
 {% set _clean_class = clean_class ?? false %}
 {% set _remove_icon_spacers = remove_icon_spacers ?? false %}
 
-{% set _classes = [] %}
+{%- set _classes = [] %}
 {% if _clean_class == false %}
-  {% set _classes = _classes|merge(['btn', 'btn-' ~ (_outline ? 'outline-' : '') ~ _variant|e('html_attr')]) %}
-  {% set _classes = _classes|merge(['btn-' ~ _size|e('html_attr')]) %}
+  {%- set _classes = _classes|merge(['btn', 'btn-' ~ (_outline ? 'outline-' : '') ~ _variant|e('html_attr')]) %}
+  {%- set _classes = _classes|merge(['btn-' ~ _size|e('html_attr')]) %}
 {% endif %}
 {% if _text_nowrap %}
-  {% set _classes = _classes|merge(['text-nowrap']) %}
+  {%- set _classes = _classes|merge(['text-nowrap']) %}
 {% endif %}
 {% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 {% if _disabled %}
-  {% set attributes = attributes.setAttribute('disabled', true).setAttribute('aria-disabled', 'true') %}
+  {%- set attributes = attributes.setAttribute('disabled', true).setAttribute('aria-disabled', 'true') %}
 {% endif %}
 {% if _id is not empty %}
-  {% set attributes = attributes.setAttribute('id', _id) %}
+  {%- set attributes = attributes.setAttribute('id', _id) %}
 {% endif %}
 {% if _classes is not empty %}
-  {% set attributes = attributes.addClass(_classes) %}
+  {%- set attributes = attributes.addClass(_classes) %}
 {% endif %}
 {% if _icon_spacing is not empty %}
-  {% set _icon_spacing = _icon_spacing ~ '-' %}
+  {%- set _icon_spacing = _icon_spacing ~ '-' %}
 {% endif %}
 {% set attributes = attributes.setAttribute('type', _type) %}
 {% if _icon is not empty %}
-    {% set _icon = _icon|merge({
+    {%- set _icon = _icon|merge({
         size: "fluid",
       })
     %}
-  {% if _label is not empty and not _remove_icon_spacers %}
-    {% if _icon.attributes is empty %}
-      {% set _icon = _icon|merge({
+  {%- if _label is not empty and not _remove_icon_spacers %}
+    {%- if _icon.attributes is empty %}
+      {%- set _icon = _icon|merge({
           attributes: create_attribute()
         })
       %}
-    {% endif %}
-    {% if _icon_position == 'before' %}
-      {% set _icon = _icon|merge({
+    {%- endif %}
+    {%- if _icon_position == 'before' %}
+      {%- set _icon = _icon|merge({
           attributes: _icon.attributes.addClass('me-' ~ _icon_spacing ~ '2-5')
         })
       %}
-    {% else %}
-      {% set _icon = _icon|merge({
+    {%- else %}
+      {%- set _icon = _icon|merge({
           attributes: _icon.attributes.addClass('ms-' ~ _icon_spacing ~ '2-5')
         })
       %}
-    {% endif %}
-  {% endif %}
+    {%- endif %}
+  {%- endif %}
   {%- set _icon_markup -%}
     {%- include '@oe-bcl/bcl-icon/icon.html.twig' with _icon only -%}
   {%- endset -%}
-{% endif %}
+{% endif -%}
 
 <button
   {{ attributes }}
@@ -101,7 +99,7 @@
 {%- endif -%}
 {%- if _assistive_text is not empty -%}
   <span class="visually-hidden">{{- _assistive_text -}}</span>
-{% endif %}
+{%- endif %}
 {%- if _icon_position == 'before' and _icon_markup is defined -%}
   {{ _icon_markup|raw }}
 {%- endif -%}
@@ -110,5 +108,4 @@
   {{ _icon_markup|raw }}
 {%- endif -%}
 </button>
-
-{% endapply %}
+{#--#}

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

@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - vertical (boolean) (default: false)
   - size (string) (default: 'md')
@@ -11,57 +9,55 @@
   - attributes (drupal attrs)
 #}
 
-{% set _vertical = vertical ?? false %}
+{%- set _vertical = vertical ?? false %}
 {% set _size = size|default('md') %}
 {% set _aria_label = aria_label|default('') %}
 {% set _toolbar = toolbar ?? false %}
 {% set _toolbar_aria_label = toolbar_aria_label|default('') %}
 {% set _items = items|default([]) %}
 
-{% set _classes = ['btn-group'] %}
+{%- set _classes = ['btn-group'] %}
 
-{% if _vertical %}
-  {% set _classes = ['btn-group-vertical'] %}
+{%- if _vertical %}
+  {%- set _classes = ['btn-group-vertical'] %}
 {% endif %}
 
-{% set _classes = _classes|merge(['btn-group-' ~ _size]) %}
+{%- set _classes = _classes|merge(['btn-group-' ~ _size]) %}
 
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
+{%- if attributes is empty %}
+  {%- set attributes = create_attribute() %}
 {% endif %}
 
-{% if _aria_label is not empty %}
-  {% set attributes = attributes.setAttribute('aria-label', _aria_label) %}
+{%- if _aria_label is not empty %}
+  {%- set attributes = attributes.setAttribute('aria-label', _aria_label) %}
 {% endif %}
 
-{% set attributes = attributes.setAttribute('role', 'group').addClass(_classes) %}
+{%- set attributes = attributes.setAttribute('role', 'group').addClass(_classes) %}
 
-{% if _toolbar %}
+{%- if _toolbar -%}
   <div class="btn-toolbar" role="toolbar"
   {% if _toolbar_aria_label is not empty %}
     aria-label="{{ _toolbar_aria_label }}"
   {% endif %}
   >
-{% endif %}
+{%- endif %}
 {% if _items is not empty %}
-  {% for _items_group in _items %}
+  {%- for _items_group in _items -%}
     <div
       {{ attributes }}
     >
-    {% if _items_group is not empty and _items_group is iterable %}
-      {% for _item in _items_group %}
-        {% if _item.input is defined %}
-          {% include '@oe-bcl/bcl-form-input/form-input.html.twig' with _item only %}
-        {% else %}
-          {% include '@oe-bcl/bcl-button/button.html.twig' with _item only %}
-        {% endif %}
-      {% endfor %}
-    {% endif %}
+    {%- if _items_group is not empty and _items_group is iterable %}
+      {%- for _item in _items_group %}
+        {%- if _item.input is defined %}
+          {%- include '@oe-bcl/bcl-form-input/form-input.html.twig' with _item only %}
+        {%- else %}
+          {%- include '@oe-bcl/bcl-button/button.html.twig' with _item only %}
+        {%- endif %}
+      {%- endfor %}
+    {%- endif -%}
     </div>
-  {% endfor %}
+  {%- endfor %}
 {% endif %}
-{% if _toolbar %}
+{% if _toolbar -%}
   </div>
-{% endif %}
-
-{% endapply %}
+{%- endif -%}