X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=fe0438f41b8ff9d01b76e84a280c640820c3f7f0;hb=7358c0855ff87a97e989f8793208d941002f7202;hp=c96c6b1b46b17705df357468f49416e440855b89;hpb=d031025352fb6c00f0db767405dcf2f39f976cd8;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/urls.py b/urls.py index c96c6b1..fe0438f 100644 --- a/urls.py +++ b/urls.py @@ -9,13 +9,14 @@ urlpatterns = patterns('', url(r'^admin/', include('django.contrib.admin.urls')), url(r'^influences/$', 'ee.influences.views.index', name='influences_index'), - url(r'^influences/influence/add/(\d+)/$', 'ee.influences.views.add', name='influences_add_influence_for_character'), - url(r'^influences/influence/add/$', 'ee.influences.views.add', name='influences_add_influence'), + url(r'^influences/influence/$', 'ee.influences.views.influence_list', name='influences_influence_list'), url(r'^influences/influence/(?P\d+)/$', 'ee.influences.views.influence_detail', name='influences_influence_detail'), + url(r'^influences/influence/add/(\d+)/$', 'ee.influences.views.add_influence', name='influences_add_influence_for_character'), + url(r'^influences/influence/add/$', 'ee.influences.views.add_influence', name='influences_add_influence'), url(r'^influences/character/$', 'ee.influences.views.character_list', name='influences_character_list'), url(r'^influences/character/(?P\d+)/$', 'ee.influences.views.character_detail', name='influences_character_detail'), - url(r'^influences/character/add/$', 'ee.influences.views.addCharacter', name='influences_add_character'), + url(r'^influences/character/add/$', 'ee.influences.views.add_character', name='influences_add_character'), url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'), url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),