Merge fieldclass into input element

moccu · Feb 3, 2017 · 60d4a5b · 60d4a5b
1 parent 05b2897
commit 60d4a5b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/barbeque/templates/barbeque/forms/field/checkboxselectmultiple.html b/barbeque/templates/barbeque/forms/field/checkboxselectmultiple.html
@@ -3,15 +3,14 @@
 		{% for choice in choices %}
 			<li>
 				<label class="form-field-checkboxinput{% if field.errors %} has-errors{% endif %}" for="{{ attrs.id }}_{{ forloop.counter }}">
-					<span class="field">
-						<input
-							{% if choice.0 in value %}checked="checked"{% endif %}
-							type="checkbox"
-							id="{{ attrs.id }}_{{ forloop.counter }}"
-							name="{{ name }}"
-							value="{{ choice.0 }}"
-						>
-					</span>
+					<input
+						{% if choice.0 in value %}checked="checked"{% endif %}
+						type="checkbox"
+						id="{{ attrs.id }}_{{ forloop.counter }}"
+						name="{{ name }}"
+						value="{{ choice.0 }}"
+						class="field"
+					/>
 					<span class="label">
 						{{ choice.1 }}
 					</span>

diff --git a/barbeque/templates/barbeque/forms/field/radioselect.html b/barbeque/templates/barbeque/forms/field/radioselect.html
@@ -3,16 +3,15 @@
 		{% for choice in choices %}
 			<li>
 				<label for="{{ attrs.id }}_{{ forloop.counter }}" class="radioselect">
-					<span class="field">
-						<input
-							{% if choice.0 in value %} checked{% endif %}
-							type="radio"
-							id="{{ attrs.id }}_{{ forloop.counter }}"
-							name="{{ name }}"
-							value="{{ choice.0 }}"
-							{% if required %} required{% endif %}
-						>
-					</span>
+					<input
+						{% if choice.0 in value %}checked="checked"{% endif %}
+						type="radio"
+						id="{{ attrs.id }}_{{ forloop.counter }}"
+						name="{{ name }}"
+						value="{{ choice.0 }}"
+						class="field"
+						{% if required %} required{% endif %}
+					/>
 					<span class="label">
 						{{ choice.1 }}
 					</span>