X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=f3f7a1f350cd2665d118e4a2c07dae835d9a27d4;hb=216e7e2abfa5096921c4022c65c89298d7b7a4f8;hp=24a9ec179a63e879efdcbbb16c8298b89bd913cb;hpb=25f8408523048e3734758d970efaf12b1d7157db;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/urls.py b/urls.py index 24a9ec1..f3f7a1f 100644 --- a/urls.py +++ b/urls.py @@ -9,9 +9,11 @@ urlpatterns = patterns('', (r'^admin/', include('django.contrib.admin.urls')), (r'^events/event/(?P\d+)/$', 'ee.events.views.event.detail'), (r'^events/event/(?P\d+)/regs$', 'ee.events.views.event.regs'), - (r'^influences/$', 'django.views.generic.list_detail.object_list', chars_dict), + (r'^influences/add/(\d+)?/?$', 'ee.influences.views.add'), + (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/(?P\d+)/addinfluence/$', 'ee.influences.views.addinfluence'), + (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', {'template_name': 'base/login.html'}), + (r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'), )