From 185830035a67be55be18afbf7d4d786fffca7c10 Mon Sep 17 00:00:00 2001
From: Fabian Braun <fsbraun@gmx.de>
Date: Wed, 14 Feb 2024 14:22:59 +0100
Subject: [PATCH] fix: Remove `{% spaceless %}` around `{% block "content" %}`
 (#188)

---
 .../bootstrap5/accordion.html                 | 12 ++-
 .../bootstrap5/accordion_item.html            |  4 +-
 .../djangocms_frontend/bootstrap5/alert.html  |  4 +-
 .../templates/djangocms_frontend/badge.html   |  4 +-
 .../djangocms_frontend/bootstrap5/card.html   | 21 +++---
 .../bootstrap5/carousel/default/carousel.html | 74 +++++++++----------
 .../bootstrap5/carousel/default/image.html    | 24 +++---
 .../bootstrap5/carousel/default/slide.html    | 43 +++++------
 .../bootstrap5/collapse-container.html        |  9 +--
 .../bootstrap5/collapse-trigger.html          |  9 +--
 .../bootstrap5/collapse.html                  | 24 +++---
 .../bootstrap5/blockquote.html                | 42 +++++------
 .../djangocms_frontend/bootstrap5/figure.html | 14 ++--
 .../bootstrap5/grid_row.html                  |  4 +-
 .../djangocms_frontend/bootstrap5/icon.html   |  4 +-
 .../bootstrap5/default/image.html             | 29 ++++----
 .../jumbotron/default/jumbotron.html          | 19 +++--
 .../djangocms_frontend/bootstrap5/media.html  | 20 +++--
 .../bootstrap5/tabs/default/item.html         | 19 +++--
 .../bootstrap5/tabs/default/tabs.html         |  4 +-
 .../templates/djangocms_frontend.html         |  5 +-
 .../djangocms_frontend/html_container.html    |  5 +-
 22 files changed, 183 insertions(+), 210 deletions(-)

diff --git a/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion.html b/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion.html
index 0a9f29c1..cdb8ddd8 100644
--- a/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion.html
+++ b/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion.html
@@ -1,8 +1,6 @@
 {% load cms_tags %}
-{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }} id="parent-{{ instance.pk|safe }}">
-        {% for plugin in instance.child_plugin_instances %}
-            {% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
-        {% endfor %}
-    </{{ instance.tag_type }}>
-{% endspaceless %}
+<{{ instance.tag_type }}{{ instance.get_attributes }} id="parent-{{ instance.pk|safe }}">
+    {% for plugin in instance.child_plugin_instances %}
+        {% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
+    {% endfor %}
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion_item.html b/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion_item.html
index 6cd6ae5e..a8bbcaf4 100644
--- a/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion_item.html
+++ b/djangocms_frontend/contrib/accordion/templates/djangocms_frontend/bootstrap5/accordion_item.html
@@ -11,12 +11,12 @@
             aria-controls="item-{{ instance.pk|safe }}">{{ instance.accordion_item_header }}</button>
     </{{ parent.accordion_header_type|default:"h2" }}>
     <{{ instance.tag_type }}{{ instance.get_attributes }} id="item-{{ instance.pk|safe }}" aria-labelledby="heading-{{ instance.pk|safe }}" data-bs-parent="#parent-{{ parent.pk|safe }}">
-    <div class="accordion-body">
+    <div class="accordion-body">{% endspaceless %}
         {% with parent=instance %}
             {% for plugin in instance.child_plugin_instances %}
                 {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
             {% endfor %}
-        {% endwith %}
+        {% endwith %}{% spaceless %}
     </div>
     </{{ instance.tag_type }}>
     </div>
diff --git a/djangocms_frontend/contrib/alert/templates/djangocms_frontend/bootstrap5/alert.html b/djangocms_frontend/contrib/alert/templates/djangocms_frontend/bootstrap5/alert.html
index 5f7f1264..1cfc0f18 100644
--- a/djangocms_frontend/contrib/alert/templates/djangocms_frontend/bootstrap5/alert.html
+++ b/djangocms_frontend/contrib/alert/templates/djangocms_frontend/bootstrap5/alert.html
@@ -3,10 +3,10 @@
     {% if instance.alert_dismissible %}
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{% trans "Close" %}"></button>
     {% endif %}
-    <div>
+    <div>{% endspaceless %}
         {% for plugin in instance.child_plugin_instances %}
             {% with parent=instance %}{% render_plugin plugin %}{% endwith %}
-        {% endfor %}
+        {% endfor %}{% spaceless %}
     </div>
     </{{ instance.tag_type }}>
 {% endspaceless %}
diff --git a/djangocms_frontend/contrib/badge/templates/djangocms_frontend/badge.html b/djangocms_frontend/contrib/badge/templates/djangocms_frontend/badge.html
index 824c6ce9..3569d791 100644
--- a/djangocms_frontend/contrib/badge/templates/djangocms_frontend/badge.html
+++ b/djangocms_frontend/contrib/badge/templates/djangocms_frontend/badge.html
@@ -1,3 +1 @@
-{% load cms_tags %}{% spaceless %}
-    <span{{ instance.get_attributes }}>{{ instance.badge_text }}</span>
-{% endspaceless %}
+{% load cms_tags %}<span{{ instance.get_attributes }}>{{ instance.badge_text }}</span>
diff --git a/djangocms_frontend/contrib/card/templates/djangocms_frontend/bootstrap5/card.html b/djangocms_frontend/contrib/card/templates/djangocms_frontend/bootstrap5/card.html
index e88e2dc7..190b8156 100644
--- a/djangocms_frontend/contrib/card/templates/djangocms_frontend/bootstrap5/card.html
+++ b/djangocms_frontend/contrib/card/templates/djangocms_frontend/bootstrap5/card.html
@@ -1,11 +1,10 @@
-{% load cms_tags frontend %}{% spaceless %}
-    {% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}<div class="col mb-3">{% endif %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}>
-    {% with parent=instance %}
-        {% for plugin in instance.child_plugin_instances %}
-            {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
-        {% endfor %}
-    {% endwith %}
-    </{{ instance.tag_type }}>
-    {% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}</div>{% endif %}
-{% endspaceless %}
+{% load cms_tags frontend %}
+{% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}<div class="col mb-3">{% endif %}
+<{{ instance.tag_type }}{{ instance.get_attributes }}>
+{% with parent=instance %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
+    {% endfor %}
+{% endwith %}
+</{{ instance.tag_type }}>
+{% if instance.parent.plugin_type == "CardLayoutPlugin" and instance.parent.get_plugin_instance.0.card_type == "row" %}</div>{% endif %}
diff --git a/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/carousel.html b/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/carousel.html
index abe0e164..12f38157 100644
--- a/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/carousel.html
+++ b/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/carousel.html
@@ -1,39 +1,39 @@
-{% load i18n cms_tags %}{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}
-    id="carousel-{{ instance.pk|safe }}"
-    data-bs-interval="{{ instance.carousel_interval|lower }}"
-    data-bs-keyboard="{{ instance.carousel_keyboard|lower }}"
-    data-bs-pause="{{ instance.carousel_pause|lower }}"
-    data-bs-ride="{% if instance.carousel_ride %}carousel{% else %}false{% endif %}"
-    data-bs-wrap="{{ instance.carousel_wrap|lower }}"
-    >
-    {% if instance.carousel_indicators %}
-        <div class="carousel-indicators">
-            {% for plugin in instance.child_plugin_instances %}
-                <button type="button" data-bs-target="#carousel-{{ instance.pk|safe }}"
-                    data-bs-slide-to="{{ forloop.counter0 }}"
-                    {% if forloop.first %} class="active"{% endif %}>
-                </button>
-            {% endfor %}
-        </div>
-    {% endif %}
+{% load i18n cms_tags %}
+<{{ instance.tag_type }}{{ instance.get_attributes }}
+id="carousel-{{ instance.pk|safe }}"
+data-bs-interval="{{ instance.carousel_interval|lower }}"
+data-bs-keyboard="{{ instance.carousel_keyboard|lower }}"
+data-bs-pause="{{ instance.carousel_pause|lower }}"
+data-bs-ride="{% if instance.carousel_ride %}carousel{% else %}false{% endif %}"
+data-bs-wrap="{{ instance.carousel_wrap|lower }}"
+>
+{% if instance.carousel_indicators %}
+    <div class="carousel-indicators">
+        {% for plugin in instance.child_plugin_instances %}
+            <button type="button" data-bs-target="#carousel-{{ instance.pk|safe }}"
+                data-bs-slide-to="{{ forloop.counter0 }}"
+                {% if forloop.first %} class="active"{% endif %}>
+            </button>
+        {% endfor %}
+    </div>
+{% endif %}
 
-    {% with width=1024 height=768 %}
-        <div class="carousel-inner">
-            {% for plugin in instance.child_plugin_instances %}
-                {% render_plugin plugin %}
-            {% endfor %}
-        </div>
-    {% endwith %}
+{% with width=1024 height=768 %}
+    <div class="carousel-inner">
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    </div>
+{% endwith %}
 
-    {% if instance.carousel_controls %}
-        <button class="carousel-control-prev" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="prev">
-            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-            <span class="visually-hidden-focusable">{% trans "Previous" %}</span>
-        </button>
-        <button class="carousel-control-next" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="next">
-            <span class="carousel-control-next-icon" aria-hidden="true"></span>
-            <span class="visually-hidden-focusable">{% trans "Next" %}</span>
-        </button>
-    {% endif %}
-    </{{ instance.tag_type }}>{% endspaceless %}
+{% if instance.carousel_controls %}
+    <button class="carousel-control-prev" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="prev">
+        <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+        <span class="visually-hidden-focusable">{% trans "Previous" %}</span>
+    </button>
+    <button class="carousel-control-next" data-bs-target="#carousel-{{ instance.pk|safe }}" type="button" data-bs-slide="next">
+        <span class="carousel-control-next-icon" aria-hidden="true"></span>
+        <span class="visually-hidden-focusable">{% trans "Next" %}</span>
+    </button>
+{% endif %}
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/image.html b/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/image.html
index cd6bdef4..3efd3cd5 100644
--- a/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/image.html
+++ b/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/image.html
@@ -1,13 +1,13 @@
-{% load cms_tags easy_thumbnails_tags %}{% spaceless %}
-    {% if instance.rel_image %}
-        {% thumbnail instance.rel_image options.size crop=options.crop upscale=options.upscale subject_location=instance.rel_image.subject_location as thumbnail %}
+{% load cms_tags easy_thumbnails_tags %}
+{% if instance.rel_image %}
+    {% thumbnail instance.rel_image options.size crop=options.crop upscale=options.upscale subject_location=instance.rel_image.subject_location as thumbnail %}
 
-        <img class="d-block w-100" src="{{ thumbnail.url }}" alt="{{ instance.rel_image.default_alt_text|default:'' }}" />
-    {% else %}
-        <div class="d-block w-100"
-            style="aspect-ratio: {{ aspect_ratio }}">
-            {% for plugin in instance.child_plugin_instances %}
-                {% render_plugin plugin %}
-            {% endfor %}
-        </div>
-    {% endif %}{% endspaceless %}
+    <img class="d-block w-100" src="{{ thumbnail.url }}" alt="{{ instance.rel_image.default_alt_text|default:'' }}" />
+{% else %}
+    <div class="d-block w-100"
+        style="aspect-ratio: {{ aspect_ratio }}">
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    </div>
+{% endif %}
diff --git a/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/slide.html b/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/slide.html
index bb13a91c..f632f5b4 100644
--- a/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/slide.html
+++ b/djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/slide.html
@@ -1,25 +1,22 @@
-{% load cms_tags frontend %}{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}>
-    {% if link %}
-        <a href="{{ link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}>
+{% load cms_tags frontend %}
+<{{ instance.tag_type }}{{ instance.get_attributes }}>
+{% if link %}
+    <a href="{{ link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}>
+{% endif %}
+{% with image=carousel_image.image %}
+    {% include "djangocms_frontend/bootstrap5/carousel/default/image.html" %}
+{% endwith %}
+{% if link %}
+    </a>
+{% endif %}
+<div class="carousel-caption d-none d-md-block">
+    {% if instance.carousel_content %}
+        {{ instance.carousel_content|html_safe }}
     {% endif %}
-
-    {% with image=carousel_image.image %}
-        {% include "djangocms_frontend/bootstrap5/carousel/default/image.html" %}
-    {% endwith %}
-
-    {% if link %}
-        </a>
+    {% if instance.rel_image %}
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
     {% endif %}
-
-    <div class="carousel-caption d-none d-md-block">
-        {% if instance.carousel_content %}
-            {{ instance.carousel_content|html_safe }}
-        {% endif %}
-        {% if instance.rel_image %}
-            {% for plugin in instance.child_plugin_instances %}
-                {% render_plugin plugin %}
-            {% endfor %}
-        {% endif %}
-    </div>
-    </{{ instance.tag_type }}>{% endspaceless %}
+</div>
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-container.html b/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-container.html
index e46f53fb..b0bfcd1b 100644
--- a/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-container.html
+++ b/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-container.html
@@ -1,13 +1,10 @@
 {% load cms_tags frontend %}
-{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}
+<{{ instance.tag_type }}{{ instance.get_attributes }}
     id="{{ instance.container_identifier }}"
     role="tabpanel"
     data-bs-parent="#parent-{{ parent.pk|safe }}"
-    aria-labelledby="trigger-{{ instance.container_identifier }}"
-    >
+    aria-labelledby="trigger-{{ instance.container_identifier }}">
     {% for plugin in instance.child_plugin_instances %}
         {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
     {% endfor %}
-    </{{ instance.tag_type }}>
-{% endspaceless %}
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-trigger.html b/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-trigger.html
index 907012e7..7e5bb29d 100644
--- a/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-trigger.html
+++ b/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-trigger.html
@@ -1,15 +1,12 @@
 {% load cms_tags frontend %}
-{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}
+<{{ instance.tag_type }}{{ instance.get_attributes }}
     id="trigger-{{ instance.trigger_identifier }}"
     role="tab"
     data-bs-toggle="collapse"
     data-bs-target="#{{ instance.trigger_identifier }}"
     aria-controls="{{ instance.trigger_identifier }}"
-    aria-expanded="false"
-    >
+    aria-expanded="false">
     {% for plugin in instance.child_plugin_instances %}
         {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
     {% endfor %}
-    </{{ instance.tag_type }}>
-{% endspaceless %}
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse.html b/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse.html
index 3ef29538..ef270c8c 100644
--- a/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse.html
+++ b/djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse.html
@@ -1,14 +1,12 @@
 {% load cms_tags frontend %}
-{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}
-    id="parent-{{ instance.pk|safe }}"
-    data-bs-children="{{ instance.collapse_siblings }}"
-    role="tablist"
-    >
-    {% with parent=instance %}
-        {% for plugin in instance.child_plugin_instances %}
-            {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
-        {% endfor %}
-    {% endwith %}
-    </{{ instance.tag_type }}>
-{% endspaceless %}
+<{{ instance.tag_type }}{{ instance.get_attributes }}
+id="parent-{{ instance.pk|safe }}"
+data-bs-children="{{ instance.collapse_siblings }}"
+role="tablist"
+>
+{% with parent=instance %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
+    {% endfor %}
+{% endwith %}
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/blockquote.html b/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/blockquote.html
index f256cef6..64cf1b24 100644
--- a/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/blockquote.html
+++ b/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/blockquote.html
@@ -1,23 +1,21 @@
 {% load cms_tags frontend %}
-{% spaceless %}
-    {# djlint:off #}
-    {% if instance.quote_origin %}
-        <figure{{ instance.get_attributes }}>
-        <blockquote class="blockquote">
-    {% else %}
-        <blockquote{{ instance.get_attributes }}>
-    {% endif %}
-    {# djlint:on #}
-        {% for plugin in instance.child_plugin_instances %}
-            {% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
-        {% empty %}{{ instance.quote_content|html_safe }}{% endfor %}
-    {# djlint:off #}
-    </blockquote>
-    {# djlint:on #}
-    {% if instance.quote_origin %}
-        <figcaption class="blockquote-footer">
-            {{ instance.quote_origin|safe_caption }}
-        </figcaption>
-        </figure>
-    {% endif %}
-{% endspaceless %}
+{# djlint:off #}
+{% if instance.quote_origin %}
+    <figure{{ instance.get_attributes }}>
+    <blockquote class="blockquote">
+{% else %}
+    <blockquote{{ instance.get_attributes }}>
+{% endif %}
+{# djlint:on #}
+    {% for plugin in instance.child_plugin_instances %}
+        {% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
+    {% empty %}{{ instance.quote_content|html_safe }}{% endfor %}
+{# djlint:off #}
+</blockquote>
+{# djlint:on #}
+{% if instance.quote_origin %}
+    <figcaption class="blockquote-footer">
+        {{ instance.quote_origin|safe_caption }}
+    </figcaption>
+    </figure>
+{% endif %}
diff --git a/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/figure.html b/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/figure.html
index 44e6e251..b3d90933 100644
--- a/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/figure.html
+++ b/djangocms_frontend/contrib/content/templates/djangocms_frontend/bootstrap5/figure.html
@@ -1,9 +1,7 @@
 {% load i18n cms_tags frontend %}
-{% spaceless %}
-    <figure {{ instance.get_attributes }}>
-        {% for plugin in instance.child_plugin_instances %}
-            {% with forloop=parentloop parent=instance %}{% render_plugin plugin %}{% endwith %}
-        {% endfor %}
-        <figcaption class="figure-caption{% if figure_alignment %} text-{{ figure_alignment }}{% endif %}">{{ instance.figure_caption|safe_caption }}</figcaption>
-    </figure>
-{% endspaceless %}
+<figure {{ instance.get_attributes }}>
+    {% for plugin in instance.child_plugin_instances %}
+        {% with forloop=parentloop parent=instance %}{% render_plugin plugin %}{% endwith %}
+    {% endfor %}
+    <figcaption class="figure-caption{% if figure_alignment %} text-{{ figure_alignment }}{% endif %}">{{ instance.figure_caption|safe_caption }}</figcaption>
+</figure>
diff --git a/djangocms_frontend/contrib/grid/templates/djangocms_frontend/bootstrap5/grid_row.html b/djangocms_frontend/contrib/grid/templates/djangocms_frontend/bootstrap5/grid_row.html
index 5d6434f3..9a3c8d46 100644
--- a/djangocms_frontend/contrib/grid/templates/djangocms_frontend/bootstrap5/grid_row.html
+++ b/djangocms_frontend/contrib/grid/templates/djangocms_frontend/bootstrap5/grid_row.html
@@ -1,8 +1,8 @@
-{% load cms_tags %}{% spaceless %}
+{% load cms_tags %}
     <{{ instance.tag_type }}{{ instance.get_attributes }}>
     {% for plugin in instance.child_plugin_instances %}
         {% if plugin.plugin_type == "CardPlugin" %}<div class="col mb-3">{% endif %}
         {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
         {% if plugin.plugin_type == "CardPlugin" %}</div>{% endif %}
     {% endfor %}
-    </{{ instance.tag_type }}>{% endspaceless %}
+    </{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/icon/templates/djangocms_frontend/bootstrap5/icon.html b/djangocms_frontend/contrib/icon/templates/djangocms_frontend/bootstrap5/icon.html
index 77510083..1ed84837 100644
--- a/djangocms_frontend/contrib/icon/templates/djangocms_frontend/bootstrap5/icon.html
+++ b/djangocms_frontend/contrib/icon/templates/djangocms_frontend/bootstrap5/icon.html
@@ -1,6 +1,6 @@
-{% load cms_tags sekizai_tags icon_tags %}{% add_css_for_icon instance.icon %}{% spaceless %}
+{% load cms_tags sekizai_tags icon_tags %}{% add_css_for_icon instance.icon %}
     <{{ instance.tag_type }}{{ instance.get_attributes }}>
     {% for plugin in instance.child_plugin_instances %}
         {% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
     {% empty %}{{ instance.simple_content }}{% endfor %}{{ icon_text }}
-    </{{ instance.tag_type }}>{% endspaceless %}
+    </{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/image/templates/djangocms_frontend/bootstrap5/default/image.html b/djangocms_frontend/contrib/image/templates/djangocms_frontend/bootstrap5/default/image.html
index cc86554f..4878d3ac 100644
--- a/djangocms_frontend/contrib/image/templates/djangocms_frontend/bootstrap5/default/image.html
+++ b/djangocms_frontend/contrib/image/templates/djangocms_frontend/bootstrap5/default/image.html
@@ -1,16 +1,15 @@
-{% load thumbnail frontend %}{% spaceless %}
-    {% if picture_link %}
-        <a href="{{ picture_link }}"
-            {% if instance.target %} target="{{ instance.target }}"{% endif %}
-            {% get_attributes instance.link_attributes %}>
+{% load thumbnail frontend %}
+{% if picture_link %}
+    <a href="{{ picture_link }}"
+        {% if instance.target %} target="{{ instance.target }}"{% endif %}
+        {% get_attributes instance.link_attributes %}>
+{% endif %}
+<img src="{{ instance.img_src }}" {% if not instance.attributes.alt and instance.rel_image.default_alt_text %}alt="{{ instance.rel_image.default_alt_text }}"{% endif %} {% if instance.width %} width="{{ instance.width|safe }}"{% endif %} {% if instance.height %} height="{{ instance.height|safe }}"{% endif %}
+    {% if img_srcset_data %}
+        srcset="{% for size, thumb in img_srcset_data %}{{ thumb.url }} {{ size|safe }}w,{% endfor %}{{ instance.img_src }} {{ picture_size.size.0|safe }}w"
+        sizes="{% for size, thumb in img_srcset_data %}(max-width: {{ size|safe }}px) {{ size|safe }}px, {% endfor %} {{ picture_size.size.0|safe }}px"
     {% endif %}
-    <img src="{{ instance.img_src }}" {% if not instance.attributes.alt and instance.rel_image.default_alt_text %}alt="{{ instance.rel_image.default_alt_text }}"{% endif %} {% if instance.width %} width="{{ instance.width|safe }}"{% endif %} {% if instance.height %} height="{{ instance.height|safe }}"{% endif %}
-        {% if img_srcset_data %}
-            srcset="{% for size, thumb in img_srcset_data %}{{ thumb.url }} {{ size|safe }}w,{% endfor %}{{ instance.img_src }} {{ picture_size.size.0|safe }}w"
-            sizes="{% for size, thumb in img_srcset_data %}(max-width: {{ size|safe }}px) {{ size|safe }}px, {% endfor %} {{ picture_size.size.0|safe }}px"
-        {% endif %}
-        {{ instance.get_attributes }} />
-    {% if picture_link %}
-        </a>
-    {% endif %}
-{% endspaceless %}
+    {{ instance.get_attributes }} />
+{% if picture_link %}
+    </a>
+{% endif %}
diff --git a/djangocms_frontend/contrib/jumbotron/templates/djangocms_frontend/bootstrap5/jumbotron/default/jumbotron.html b/djangocms_frontend/contrib/jumbotron/templates/djangocms_frontend/bootstrap5/jumbotron/default/jumbotron.html
index e34e41e9..a5dbba88 100644
--- a/djangocms_frontend/contrib/jumbotron/templates/djangocms_frontend/bootstrap5/jumbotron/default/jumbotron.html
+++ b/djangocms_frontend/contrib/jumbotron/templates/djangocms_frontend/bootstrap5/jumbotron/default/jumbotron.html
@@ -1,11 +1,10 @@
-{% load cms_tags frontend %}{% spaceless %}
-    <{{ instance.tag_type }} {{ instance.get_attributes }}>
-        <div class="p-4 my-0">
-            <div class="container{% if instance.jumbotron_fluid %}-fluid{% endif %} py-3">
-                {% for plugin in instance.child_plugin_instances %}
-                    {% with forloop=parentloop %}{% render_plugin plugin %}{% endwith %}
-                {% endfor %}
-            </div>
+{% load cms_tags frontend %}
+<{{ instance.tag_type }} {{ instance.get_attributes }}>
+    <div class="p-4 my-0">
+        <div class="container{% if instance.jumbotron_fluid %}-fluid{% endif %} py-3">
+            {% for plugin in instance.child_plugin_instances %}
+                {% with forloop=parentloop %}{% render_plugin plugin %}{% endwith %}
+            {% endfor %}
         </div>
-    </{{ instance.tag_type }}>
-{% endspaceless %}
+    </div>
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/media/templates/djangocms_frontend/bootstrap5/media.html b/djangocms_frontend/contrib/media/templates/djangocms_frontend/bootstrap5/media.html
index 0b499c68..c4c05c5c 100644
--- a/djangocms_frontend/contrib/media/templates/djangocms_frontend/bootstrap5/media.html
+++ b/djangocms_frontend/contrib/media/templates/djangocms_frontend/bootstrap5/media.html
@@ -1,12 +1,10 @@
 {% load cms_tags frontend %}
-{% spaceless %}
-    <{{ instance.tag_type }} {{ instance.get_attributes }}>
-        <div class="flex-shrink-0">
-            {% for plugin in instance.child_plugin_instances %}
-                {% if plugin.plugin_type == "MediaBodyPlugin" %}
-                    </div>
-                {% endif %}
-                {% with forloop=parentloop %}{% render_plugin plugin %}{% endwith %}
-            {% endfor %}
-    </{{ instance.tag_type }}>
-{% endspaceless %}
+<{{ instance.tag_type }} {{ instance.get_attributes }}>
+    <div class="flex-shrink-0">
+        {% for plugin in instance.child_plugin_instances %}
+            {% if plugin.plugin_type == "MediaBodyPlugin" %}
+                </div>
+            {% endif %}
+            {% with forloop=parentloop %}{% render_plugin plugin %}{% endwith %}
+        {% endfor %}
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/item.html b/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/item.html
index ae0bf65a..438b296c 100644
--- a/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/item.html
+++ b/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/item.html
@@ -1,10 +1,9 @@
-{% load cms_tags %}{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}
-     id="tab-{{ instance.pk|safe }}"
-     aria-labelledby="tab-label-{{ instance.pk|safe }}"
-     role="tabpanel">
-        {% for plugin in instance.child_plugin_instances %}
-            {% render_plugin plugin %}
-        {% endfor %}
-    </{{ instance.tag_type }}>
-{% endspaceless %}
+{% load cms_tags %}
+<{{ instance.tag_type }}{{ instance.get_attributes }}
+ id="tab-{{ instance.pk|safe }}"
+ aria-labelledby="tab-label-{{ instance.pk|safe }}"
+ role="tabpanel">
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
+</{{ instance.tag_type }}>
diff --git a/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/tabs.html b/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/tabs.html
index 0941cd46..959dfd92 100644
--- a/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/tabs.html
+++ b/djangocms_frontend/contrib/tabs/templates/djangocms_frontend/bootstrap5/tabs/default/tabs.html
@@ -18,12 +18,12 @@
         {% endfor %}
     </ul>
 
-    <div class="tab-content{% if instance.tab_alignment == "flex-column" %} flex-fill{% endif %}">
+    <div class="tab-content{% if instance.tab_alignment == "flex-column" %} flex-fill{% endif %}">{% endspaceless %}
         {% for plugin in instance.child_plugin_instances %}
             {% with parent=instance parentloop=forloop %}
                 {% render_plugin plugin %}
             {% endwith %}
-        {% endfor %}
+        {% endfor %}{% spaceless %}
     </div>
     </{{ instance.tag_type }}>
 {% endspaceless %}
diff --git a/djangocms_frontend/templates/djangocms_frontend.html b/djangocms_frontend/templates/djangocms_frontend.html
index 40b74315..ee093b37 100644
--- a/djangocms_frontend/templates/djangocms_frontend.html
+++ b/djangocms_frontend/templates/djangocms_frontend.html
@@ -21,8 +21,7 @@
     {% block page_head %}{% endblock %}
     </head>
     <body {% block body_attrs %}{% endblock %}>
-{% endspaceless %}{% cms_toolbar %}{% spaceless %}
-    {% block navbar %}{% endblock %}
+{% endspaceless %}{% cms_toolbar %}{% block navbar %}{% endblock %}
     {% block content %}
         <section>
             {% placeholder "Page Content" %}
@@ -30,7 +29,7 @@
         <footer>
             {% static_placeholder "Footer" %}
         </footer>
-    {% endblock content %}
+    {% endblock content %}{% spaceless %}
     {% block base_js %}{% endblock %}
 {% endspaceless %}{% render_block 'js' %}{% spaceless %}
     {% block end_js %}{% endblock %}
diff --git a/djangocms_frontend/templates/djangocms_frontend/html_container.html b/djangocms_frontend/templates/djangocms_frontend/html_container.html
index aecbc842..3d53526d 100644
--- a/djangocms_frontend/templates/djangocms_frontend/html_container.html
+++ b/djangocms_frontend/templates/djangocms_frontend/html_container.html
@@ -1,6 +1,5 @@
-{% load cms_tags %}{% spaceless %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}>
+{% load cms_tags %}<{{ instance.tag_type }}{{ instance.get_attributes }}>
     {% for plugin in instance.child_plugin_instances %}
         {% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
     {% empty %}{{ instance.simple_content }}{% endfor %}
-    </{{ instance.tag_type }}>{% endspaceless %}
+    </{{ instance.tag_type }}>