X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=086f58a54c060a27d8ad9e55f0ecdb9bc5e0dc46;hb=625935a66178b0f9f678df4b1fb13cba06711c53;hp=a26fa4aac7220db95666327660f725bde33b6255;hpb=57bf7e050a270a5ff6149122d81a8a150362dec2;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/urls.py b/urls.py
index a26fa4a..086f58a 100644
--- a/urls.py
+++ b/urls.py
@@ -1,27 +1,38 @@
 from django.conf import settings
 from django.conf.urls.defaults import *
 from ee.influences.models import Character
+from ee.influences.models import Influence
+import os
 
 chars_dict = {
     'queryset': Character.objects.all(),
 }
  
+influences_dict = {
+    'queryset': Influence.objects.all(),
+}
+ 
 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/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/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'}),
-    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'),
+
+    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/'}),
+        {'document_root': os.path.join(settings.PROJECT_DIR, 'static')}),
     )