Make the enabling of TEMPLATE_DEBUG more clear.

[matthijs/projects/xerxes.git] / urls.py

diff --git a/urls.py b/urls.py
index 5b2c6f75a77eb6936d7973b443b8051319c571d4..6265def1b10eaecf07718362f06c003a4992ef42 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -1,17 +1,23 @@
 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'),
     url(r'^influences/influence/(?P<object_id>\d+)/$', 'xerxes.influences.views.influence_detail', name='influences_influence_detail'),
+    url(r'^influences/influence/(?P<object_id>\d+)/comment/$', 'xerxes.influences.views.influence_comment', name='influences_influence_comment'),
+    url(r'^influences/influence/(?P<object_id>\d+)/comment/(?P<parent_id>\d+)/$', 'xerxes.influences.views.influence_comment', name='influences_influence_comment_parent'),
     url(r'^influences/influence/add/(\d+)/$', 'xerxes.influences.views.add_influence', name='influences_add_influence_for_character'),
     url(r'^influences/influence/add/$', 'xerxes.influences.views.add_influence', name='influences_add_influence'),