diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-06 11:05:57 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-06 11:05:57 -0300 |
| commit | 3aa14c9fbec24f5049e12a8dbb5ce059d2c8f5f3 (patch) | |
| tree | 28755cf0ae66b145d752358c1f722c2d095e877a /templates/general_form.html | |
| parent | c738e2c8f687f3417b90c951254121cce491843a (diff) | |
| parent | 65e965c8f76677904f5d98965e13bf89726247d4 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
media/archweb.css
public/views.py
urls.py
Diffstat (limited to 'templates/general_form.html')
| -rw-r--r-- | templates/general_form.html | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/templates/general_form.html b/templates/general_form.html index 92625cf2..5e620087 100644 --- a/templates/general_form.html +++ b/templates/general_form.html @@ -6,14 +6,18 @@ <h2>{{title}}</h2> - {% if description %}{{description}}{% endif %} + {{description}} + {{form.non_field_errors}} <form class="general-form" method="post">{% csrf_token %} <fieldset> {% for field in form %} - <p><label>{{field.label}}{% if field.help_text %}:</label><br /> - <span class="form-help">{{field.help_text}}</span> {% else %}:</label> {% endif %} - {{field}} {% if field.required %}<span class="form-req-field">*</span>{% endif%}</p> + {{field.errors}} + <p><label for="{{field.auto_id}}">{{field.label}}:</label> + {% if field.help_text %}<br/><span class="form-help">{{field.help_text}}</span>{% endif %} + {{field}} + {% if field.field.required %}<span class="form-req-field">*</span>{% endif %} + </p> {% endfor %} </fieldset> <p><label></label> <input type="submit" value="{{submit_text}}" /></p> |