* Replace some tabs by spaces and put a vim modeline in every python file.

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

diff --git a/urls.py b/urls.py
index d03ac119ec8080889ef173d6d595d0bc55204433..c6e6fe18510c95a32f6dab1581762d9ef0183d4a 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -13,6 +13,7 @@ influences_dict = {
 }
  
 urlpatterns = patterns('',
+    url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}),
     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'),
@@ -20,10 +21,10 @@ urlpatterns = patterns('',
     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/influence/(?P<object_id>\d+)/$', 'ee.influences.views.influence_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/$', 'ee.influences.views.character_list', chars_dict, name='influences_character_list'),
+    url(r'^influences/character/(?P<object_id>\d+)/$', 'ee.influences.views.character_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'),
@@ -35,3 +36,4 @@ if settings.DEBUG:
         (r'^static/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': os.path.join(settings.PROJECT_DIR, 'static')}),
     )
+# vim: set sts=4 sw=4 expandtab: