X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fxerxes.git;a=blobdiff_plain;f=urls.py;h=bbc54680e93a86707869989232a109c8d8349b3e;hp=6265def1b10eaecf07718362f06c003a4992ef42;hb=HEAD;hpb=435a62554852c2863d2247c04df4342e002576fc diff --git a/urls.py b/urls.py index 6265def..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 @@ -18,6 +19,8 @@ urlpatterns = patterns('', 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+)$', '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'), @@ -31,7 +34,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: