diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2011-12-24 00:14:45 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2011-12-24 00:14:45 +0000 |
| commit | 1c169071998702880b4fa534c06b35c20f184eef (patch) | |
| tree | b99980f9b026635c69142c70e0a174338578948e /django | |
| parent | 14ba0df3d0b14bd7ecc5fbe099ea11864718b492 (diff) | |
Added a password reset link to default admin login page if a password reset URL is available.
You no longer have to override the admin login page just to get that link to
appear!
Also provided much better docs for how to plug in the provided password
reset mechanism with minimum effort.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/static/admin/css/login.css | 3 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/login.html | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/django/contrib/admin/static/admin/css/login.css b/django/contrib/admin/static/admin/css/login.css index 8d90d12901..8872ade70b 100644 --- a/django/contrib/admin/static/admin/css/login.css +++ b/django/contrib/admin/static/admin/css/login.css @@ -52,3 +52,6 @@ body.login { padding: 1em 0 0 9.4em; } +.login .password-reset-link { + text-align: center; +} diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html index a6cd6a7d6c..c008957d1b 100644 --- a/django/contrib/admin/templates/admin/login.html +++ b/django/contrib/admin/templates/admin/login.html @@ -1,5 +1,6 @@ {% extends "admin/base_site.html" %} {% load i18n admin_static %} +{% load url from future %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />{% endblock %} @@ -38,6 +39,12 @@ <input type="hidden" name="this_is_the_login_form" value="1" /> <input type="hidden" name="next" value="{{ next }}" /> </div> + {% url 'admin_password_reset' as password_reset_url %} + {% if password_reset_url %} + <div class="password-reset-link"> + <a href="{{ password_reset_url }}">{% trans 'Forgotten your password or username?' %}</a> + </div> + {% endif %} <div class="submit-row"> <label> </label><input type="submit" value="{% trans 'Log in' %}" /> </div> |