aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/edit/edit_account.html7
-rw-r--r--mediagoblin/templates/mediagoblin/utils/wtforms.html6
2 files changed, 6 insertions, 7 deletions
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 461dd6df..fa7a9c48 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -46,12 +46,7 @@
{% trans %}Change your password.{% endtrans %}
</a>
</p>
- {{ wtforms_util.render_field_div(form.new_email) }}
- <div class="form_field_input">
- <p>{{ form.wants_comment_notification }}
- {{ wtforms_util.render_label(form.wants_comment_notification) }}</p>
- </div>
- {{- wtforms_util.render_field_div(form.license_preference) }}
+ {{ wtforms_util.render_divs(form) }}
<div class="form_submit_buttons">
<input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
{{ csrf_token }}
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 90b237ee..f522172f 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -47,7 +47,11 @@
{% endfor %}
{%- endif %}
{%- if field.description %}
- <p class="form_field_description">{{ field.description|safe }}</p>
+ {% if field.label.text == '' %}
+ <label for="{{ field.label.field_id }}">{{ field.description|safe }}</label>
+ {% else %}
+ <p class="form_field_description">{{ field.description|safe }}</p>
+ {% endif %}
{%- endif %}
</div>
{%- endmacro %}