summaryrefslogtreecommitdiff
path: root/papillon/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks2011-10-24 22:13:44 +0200
committerÉtienne Loks2011-10-24 22:13:44 +0200
commit2a50c79d3b9de35937c07c838205e25ad058b3e1 (patch)
tree765ec1bdf7373fd215cf11e7195c0b438ae4e6c7 /papillon/urls.py
parentee49d6eaa93474e5636411e78b34f35ac60ca94c (diff)
South integration (closes #308) - settings improvements
Diffstat (limited to 'papillon/urls.py')
-rw-r--r--papillon/urls.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/papillon/urls.py b/papillon/urls.py
index 13aa4d0..9d1d8a3 100644
--- a/papillon/urls.py
+++ b/papillon/urls.py
@@ -29,7 +29,9 @@ feeds = {
'poll': PollLatestEntries,
}
-base = '^' + settings.EXTRA_URL[:-1]
+base = '^' + settings.EXTRA_URL
+if not base.endswith('/'):
+ base += '/'
urlpatterns = patterns('',
(base + r'admin/doc/', include('django.contrib.admindocs.urls')),
@@ -50,7 +52,7 @@ urlpatterns = patterns('',
(base + r'feeds/(?P<url>.*)$',
'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(base + r'static/(?P<path>.*)$', 'django.views.static.serve',
- {'document_root': settings.ROOT_PATH + 'static'}),
+ {'document_root': settings.PROJECT_PATH + '/static'}),
(base + r'media/(?P<path>.*)$', 'django.views.static.serve',
- {'document_root': settings.ROOT_PATH + 'media/'}),
+ {'document_root': settings.PROJECT_PATH + '/media/'}),
)