diff options
| author | Alexander Gaevsky <sasha@sasha0.ru> | 2016-04-14 20:12:30 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-09-10 18:23:18 -0400 |
| commit | 536db42cf01ebe0dd633b131c3dbfc0bf743064f (patch) | |
| tree | b41566d66d755d438a87bd95be0d28887a04c919 /django | |
| parent | 2d26b4637f0318736955b54b34f270fe9500f795 (diff) | |
| download | django-536db42cf01ebe0dd633b131c3dbfc0bf743064f.tar.gz | |
Fixed #26097 -- Added password_validators_help_text_html to UserCreationForm.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/static/admin/css/base.css | 6 | ||||
| -rw-r--r-- | django/contrib/auth/forms.py | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 67aa3143a5..466b36bcec 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -187,11 +187,15 @@ p.mini { margin-top: -3px; } -.help, p.help, form p.help, div.help, form div.help { +.help, p.help, form p.help, div.help, form div.help, div.help li { font-size: 11px; color: #999; } +div.help ul { + margin-bottom: 0; +} + .help-tooltip { cursor: help; } diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index b1dd713937..ddd915ae69 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -79,6 +79,7 @@ class UserCreationForm(forms.ModelForm): label=_("Password"), strip=False, widget=forms.PasswordInput, + help_text=password_validation.password_validators_help_text_html(), ) password2 = forms.CharField( label=_("Password confirmation"), |