Merge branch 'release/4.1.2'

getgrav · Oct 7, 2020 · 79c9155 · 79c9155
2 parents b79da47 + 07d9839
commit 79c9155
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v4.1.2
+## 10/07/2020
+
+1. [](#bugfix)
+    * Added some missing class attributes
+
 # v4.1.1
 ## 09/01/2020
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 4.1.1
+version: 4.1.2
 testing: false
 description: Enables the forms handling
 icon: check-square

diff --git a/templates/forms/fields/checkbox/checkbox.html.twig b/templates/forms/fields/checkbox/checkbox.html.twig
@@ -16,7 +16,7 @@
             {# input attribute structures #}
             {% block input_attributes %}
                 id="{{ id|e }}"
-                {% if field.classes is defined %}class="{{ field.classes }}" {% endif %}
+                class="{{ form_field_checkbox_classes }} {{ field.classes }}"
                 {% if field.style is defined %}style="{{ field.style|e }}" {% endif %}
                 {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
                 {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}

diff --git a/templates/forms/fields/checkboxes/checkboxes.html.twig b/templates/forms/fields/checkboxes/checkboxes.html.twig
@@ -26,10 +26,9 @@
                    id="{{ id|e }}"
                    value="{{ val|e }}"
                    name="{{ (scope ~ field.name)|fieldName ~ '[' ~ name ~ ']' }}"
+                   class="{{ form_field_checkbox_classes }} {{ field.classes }}"
                    {% if checked %}checked="checked"{% endif %}
-                   {% if field.classes is defined %}class="{{ field.classes }}" {% endif %}
                    {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
-
             >
             <label style="display: inline" for="{{ id|e }}">
                 {% if help %}

diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig
@@ -12,7 +12,7 @@
                    value="{{ key|e }}"
                    id="{{ id|e }}"
                    name="{{ (scope ~ field.name)|fieldName }}"
-                   {% if field.classes is defined %}class="{{ field.classes }}" {% endif %}
+                   class="{{ form_field_radio_classes }} {{ field.classes }}"
                    {% if key == value %}checked="checked" {% endif %}
                    {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
                    {% if required %}required="required"{% endif %}