diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-03-06 14:13:36 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-03-06 14:13:36 +0000 |
commit | 3ee286527f1ec23ead2c11201b9fa504a5bf6208 (patch) | |
tree | 8a9f605f751126c884139a6b3baa2835684ed22b /templates/general_form.html | |
parent | 2c2614c48957c32334aa9ba317db935a979cd67f (diff) | |
parent | fee4c20e9607ccc479c33b2476fa1ba709efe607 (diff) |
Merge branch 'master' of /srv/git/projects/parabolaweb
Conflicts:
.gitignore
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> |