From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Mon, 28 Jul 2008 16:13:45 +0000 (+0200)
Subject: Switch the urlconf to use the new django admin interface.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=55b642f3fe94f89cbd6376b3a610924bbd168e06;p=matthijs%2Fprojects%2Fxerxes.git

Switch the urlconf to use the new django admin interface.
---

diff --git a/urls.py b/urls.py
index 5b2c6f7..1b4e400 100644
--- a/urls.py
+++ b/urls.py
@@ -1,12 +1,16 @@
 from django.conf import settings
 from django.conf.urls.defaults import *
+from django.contrib import admin
 from xerxes.influences.models import Character
 from xerxes.influences.models import Influence
 import os
- 
+
+# Automatically import admin.py from all INSTALLED_APPS
+admin.autodiscover()
+
 urlpatterns = patterns('',
     url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}),
-    url(r'^admin/', include('django.contrib.admin.urls')),
+    (r'^admin/(.*)', admin.site.root),
     url(r'^comments/', include('threadedcomments.urls')),
 
     url(r'^influences/$', 'xerxes.influences.views.index', name='influences_index'),