Ticket #8933: ticket8933-r8979.2.diff

django/contrib/admin/sites.py

@@ -33 +33 @@
     index_template = None
     login_template = None
     app_index_template = None
+    logout_template = None
+    password_change_template = None
+    password_change_done_template = None
 
     def __init__(self):
         self._registry = {} # model_class class -> admin_class instance
@@ -181 +184 @@
         Handles the "change password" task -- both form display and validation.
         """
         from django.contrib.auth.views import password_change
-        return password_change(request,
-            post_change_redirect='%spassword_change/done/' % self.root_path)
+        redirect_to = '%spassword_change/done/' % self.root_path
+        if self.password_change_template is None:
+            return password_change(request, post_change_redirect=redirect_to)
+        return password_change(request, post_change_redirect=redirect_to,
+            template_name=self.password_change_template)
 
     def password_change_done(self, request):
         """
         Displays the "success" page after a password change.
         """
         from django.contrib.auth.views import password_change_done
-        return password_change_done(request)
+        if self.password_change_done_template is None:
+            return password_change_done(request)
+        return password_change_done(request,
+            template_name=self.password_change_done_template)
 
     def i18n_javascript(self, request):
         """
@@ -211 +220 @@
         This should *not* assume the user is already logged in.
         """
         from django.contrib.auth.views import logout
-        return logout(request)
+        if self.logout_template is None:
+            return logout(request)
+        return logout(request, template_name=self.logout_template)
     logout = never_cache(logout)
 
     def login(self, request):

django/contrib/auth/admin.py

@@ -16 +16 @@
     filter_horizontal = ('permissions',)
 
 class UserAdmin(admin.ModelAdmin):
+    add_form_template = None
+    change_user_password_template = None
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
@@ -60 +62 @@
                     return HttpResponseRedirect('../%s/' % new_user.id)
         else:
             form = self.add_form()
-        return render_to_response('admin/auth/user/add_form.html', {
+        return render_to_response(self.add_form_template or 'admin/auth/user/add_form.html', {
             'title': _('Add user'),
             'form': form,
             'is_popup': '_popup' in request.REQUEST,
@@ -92 +94 @@
                 return HttpResponseRedirect('..')
         else:
             form = self.change_password_form(user)
-        return render_to_response('admin/auth/user/change_password.html', {
+        return render_to_response(self.change_user_password_template or 'admin/auth/user/change_password.html', {
             'title': _('Change password: %s') % escape(user.username),
             'form': form,
             'is_popup': '_popup' in request.REQUEST,