fix for boolean fields

mediagoblin/edit/forms.py

@@ -66,7 +66,6 @@ class EditAccountForm(wtforms.Form):
         [wtforms.validators.Optional(),
          normalize_user_or_email_field(allow_user=False)])
     wants_comment_notification = wtforms.BooleanField(
-        label='',
         description=_("Email me when others comment on my media"))
     license_preference = wtforms.SelectField(
         _('License preference'),

mediagoblin/static/css/base.css

@@ -334,6 +334,10 @@ text-align: center;
   width: 20px;
 }
 
+#boolean {
+  margin-bottom: 4px;
+  }
+
 textarea#description, textarea#bio {
   resize: vertical;
   height: 100px;

mediagoblin/templates/mediagoblin/utils/wtforms.html

@@ -34,6 +34,9 @@
 
 {# Generically render a field #}
 {% macro render_field_div(field, autofocus_first=False) %}
+  {% if field.type == 'BooleanField' %}
+    {{ render_bool(field) }}
+  {% else %}
     {{- render_label_p(field) }}
     <div class="form_field_input">
       {% if autofocus_first %}
@@ -47,13 +50,10 @@
         {% endfor %}
       {%- endif %}
       {%- if field.description %}
-      {% if field.type == 'BooleanField' %}
-        <label for="{{ field.label.field_id }}">{{ field.description|safe }}</label>
-      {% else %}
         <p class="form_field_description">{{ field.description|safe }}</p>
-      {% endif %}
       {%- endif %}
     </div>
+  {% endif %}
 {%- endmacro %}
 
 {# Auto-render a form as a series of divs #}
@@ -86,3 +86,14 @@
     </tr>
   {% endfor %}
 {%- endmacro %}
+
+{# Render a boolean field #}
+{% macro render_bool(field) %}
+  <div id="boolean">
+  <label for="{{ field.label.field_id }}">
+    {{ field }}</input>
+    {{ field.description|safe }}
+  </label>
+</div>
+{% endmacro %}
+