X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=ae9c60fd24dce4c08c730a8416032122298b4873;hb=c508d4372faf6e365f4e2b36a91d382b069d3d8c;hp=cf577db4d6e00c62456786d5f910edb0f6d6082e;hpb=344b9437954ac8e0846c4932c05479704b0265e9;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/urls.py b/urls.py index cf577db..ae9c60f 100644 --- a/urls.py +++ b/urls.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.conf.urls.defaults import * from ee.influences.models import Character @@ -10,8 +11,16 @@ urlpatterns = patterns('', (r'^events/event/(?P\d+)/$', 'ee.events.views.event.detail'), (r'^events/event/(?P\d+)/regs$', 'ee.events.views.event.regs'), (r'^influences/add/(\d+)?/?$', 'ee.influences.views.add'), - (r'^influences/$', 'django.views.generic.list_detail.object_list', chars_dict), + (r'^influences/$', 'ee.influences.views.index'), + (r'^influences/character/$', 'django.views.generic.list_detail.object_list', chars_dict), (r'^influences/character/(?P\d+)/$', 'django.views.generic.list_detail.object_detail', chars_dict), + (r'^influences/character/add/$', 'ee.influences.views.addCharacter'), (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}), (r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'), ) + +if settings.DEBUG: + urlpatterns += patterns('', + (r'^static/(?P.*)$', 'django.views.static.serve', + {'document_root': '/home/matthijs/docs/src/django/ee/static/'}), + )