X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fxerxes.git;a=blobdiff_plain;f=urls.py;h=0ff28c102adc52fffa93e97d18b42922c03c291e;hp=1b4e4004d9086e3732085dbcd3bc60c54ae103ef;hb=a974141892f10ff9f89908d878d1246f3983fe66;hpb=55b642f3fe94f89cbd6376b3a610924bbd168e06 diff --git a/urls.py b/urls.py index 1b4e400..0ff28c1 100644 --- a/urls.py +++ b/urls.py @@ -16,6 +16,8 @@ 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\d+)/$', 'xerxes.influences.views.influence_detail', name='influences_influence_detail'), + url(r'^influences/influence/(?P\d+)/comment/$', 'xerxes.influences.views.influence_comment', name='influences_influence_comment'), + url(r'^influences/influence/(?P\d+)/comment/(?P\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'), @@ -29,7 +31,7 @@ urlpatterns = patterns('', if settings.DEBUG: urlpatterns += patterns('', - (r'^static/(?P.*)$', 'django.views.static.serve', - {'document_root': os.path.join(settings.PROJECT_DIR, 'static')}), + (r'^' + settings.MEDIA_URL[1:] + '(?P.*)$', 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT}), ) # vim: set sts=4 sw=4 expandtab: