Updated for django-1.7

formhelper/apps.py

@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+
+from django import apps
+
+
+class AppConfig(apps.AppConfig):
+    name = 'passreset'
+    verbose_name = 'Passowrd Reset'

formhelper/templates/formhelper/error_list.html

@@ -0,0 +1,18 @@
+{% load formhelper %}
+{% if form.errors %}
+<ul class="errorlist{% if non_field_erros %} non-field-errors{% endif %}{% if field_errors %} field-errors{% endif %}">
+{% for err in non_field_errors %}
+  <li class="non-field">{{ err }}</li>
+{% endfor %}
+{% if suppress_is_required and has_is_required_error %}
+  <li class="required-fields">Please complete all required fields.</li>
+{% endif %}
+{% for field, error in field_errors %}
+{% if field in required_field_errors %}
+  <li class="field required">{{ field.label }} is required</li>
+{% else %}
+  <li class="field">{{ error }}</li>
+{% endif %}
+{% endfor %}
+</ul>
+{% endif %}

formhelper/templates/formhelper/includes/field.html → formhelper/templates/formhelper/field.html

@@ -2,7 +2,7 @@
 <div class="field {{ field|class_names }}">
   <label for="{{ field.id_for_label }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}</label>
   {% if not hide_field_errors %}
-  {{ field.errors }}
+  <span class="error">{{ field.errors.0 }}</span>
   {% endif %}
   {{ field }}
   {% if field.help_text %}<p class="help-text">{{ field.help_text|safe }}</p>{% endif %}

formhelper/templates/formhelper/includes/form.html → formhelper/templates/formhelper/form.html

@@ -4,5 +4,5 @@
   {{ field }}
 {% endfor %}
 {% for field in form.visible_fields %}
-  {% form_field field %}
+  {% form_group field %}
 {% endfor %}

formhelper/templates/formhelper/includes/form_row.html → formhelper/templates/formhelper/form_group.html

@@ -1,6 +1,6 @@
 {% load formhelper %}
-<div class="form-row">
+<div class="form-group">
   {% for field in fields %}
-  {% form_field form field %}
+  {% include "formhelper/field.html" %}
   {% endfor %}
 </div>

formhelper/templates/formhelper/includes/formset.html → formhelper/templates/formhelper/formset.html

@@ -2,10 +2,10 @@
 <div class="formset">
   {{ formset.management_form }}
   {% for form in formset %}
-    {% include "formhelper/includes/formset_form.html" %}
+    {% include "formhelper/formset_form.html" %}
   {% endfor %}
   {% with form=formset.empty_form %}
-    {% include "formhelper/includes/formset_form.html" %}
+    {% include "formhelper/formset_form.html" %}
   {% endwith %}
 </div>
 {# TODO: There may be a more extensible way to do this js #}

formhelper/templates/formhelper/includes/formset_form.html → formhelper/templates/formhelper/formset_form.html

@@ -1,10 +1,10 @@
 {% load formhelper %}
-{# this template is intended for use within formhelper/includes/formset.html #}
+{# this template is intended for use within formhelper/formset.html #}
   <div class="{{ formset.prefix }}-form{% if form|is_empty_form %} empty-form{% endif %}{% if forloop.first %} first{% endif %}" id="{{ formset.prefix }}-{{ forloop.counter0 }}"{% if form|is_empty_form %} style="display: none"{% endif %}>
     <fieldset>
       <legend>
         <span class="counter">{{ formset|formset_verbose_name|title }} #{{ forloop.counter }}</span>
       </legend>
-      {% include formset_form_tpl|default:"formhelper/includes/form.html" %}
+      {% include formset_form_tpl|default:"formhelper/form.html" %}
     </fieldset>
   </div>