summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-08-06 14:58:05 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-08-06 14:58:05 +0000
commit2ab3b52d2adb0aa6d15aa94e4fc5aab9ec3554d0 (patch)
treeb081200181bf2c1a98759a5e2fafbdf926114f3c /django
parentf90a25551dbd10b7d57725a2abec3e11cf0e22cd (diff)
Fixed #14012 -- Corrected the handling of the create user popup dialog in the admin. Thanks to gk@lka.hu for the report, and Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/templates/admin/auth/user/add_form.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/contrib/admin/templates/admin/auth/user/add_form.html b/django/contrib/admin/templates/admin/auth/user/add_form.html
index b57f59b82e..262089f4bf 100644
--- a/django/contrib/admin/templates/admin/auth/user/add_form.html
+++ b/django/contrib/admin/templates/admin/auth/user/add_form.html
@@ -2,8 +2,12 @@
{% load i18n %}
{% block form_top %}
+ {% if not is_popup %}
<p>{% trans "First, enter a username and password. Then, you'll be able to edit more user options." %}</p>
<input type="hidden" name="_continue" value="1" />
+ {% else %}
+ <p>{% trans "Enter a username and password." %}</p>
+ {% endif %}
{% endblock %}
{% block after_field_sets %}