* Give the login and logout views a name and refer to the logout view by that name.

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

diff --git a/urls.py b/urls.py
index 24a9ec179a63e879efdcbbb16c8298b89bd913cb..bffdb4fba5826badd0918351cddc703a8cd09252 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -1,17 +1,36 @@
+from django.conf import settings
 from django.conf.urls.defaults import *
 from ee.influences.models import Character
+from ee.influences.models import Influence
 
 chars_dict = {
-       'queryset': Character.objects.all(),
+    'queryset': Character.objects.all(),
+}
+ 
+influences_dict = {
+    'queryset': Influence.objects.all(),
 }
  
 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/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'^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'}),
+    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/$', '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/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', influences_dict, name='influences_influence_detail'),
+    
+    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'}, name='login'),
+    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
 )
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        (r'^static/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': '/home/matthijs/docs/src/django/ee/static/'}),
+    )