Merge remote-tracking branch 'elrond/for-schendje'

[mediagoblin.git] / mediagoblin / templates / mediagoblin / utils / wtforms.html

diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 2639522a3bd240676b4cfa518649b14182b5c556..58ecb8e092f01df9cac725aed9dac7733396bc78 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -18,19 +18,19 @@
 
 {# Generically render a field #}
 {% macro render_field_div(field) %}
-  <div class="form_field_box">
-    <div class="form_field_label">{{ _(field.label.text) }}</div>
-    {% if field.description -%}
-      <div class="form_field_description">{{ _(field.description) }}</div>
-    {%- endif %}
-    <div class="form_field_input">{{ field }}</div>
+  {% if field.label.text -%}
+    <p class="form_field_label"><label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label></p>
+  {%- endif %}
+  <div class="form_field_input">
+    {{ field }}
     {%- if field.errors -%}
       {% for error in field.errors %}
-        <div class="form_field_error">
-          {{ error }}
-        </div>
+        <p class="form_field_error">{{ _(error) }}</p>
       {% endfor %}
     {%- endif %}
+    {% if field.description -%}
+      <p class="form_field_description">{{ _(field.description)|safe }}</p>
+    {%- endif %}
   </div>
 {%- endmacro %}