X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=1b4e4004d9086e3732085dbcd3bc60c54ae103ef;hb=cfc5d23db501f56588ac7be1e16da1d1fde930f8;hp=996e08a7c4ba617006c8957cdf1cda518c1d3acd;hpb=040f43fc74e8026c2aa804fe2bd1e7220a9cb96d;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/urls.py b/urls.py
index 996e08a..1b4e400 100644
--- a/urls.py
+++ b/urls.py
@@ -1,22 +1,27 @@
 from django.conf import settings
 from django.conf.urls.defaults import *
-from ee.influences.models import Character
-from ee.influences.models import Influence
+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/$', 'ee.influences.views.index', name='influences_index'),
-    url(r'^influences/influence/$', 'ee.influences.views.influence_list', name='influences_influence_list'),
-    url(r'^influences/influence/(?P<object_id>\d+)/$', 'ee.influences.views.influence_detail', name='influences_influence_detail'),
-    url(r'^influences/influence/add/(\d+)/$', 'ee.influences.views.add', name='influences_add_influence_for_character'),
-    url(r'^influences/influence/add/$', 'ee.influences.views.add', name='influences_add_influence'),
+    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/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'),
     
-    url(r'^influences/character/$', 'ee.influences.views.character_list', name='influences_character_list'),
-    url(r'^influences/character/(?P<object_id>\d+)/$', 'ee.influences.views.character_detail', name='influences_character_detail'),
-    url(r'^influences/character/add/$', 'ee.influences.views.addCharacter', name='influences_add_character'),
+    url(r'^influences/character/$', 'xerxes.influences.views.character_list', name='influences_character_list'),
+    url(r'^influences/character/(?P<object_id>\d+)/$', 'xerxes.influences.views.character_detail', name='influences_character_detail'),
+    url(r'^influences/character/add/$', 'xerxes.influences.views.add_character', name='influences_add_character'),
 
     url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'),
     url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),