Merge remote-tracking branch 'refs/remotes/spaetz/trac_475_email_notification_checkbox'

This commit is contained in:
Christopher Allan Webber 2012-11-13 08:55:14 -06:00
commit ee62c51d79
2 changed files with 9 additions and 6 deletions

View File

@ -68,8 +68,7 @@ class EditAccountForm(wtforms.Form):
[wtforms.validators.Length(min=6, max=30)], [wtforms.validators.Length(min=6, max=30)],
id="password") id="password")
wants_comment_notification = wtforms.BooleanField( wants_comment_notification = wtforms.BooleanField(
_(''), label=_("Email me when others comment on my media"))
description=_("Email me when others comment on my media"))
class EditAttachmentsForm(wtforms.Form): class EditAttachmentsForm(wtforms.Form):

View File

@ -32,7 +32,6 @@
{% block mediagoblin_content %} {% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.edit.account') }}?username={{ <form action="{{ request.urlgen('mediagoblin.edit.account') }}?username={{
user.username }}" user.username }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
@ -42,7 +41,12 @@
Changing {{ username }}'s account settings Changing {{ username }}'s account settings
{%- endtrans %} {%- endtrans %}
</h1> </h1>
{{ wtforms_util.render_divs(form) }} {{ wtforms_util.render_field_div(form.old_password) }}
{{ wtforms_util.render_field_div(form.new_password) }}
<div class="form_field_input">
<p>{{ form.wants_comment_notification }}
{{ form.wants_comment_notification.label }}</p>
</div>
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
{{ csrf_token }} {{ csrf_token }}