X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fxerxes.git;a=blobdiff_plain;f=urls.py;h=bbc54680e93a86707869989232a109c8d8349b3e;hp=d03ac119ec8080889ef173d6d595d0bc55204433;hb=HEAD;hpb=8021b0208f57dce74a08afb97fb62d5323fbd4ac

diff --git a/urls.py b/urls.py
index d03ac11..bbc5468 100644
--- a/urls.py
+++ b/urls.py
@@ -1,30 +1,32 @@
 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
+from django.views.generic.simple import direct_to_template
 import os
 
-chars_dict = {
-    'queryset': Character.objects.all(),
-}
- 
-influences_dict = {
-    'queryset': Influence.objects.all(),
-}
- 
+# Automatically import admin.py from all INSTALLED_APPS
+admin.autodiscover()
+
 urlpatterns = patterns('',
-    url(r'^admin/', include('django.contrib.admin.urls')),
-    url(r'^events/event/(?P<event_id>\d+)/$', 'ee.events.views.event.detail'),
-    url(r'^events/event/(?P<event_id>\d+)/regs$', 'ee.events.views.event.regs'),
+    url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}),
+    (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/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/influence/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', influences_dict, name='influences_influence_detail'),
+    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+)$',         'django.views.generic.simple.direct_to_template', {'template': 'base/offline.html'}, name='influences_add_influence_for_character'),
+    #url(r'^influences/influence/add/$',         'django.views.generic.simple.direct_to_template', {'template': 'base/offline.html'}, name='influences_add_influence'),
+    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/$', 'django.views.generic.list_detail.object_list', chars_dict, name='influences_character_list'),
-    url(r'^influences/character/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', chars_dict, 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'),
@@ -32,6 +34,7 @@ urlpatterns = patterns('',
 
 if settings.DEBUG:
     urlpatterns += patterns('',
-        (r'^static/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': os.path.join(settings.PROJECT_DIR, 'static')}),
+        (r'^' + settings.MEDIA_URL[1:] + '(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': settings.MEDIA_ROOT}),
     )
+# vim: set sts=4 sw=4 expandtab: