X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=1b4e4004d9086e3732085dbcd3bc60c54ae103ef;hb=2f13dad0c0310ad35ea3ed5cd1284050107e02fe;hp=9fed21d348fdd11448115409dc626cbf01d746a6;hpb=e0a6b803cd22cdf9b2b5a1e70cfaf4d377c7efa3;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/urls.py b/urls.py
index 9fed21d..1b4e400 100644
--- a/urls.py
+++ b/urls.py
@@ -1,12 +1,17 @@
 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'),
     url(r'^influences/influence/$', 'xerxes.influences.views.influence_list', name='influences_influence_list'),