aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-01-05 14:47:15 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-01-05 14:47:15 +0100
commit49af00e491a7ec6b920a3780254f2203ae47fbe5 (patch)
treef4b49005d5e6889ae3914e5e86a0030c65412001
parent4a24500aa43fcf5bca59c12049af34b7935977a0 (diff)
downloadmediagoblin-49af00e491a7ec6b920a3780254f2203ae47fbe5.tar.lz
mediagoblin-49af00e491a7ec6b920a3780254f2203ae47fbe5.tar.xz
mediagoblin-49af00e491a7ec6b920a3780254f2203ae47fbe5.zip
Make show-password-js work for change password too
The show password js depends on the password field to have an id of "password". So give it a proper id. Also fixed the label generation for the case of field.name and field.id being different.
-rw-r--r--mediagoblin/edit/forms.py3
-rw-r--r--mediagoblin/templates/mediagoblin/utils/wtforms.html2
2 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index df219011..09955874 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -64,7 +64,8 @@ class EditAccountForm(wtforms.Form):
new_password = wtforms.PasswordField(
_('New password'),
[wtforms.validators.Required(),
- wtforms.validators.Length(min=6, max=30)])
+ wtforms.validators.Length(min=6, max=30)],
+ id="password")
class EditAttachmentsForm(wtforms.Form):
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 3517b5c3..44b27bb8 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -19,7 +19,7 @@
{# 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>
+ <p class="form_field_label"><label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label></p>
{%- endif %}
<div class="form_field_input">
{{ field }}