Merge branch 'release/1.10.33.1'

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.10.33.1
+## 04/25/2022
+
+1. [](#bugfix)
+   * Reverted [PR#2265](https://github.com/getgrav/grav-plugin-admin/pull/2265) as it broke sections output.
+
 # v1.10.33
 ## 04/25/2022
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.33
+version: 1.10.33.1
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

themes/grav/templates/forms/fields/section/section.html.twig

@@ -3,18 +3,17 @@
 {% block field %}
 {% if field.security is empty or authorize(array(field.security)) %}
 
+    {% if field.title or field.underline %}
+    <h1 class="{{ field.classes }} {{ field.underline ?: 'no_underline' }}">{{ field.title|t }}</h1>
+    {% endif %}
+
+    {% if field.text %}
+    <p>{{ field.text|t|markdown|raw }}</p>
+    {% endif %}
+
     {% embed 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields} %}
         {% block outer_markup_field_open %}
             <div class="form-section {{ field.field_classes }} {{ field.outer_classes }}">
-
-            {% if field.title or field.underline %}
-            <h1 class="{{ field.classes }} {{ field.underline ?: 'no_underline' }}">{{ field.title|t }}</h1>
-            {% endif %}
-
-            {% if field.text %}
-            <div class="section-text">{{ field.text|t|markdown|raw }}</div>
-            {% endif %}
-
         {% endblock %}
         {% block outer_markup_field_close %}
             </div>