From bbe7ae096a8dabb0906acc09ecb7be564b2b8770 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 22 Dec 2013 02:58:25 +0100
Subject: [PATCH] reorder apps, so templates of django's "admin" get considered
 last (so nsupdate or django registration can override them)

---
 nsupdate/settings/base.py | 2 +-
 nsupdate/urls.py          | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nsupdate/settings/base.py b/nsupdate/settings/base.py
index 3134d02..f086a7f 100644
--- a/nsupdate/settings/base.py
+++ b/nsupdate/settings/base.py
@@ -147,7 +147,6 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.admin',
     'social.apps.django_app.default',
     'south',
     'nsupdate',
@@ -156,6 +155,7 @@ INSTALLED_APPS = (
     'nsupdate.main',
     'bootstrapform',
     'registration',
+    'django.contrib.admin',
     'django_extensions',
 )
 
diff --git a/nsupdate/urls.py b/nsupdate/urls.py
index a69b34e..462da0d 100644
--- a/nsupdate/urls.py
+++ b/nsupdate/urls.py
@@ -64,6 +64,12 @@ urlpatterns = patterns(
          'template_name': 'registration/password_change.html',  # own template
          'post_change_redirect': '/account/profile'},  # reverse() does not work here
         name='auth_password_change'),
+    #url(r'^accounts/password/reset/$',
+    #    auth_views.password_reset,
+    #    name='auth_password_reset'),
+    #url(r'^accounts/password/reset/done/$',
+    #    auth_views.password_reset,
+    #    name='password_reset_done'),
     url(r'^accounts/', include('registration.backends.default.urls')),
     # registration end
     url(r'^account/', include('nsupdate.accounts.urls')),