added root-level block to field base template, removed erroneous checkbox and radiobutton templates, improved groupablefield template

themes/default/templates/form/field/field.html

@@ -1,40 +1,43 @@
-<div class="{{ content.css_classes }}">
+{% block root %}
+    <div class="{{ content.css_classes }}">
 
-    {% block errors %}
-        {% if content.errors|length %}
-            <ul class="form-field-errors">
-                {% for error in content.errors %}
-                    <li class="error">{{ error }}</li>
-                {% endfor %}
-            </ul>
-        {% endif %}
-    {% endblock %}
-
-    {% block label %}
-        {% if content.label %}
-            <label {% if content.id %}for="{{ content.id }}"{% endif %}>{{ content.label }}</label>
-        {% endif %}
-    {% endblock %}
-
-    {% block field %}
-        <input
-            {% if content.id %}
-                id="{{ content.id }}"
+        {% block label %}
+            {% if content.label %}
+                <label {% if content.id %}for="{{ content.id }}"{% endif %}>{{ content.label }}</label>
             {% endif %}
-            {% if not content.valid %}
-                class="invalid"
-            {% endif %}
-            type="{{ content.input_type }}"
-            name="{{ content.name_qualified }}"
-            {% if not content.value is none %}
-                value="{{ content.value }}"
-            {% endif %}
-        />
-    {% endblock %}
+        {% endblock %}
 
-    {% block help %}
-        {% if content.help %}
-            <aside class="form-field-help">{{ content.help }}</aside>
-        {% endif %}
-    {% endblock %}
-</div>
+        {% block field %}
+            <input
+                {% if content.id %}
+                    id="{{ content.id }}"
+                {% endif %}
+                {% if not content.valid %}
+                    class="invalid"
+                {% endif %}
+                type="{{ content.input_type }}"
+                name="{{ content.name_qualified }}"
+                {% if not content.value is none %}
+                    value="{{ content.value }}"
+                {% endif %}
+            />
+        {% endblock %}
+
+        {% block help %}
+            {% if content.help %}
+                <aside class="form-field-help">{{ content.help }}</aside>
+            {% endif %}
+        {% endblock %}
+        
+        {% block errors %}
+            {% if content.errors|length %}
+                <ul class="form-field-errors">
+                    {% for error in content.errors %}
+                        <li class="error">{{ error }}</li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+        {% endblock %}
+
+    </div>
+{% endblock %}

themes/default/templates/form/field/groupablefield.html

@@ -23,3 +23,14 @@
         {% endif %}
     />
 {% endblock %}
+
+{% block root %}
+    <div class="{{ content.css_classes }}">
+
+        {{ self.field() }}
+        {{ self.label() }}
+        {{ self.help() }}
+        {{ self.errors() }}
+
+    </div>
+{% endblock %}