* Use the url function in urls.py.

[matthijs/projects/xerxes.git] / urls.py

diff --git a/urls.py b/urls.py
index e7597b1bf2cfe4874883d279edde56320c187b7d..a26fa4aac7220db95666327660f725bde33b6255 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -7,16 +7,17 @@ chars_dict = {
 }
  
 urlpatterns = patterns('',
-    (r'^admin/', include('django.contrib.admin.urls')),
-    (r'^events/event/(?P<event_id>\d+)/$', 'ee.events.views.event.detail'),
-    (r'^events/event/(?P<event_id>\d+)/regs$', 'ee.events.views.event.regs'),
-    (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<object_id>\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'),
+    url(r'^admin/', include('django.contrib.admin.urls')),
+    url(r'^events/event/(?P<event_id>\d+)/$', 'ee.events.views.event.detail'),
+    url(r'^events/event/(?P<event_id>\d+)/regs$', 'ee.events.views.event.regs'),
+    url(r'^influences/add/(\d+)/$', 'ee.influences.views.add', name='influences_add_influence_for_character'),
+    url(r'^influences/add/$', 'ee.influences.views.add', name='influences_add_influence'),
+    url(r'^influences/$', 'ee.influences.views.index', name='influences_index'),
+    url(r'^influences/character/$', 'django.views.generic.list_detail.object_list', chars_dict, name='influences_character_list'),
+    url(r'^influences/character/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', chars_dict, name='influences_character_detail'),
+    url(r'^influences/character/add/$', 'ee.influences.views.addCharacter', name='influences_add_character'),
+    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}),
+    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'),
 )
 
 if settings.DEBUG: