* Add login_required decorator to some views.

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

diff --git a/urls.py b/urls.py
index 0483644b193f55511fe3dd60c2c8b81ab331f824..086f58a54c060a27d8ad9e55f0ecdb9bc5e0dc46 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -2,6 +2,7 @@ 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(),
@@ -12,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'),
@@ -25,12 +27,12 @@ urlpatterns = patterns('',
     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')}),
     )