summaryrefslogtreecommitdiff
path: root/urls.py
diff options
context:
space:
mode:
authoretienne2008-10-08 19:44:15 +0000
committeretienne2008-10-08 19:44:15 +0000
commitc35b127f729015dec19a039ca4173df845cb24eb (patch)
tree7885552d4f93c492732a467db562fe59e5f69c61 /urls.py
parent5b13731e4c899e86cabf3c6eb7e343b178d70f05 (diff)
Some minor changes for Django 1.0
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/urls.py b/urls.py
index 018eb38..9db8686 100644
--- a/urls.py
+++ b/urls.py
@@ -20,11 +20,12 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('',
- (r'^papillon/admin/', include('django.contrib.admin.urls')),
+ (r'^admin/', include('django.contrib.admin.urls')),
(r'^papillon/$', 'papillon.polls.views.index'),
(r'^papillon/edit/(?P<admin_url>\w+)/$',
'papillon.polls.views.createOrEdit'),
(r'^papillon/poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll'),
(r'^papillon/poll/(?P<poll_url>\w+)/vote$', 'papillon.polls.views.poll'),
- (r'^papillon/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/var/local/django/papillon/static/'}),
+ (r'^static/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': 'static/'}),
)