Add new form.html template to make creating forms even easier

oscar/templates/oscar/dashboard/catalogue/category_form.html

@@ -28,9 +28,5 @@
 {% endblock header %}
 
 {% block dashboard_content %}
-	<form action="." class="wysiwyg" method="post" enctype="multipart/form-data">{% csrf_token %}
-		{{ form.as_p }}
-		<button type="submit" class="btn btn-primary btn-large">{% trans "Save" %}</button> {% trans "or" %}
-		<a href="{% url dashboard:catalogue-category-list %}">{% trans "cancel" %}</a>
-	</form>
+	{% include 'partials/form.html' with includes_files=1 class='wysiwyg' %}
 {% endblock dashboard_content %}

oscar/templates/oscar/dashboard/vouchers/voucher_delete.html

@@ -40,7 +40,7 @@
 		</tbody>
 	</table>
 
-	<form action="." method="post" class="">
+	<form action="." method="post" class="form-horizontal">
 		{% csrf_token %}
 		<div class="form-actions">
 			<button class="btn btn-danger btn-large" type="submit">{% trans "Delete" %}</button> {% trans "or" %}

oscar/templates/oscar/partials/form.html

@@ -0,0 +1,9 @@
+{% load i18n %}
+<form class="form-horizontal {{ class }}" method="{{ method|default:"post" }}" action="{{ action|default:"." }}" {% if includes_files %}enctype="multipart/form-data"{% endif %}>
+	{% if not method == "get" %}{% csrf_token %}{% endif %}
+	{% include 'partials/form_fields.html' %}
+	<div class="form-actions">
+		<button class="btn btn-large btn-primary" type="submit">{% trans "Save" %}</button>
+		{% trans "or" %} <a href="#" onclick="history.go(-1);return false" >{% trans "cancel" %}</a>
+	</div>
+</form>

oscar/templates/oscar/partials/form_field.html

@@ -1,6 +1,9 @@
 {% load form_tags %}
 
-{# Make the field widget type available to templates #}
+{% comment %}
+Make the field widget type available to templates so we can mark-up
+checkboxes differently to other widgets.
+{% endcomment %}
 {% annotate_form_field field %}
 
 <div class="control-group {% for error in field.errors %}error{% endfor %}">

oscar/templates/oscar/partials/form_fields.html

@@ -1,4 +1,8 @@
 <span class="help-block">{{ form.non_field_errors }}</span>
 {% for field in form %}
+	{% comment %} 
+	We use a separate template for each field so that forms can be rendered
+	field-by-field easily #}
+	{% endcomment %}
 	{% include 'partials/form_field.html' with field=field %}
 {% endfor %}

oscar/templates/oscar/partials/form_fields_inline.html

@@ -1,3 +1,4 @@
+<span class="help-block">{{ form.non_field_errors }}</span>
 {% for field in form %}
     {% if field.is_hidden %}
         {{ field }}