cms/section_block: add tmplate for section block to remove issues of …

…2 block types in structured page
liqd · Feb 18, 2021 · a69db99 · a69db99
1 parent 0ec3455
commit a69db99
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/cms/home/blocks.py b/cms/home/blocks.py
@@ -133,6 +133,9 @@ class SectionBlock(StructBlock):
         ]
     )
 
+    class Meta:
+        template = 'cms_home/blocks/section_block.html'
+
 
 class ThreeBlogEntriesBlock(StructBlock):
     title = CharBlock(required=False,

diff --git a/cms/home/templates/cms_home/blocks/section_block.html b/cms/home/templates/cms_home/blocks/section_block.html
@@ -0,0 +1,8 @@
+{% load wagtailimages_tags wagtailcore_tags %}
+
+<div>
+    <h2>{{ block.value.title }}</h2>
+    {% for block_content in block.value.content %}
+        {% include_block block_content %}
+    {% endfor %}
+</div>
diff --git a/cms/home/templates/cms_home/structured_text_page.html b/cms/home/templates/cms_home/structured_text_page.html
@@ -7,34 +7,21 @@
 {% block content %}
     <div class="container structured-page">
         <div class="row">
-        <div class="d-none col-md-3 d-md-block">
-            <ul id="structured-page-side-nav" class="nav flex-column structured-page-side-nav">
+            <div class="d-none col-md-3 d-md-block">
+                <ul id="structured-page-side-nav" class="nav flex-column structured-page-side-nav">
+                    {% for block in page.body %}
+                        <li role="presentation"><a href="#section{{ forloop.counter }}" class="structured-page-side-nav-link"><i class="fa fa-angle-right" aria-hidden="true"></i> {{ block.value.title }}</a></li>
+                    {% endfor %}
+                </ul>
+            </div>
+            <div class="col-md-7 structured-page-sections-container" data-spy="scroll" data-target="#structured-page-side-nav" data-offset="70">
                 {% for block in page.body %}
-                    <li role="presentation"><a href="#section{{ forloop.counter }}" class="structured-page-side-nav-link"><i class="fa fa-angle-right" aria-hidden="true"></i> {{ block.value.title }}</a></li>
-                {% endfor %}
-            </ul>
-        </div>
-        <div class="col-md-7 structured-page-sections-container" data-spy="scroll" data-target="#structured-page-side-nav" data-offset="70">
-            {% for block in page.body %}
-              {% if block.block_types == richtext_columns %}
-                <span class="structured-page-section__anchor" id="section{{ forloop.counter }}"></span>
-                <h2>{{ block.value.title }}</h2>
-                <div class="clearfix">
-                {% include_block block.value.content %}
-                </div>
-              {% else %}
                 <span class="structured-page-section__anchor" id="section{{ forloop.counter }}"></span>
-                <div class="structured-page-section">
-                    <h2>{{ block.value.title }}</h2>
-                    <div class="clearfix">
-                    {% for block_content in block.value.content %}
-                        {% include_block block_content %}
-                    {% endfor %}
-                    </div>
+                <div class="structured-page-section clearfix">
+                  {% include_block block %}
                 </div>
-              {% endif %}
-            {% endfor %}
-        </div>
+                {% endfor %}
+            </div>
         </div>
     </div>
 {% endblock %}