Merge branch 'sql/dot-notation'

[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 4a37ab336a6605c5ef4d8eda9f7f2f5bbe2c7def..cc30388fc8d7e5ae54882ce34d12971e65f6f8fa 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 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
@@ -16,25 +16,28 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
+{# Generically render a field #}
+{% macro render_field_div(field) %}
+  {% if field.label.text -%}
+    <p class="form_field_label"><label for="{{ field.name }}">{{ _(field.label.text) }}</label></p>
+  {%- endif %}
+  <div class="form_field_input">
+    {{ field }}
+    {%- if field.errors -%}
+      {% for error in field.errors %}
+        <p class="form_field_error">{{ error }}</p>
+      {% endfor %}
+    {%- endif %}
+    {% if field.description -%}
+      <p class="form_field_description">{{ _(field.description) }}</p>
+    {%- endif %}
+  </div>
+{%- endmacro %}
+
 {# Auto-render a form as a series of divs #}
 {% macro render_divs(form) -%}
   {% for field in form %}
-    <div class="form_field_box">
-      <div class="form_field_label">{{ field.label }}</div>
-      {% if field.description -%}
-        <div class="form_field_description">{{ field.description }}</div>
-      {%- endif %}
-      <div class="form_field_input">{{ field }}</div>
-      {%- if field.errors -%}
-        <div class="form_field_errors">
-          <ul>
-            {% for error in field.errors %}
-              <li>{{ error }}</li>
-            {% endfor %}
-          </ul>
-        </div>
-      {%- endif %}
-    </div>
+    {{ render_field_div(field) }}
   {% endfor %}
 {%- endmacro %}
 
@@ -42,7 +45,7 @@
 {% macro render_table(form) -%}
   {% for field in form %}
     <tr>
-      <th>{{field.label}}</th>
+      <th>{{ _(field.label.text) }}</th>
       <td>
         {{field}}
         {% if field.errors %}