diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-11-13 08:55:14 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-11-13 08:55:14 -0600 |
| commit | ee62c51d797ab317366fa099f5e012f33f42857f (patch) | |
| tree | aabbaf06701e56b57f36dfa8b22af6bd285a0e10 | |
| parent | 52aef5b445710dbe800ebba7f44ca0cc0e06ea54 (diff) | |
| parent | 5e5b8acfec73ad7f12eb685ff81c6962aee655f1 (diff) | |
| download | mediagoblin-ee62c51d797ab317366fa099f5e012f33f42857f.tar.lz mediagoblin-ee62c51d797ab317366fa099f5e012f33f42857f.tar.xz mediagoblin-ee62c51d797ab317366fa099f5e012f33f42857f.zip | |
Merge remote-tracking branch 'refs/remotes/spaetz/trac_475_email_notification_checkbox'
| -rw-r--r-- | mediagoblin/edit/forms.py | 3 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/edit/edit_account.html | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 856852b6..293c3bb2 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -68,8 +68,7 @@ class EditAccountForm(wtforms.Form): [wtforms.validators.Length(min=6, max=30)], id="password") wants_comment_notification = wtforms.BooleanField( - _(''), - description=_("Email me when others comment on my media")) + label=_("Email me when others comment on my media")) class EditAttachmentsForm(wtforms.Form): diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 9bacb157..38d99893 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -32,8 +32,7 @@ {% block mediagoblin_content %} - - <form action="{{ request.urlgen('mediagoblin.edit.account') }}?username={{ + <form action="{{ request.urlgen('mediagoblin.edit.account') }}?username={{ user.username }}" method="POST" enctype="multipart/form-data"> <div class="form_box edit_box"> @@ -42,11 +41,16 @@ Changing {{ username }}'s account settings {%- endtrans %} </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"> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> {{ csrf_token }} </div> </div> </form> -{% endblock %} +{% endblock %} |