From 1aba9e247542856e157510130bcb34a67fa54a4a Mon Sep 17 00:00:00 2001
From: Ross Poulton <ross@rossp.org>
Date: Wed, 2 Feb 2011 08:05:33 +0000
Subject: [PATCH] Moved login/logout templates into
 templates/helpdesk/registration/ rather than templates/registration/, so the
 helpdesk templates don't overwrite site-specific ones. Thanks to kotiwicz for
 the patch to issue #13.

---
 helpdesk/templates/{ => helpdesk}/registration/logged_out.html | 0
 helpdesk/templates/{ => helpdesk}/registration/login.html      | 0
 helpdesk/urls.py                                               | 3 ++-
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename helpdesk/templates/{ => helpdesk}/registration/logged_out.html (100%)
 rename helpdesk/templates/{ => helpdesk}/registration/login.html (100%)

diff --git a/helpdesk/templates/registration/logged_out.html b/helpdesk/templates/helpdesk/registration/logged_out.html
similarity index 100%
rename from helpdesk/templates/registration/logged_out.html
rename to helpdesk/templates/helpdesk/registration/logged_out.html
diff --git a/helpdesk/templates/registration/login.html b/helpdesk/templates/helpdesk/registration/login.html
similarity index 100%
rename from helpdesk/templates/registration/login.html
rename to helpdesk/templates/helpdesk/registration/login.html
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 8226ae1b..908d1a02 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -134,11 +134,12 @@ urlpatterns += patterns('',
 
     url(r'^login/$',
         'django.contrib.auth.views.login',
+        {'template_name': 'helpdesk/registration/login.html'},
         name='login'),
 
     url(r'^logout/$',
         'django.contrib.auth.views.logout',
-        {'next_page': '../'},
+        {'template_name': 'helpdesk/registration/login.html', 'next_page': '../'},
         name='logout'),
 )