X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=fe0438f41b8ff9d01b76e84a280c640820c3f7f0;hb=b95c24676bc87413a8a83728a28b4975e1267459;hp=bffdb4fba5826badd0918351cddc703a8cd09252;hpb=7718e4a9979f165d892248287f646e206b3c78dc;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/urls.py b/urls.py
index bffdb4f..fe0438f 100644
--- a/urls.py
+++ b/urls.py
@@ -2,28 +2,21 @@ 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(),
-}
- 
-influences_dict = {
-    'queryset': Influence.objects.all(),
-}
+import os
  
 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'),
 
     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/$', 'ee.influences.views.influence_list', name='influences_influence_list'),
+    url(r'^influences/influence/(?P<object_id>\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/$', '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'^influences/character/$', 'ee.influences.views.character_list', name='influences_character_list'),
+    url(r'^influences/character/(?P<object_id>\d+)/$', 'ee.influences.views.character_detail', name='influences_character_detail'),
+    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'),
@@ -32,5 +25,6 @@ urlpatterns = patterns('',
 if settings.DEBUG:
     urlpatterns += patterns('',
         (r'^static/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': '/home/matthijs/docs/src/django/ee/static/'}),
+        {'document_root': os.path.join(settings.PROJECT_DIR, 'static')}),
     )
+# vim: set sts=4 sw=4 expandtab: