* Mark all model names and field names in influences as translatable strings.

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

diff --git a/urls.py b/urls.py
index 24a9ec179a63e879efdcbbb16c8298b89bd913cb..f3f7a1f350cd2665d118e4a2c07dae835d9a27d4 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -9,9 +9,11 @@ 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/$', '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<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', chars_dict),
-       (r'^influences/character/(?P<character_id>\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'),
 )