X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=bbc54680e93a86707869989232a109c8d8349b3e;hb=8d30a85b070625d27447328177e84ac900d3ff2e;hp=1b4e4004d9086e3732085dbcd3bc60c54ae103ef;hpb=55b642f3fe94f89cbd6376b3a610924bbd168e06;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/urls.py b/urls.py
index 1b4e400..bbc5468 100644
--- a/urls.py
+++ b/urls.py
@@ -3,6 +3,7 @@ from django.conf.urls.defaults import *
 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
 
 # Automatically import admin.py from all INSTALLED_APPS
@@ -16,6 +17,10 @@ urlpatterns = patterns('',
     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'),
     
@@ -29,7 +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: