Merge branch 'release/v6.2.0'

artistro08 · Feb 10, 2023 · 1c835de · 1c835de
2 parents 00516e8 + a2448c7
commit 1c835de
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 28 deletions.
diff --git a/pages/post.htm b/pages/post.htm
@@ -30,21 +30,23 @@
     {% if post is empty %}
         {% do abort('404') %}
     {% else %}
-        {% if post.entry_type == 'simple' %}
-            {% partial 'blog/header' post = post %}
-            <section>
-                <div class="container">
-                    {{ post.content|raw }}
-                </div>
-            </section>
-        {% endif %}
+        <article>
+            {% if post.entry_type == 'simple' %}
+                {% partial 'blog/header' post = post %}
+                <section>
+                    <div class="container">
+                        {{ post.content|raw }}
+                    </div>
+                </section>
+            {% endif %}
 
-        {% if post.entry_type == 'builder' %}
-            {% partial 'blog/header' post = post %}
-            {% for section in post.builder %}
-                {% partial 'builder/items' section=section %}
-            {% endfor %}
-        {% endif %}
+            {% if post.entry_type == 'builder' %}
+                {% partial 'blog/header' post = post %}
+                {% for section in post.builder %}
+                    {% partial 'builder/items' section=section %}
+                {% endfor %}
+            {% endif %}
+        </article>
     {% endif %}
 
 {% else %}

diff --git a/partials/builder/sections/events.htm b/partials/builder/sections/events.htm
@@ -71,7 +71,7 @@
             {% set older_events = older_events.limit(section.limit).get() %}
         {% endif %}
     {% endif %}
-    <section 
+    <{{ section.html_tag == "default" ? "section" : section.html_tag }} 
             {{ section.html_anchor|length ? 'id="' ~  section.html_anchor  ~ '"' }}
             class="{% if section.css_classes|length %}
                         {% for class in section.css_classes|split(',') %}
@@ -358,5 +358,5 @@ <h3>
                 </div>
             </div>
         </div>
-    </section>
+    </{{ section.html_tag == "default" ? "section" : section.html_tag }}>
 {% endif %}
diff --git a/partials/builder/sections/form.htm b/partials/builder/sections/form.htm
@@ -1,4 +1,4 @@
-<section 
+<{{ section.html_tag == "default" ? "section" : section.html_tag }} 
         {{ section.html_anchor|length ? 'id="' ~  section.html_anchor  ~ '"' }}
         class="{% if section.css_classes|length %}
                     {% for class in section.css_classes|split(',') %}
@@ -21,4 +21,4 @@
             </div>
         </div>
     </div>
-</section>
+</{{ section.html_tag == "default" ? "section" : section.html_tag }}>
diff --git a/partials/builder/sections/hero.htm b/partials/builder/sections/hero.htm
@@ -23,7 +23,7 @@
     {% set heroImageAlt = section.blog_category.title %}
 {% endif %}
 
-<header {{ section.html_anchor|length ? 'id=' ~  section.html_anchor  ~ '' }}
+<{{ section.html_tag == "default" ? "header" : section.html_tag }} {{ section.html_anchor|length ? 'id=' ~  section.html_anchor  ~ '' }}
         class="hero
                {{ section.size == 'small' ? 'small-hero' }} 
                bg-dark 
@@ -54,4 +54,4 @@
             <img class="w-100 h-100 opacity-25" style="object-fit: cover; object-position: center" src="{{ heroImage|media|resize(1920) }}" alt="{{ heroImageAlt }}">
         </div>
     {% endif %}
-</header>
+</{{ section.html_tag == "default" ? "header" : section.html_tag }}>
diff --git a/partials/builder/sections/posts.htm b/partials/builder/sections/posts.htm
@@ -53,7 +53,7 @@
         {% endif %}
     {% endif %}
 
-    <section 
+    <{{ section.html_tag == "default" ? "section" : section.html_tag }} 
             {{ section.html_anchor|length ? 'id="' ~  section.html_anchor  ~ '"' }}
             class="{% if section.css_classes|length %}
                         {% for class in section.css_classes|split(',') %}
@@ -105,5 +105,5 @@ <h3 class="text-decoration-none text-dark fs-5">
                 </div>
             {% endif %}
         </div>
-    </section>
+    </{{ section.html_tag == "default" ? "section" : section.html_tag }}>
 {% endif %}
diff --git a/partials/builder/sections/products.htm b/partials/builder/sections/products.htm
@@ -53,7 +53,7 @@
         {% endif %}
     {% endif %}
 
-    <section 
+    <{{ section.html_tag == "default" ? "section" : section.html_tag }} 
             {{ section.html_anchor|length ? 'id="' ~  section.html_anchor  ~ '"' }}
             class="{% if section.css_classes|length %}
                         {% for class in section.css_classes|split(',') %}
@@ -93,5 +93,5 @@ <h3 class="text-decoration-none text-dark fs-5">{{ product.title }}</h3>
                 </div>
             {% endif %}
         </div>
-    </section>
+    </{{ section.html_tag == "default" ? "section" : section.html_tag }}>
 {% endif %}
diff --git a/partials/builder/sections/section.htm b/partials/builder/sections/section.htm
@@ -1,7 +1,7 @@
 [global settings]
 handle = "Content\Settings"
 ==
-<section 
+<{{ section.html_tag == "default" ? "section" : section.html_tag }} 
         {{ section.html_anchor|length ? 'id=' ~  section.html_anchor  ~ '' }}
         class="{% if section.css_classes|length %}
                     {% for class in section.css_classes|split(',') %}
@@ -62,4 +62,4 @@
             {% endfor %}
         </div>
     </div>
-</section>
+</{{ section.html_tag == "default" ? "section" : section.html_tag }}>
diff --git a/seeds/blueprints/content/mixins/builder/general_options/advanced_fields.yaml b/seeds/blueprints/content/mixins/builder/general_options/advanced_fields.yaml
@@ -26,4 +26,14 @@ fields:
     span: left
     options: 
       container: Normal
-      container-fluid: Fluid
+      container-fluid: Fluid
+  html_tag:
+    type: dropdown
+    label: HTML Tag type
+    commentAbove: Override this block tag to one of the options below. Useful for SEO and Semantic HTML
+    span: right
+    options:
+      default: Default
+      section: Section
+      header: Header
+      article: Article
diff --git a/version.yaml b/version.yaml
@@ -72,4 +72,5 @@ v6.1.6: Added theme preview image
 v6.1.7: Updated Main Menu seeds
 v6.1.8: Disable cart related pages, partials and layouts if shop is disabled. Also updated Shop menu icon
 v6.1.9: Added background to navbar
-v6.1.10: Hide checkout button in cart-data.htm partial if no cart items
+v6.1.10: Hide checkout button in cart-data.htm partial if no cart items
+v6.2.0: Add ability to pick HTML tags for builder blocks.