X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=086f58a54c060a27d8ad9e55f0ecdb9bc5e0dc46;hb=625935a66178b0f9f678df4b1fb13cba06711c53;hp=0483644b193f55511fe3dd60c2c8b81ab331f824;hpb=089b685a37fa8ecaecba20e10fa6bdcdfe449886;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/urls.py b/urls.py index 0483644..086f58a 100644 --- 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\d+)/$', 'ee.events.views.event.detail'), url(r'^events/event/(?P\d+)/regs$', 'ee.events.views.event.regs'), @@ -25,12 +27,12 @@ urlpatterns = patterns('', url(r'^influences/character/(?P\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.*)$', 'django.views.static.serve', - {'document_root': '/home/matthijs/docs/src/django/ee/static/'}), + {'document_root': os.path.join(settings.PROJECT_DIR, 'static')}), )