diff options
Diffstat (limited to 'papillon/urls.py')
| -rw-r--r-- | papillon/urls.py | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/papillon/urls.py b/papillon/urls.py index 0f28b45..84f5ed9 100644 --- a/papillon/urls.py +++ b/papillon/urls.py @@ -21,6 +21,7 @@ import settings from django.conf.urls import patterns, url, include from django.contrib import admin +from django.contrib.staticfiles.urls import staticfiles_urlpatterns admin.autodiscover() from polls.feeds import PollLatestEntries @@ -29,28 +30,28 @@ base = '^' + settings.EXTRA_URL if settings.EXTRA_URL and not base.endswith('/'): base += '/' -urlpatterns = patterns('', - (base + r'admin/doc/', include('django.contrib.admindocs.urls')), - url(base + r'admin/jsi18n/$', 'django.views.i18n.javascript_catalog', - name='admin_i18n'), - url(base + r'^admin/', include(admin.site.urls)), - url(base + r'$', 'papillon.polls.views.index', name='index'), - url(base + r'create/$', 'papillon.polls.views.create', name='create'), - url(base + r'edit/(?P<admin_url>\w+)/$', - 'papillon.polls.views.edit', name='edit'), - url(base + r'editChoicesAdmin/(?P<admin_url>\w+)/$', - 'papillon.polls.views.editChoicesAdmin', name='edit_choices_admin'), - url(base + r'editChoicesUser/(?P<poll_url>\w+)/$', - 'papillon.polls.views.editChoicesUser', name='edit_choices_user'), - url(base + r'category/(?P<category_id>\w+)/$', - 'papillon.polls.views.category', name='category'), - url(base + r'poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll', - name='poll'), - url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'papillon.polls.views.poll', - name='vote'), - url(base + r'feeds/poll/(?P<poll_url>\w+)$', PollLatestEntries(), name='feed'), - (base + r'static/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': settings.PROJECT_PATH + '/static'}), - (base + r'media/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': settings.PROJECT_PATH + '/media/'}), +urlpatterns = patterns( + '', + (base + r'admin/doc/', include('django.contrib.admindocs.urls')), + url(base + r'admin/jsi18n/$', 'django.views.i18n.javascript_catalog', + name='admin_i18n'), + url(base + r'^admin/', include(admin.site.urls)), + url(base + r'$', 'papillon.polls.views.index', name='index'), + url(base + r'create/$', 'papillon.polls.views.create', name='create'), + url(base + r'edit/(?P<admin_url>\w+)/$', + 'papillon.polls.views.edit', name='edit'), + url(base + r'editChoicesAdmin/(?P<admin_url>\w+)/$', + 'papillon.polls.views.editChoicesAdmin', name='edit_choices_admin'), + url(base + r'editChoicesUser/(?P<poll_url>\w+)/$', + 'papillon.polls.views.editChoicesUser', name='edit_choices_user'), + url(base + r'category/(?P<category_id>\w+)/$', + 'papillon.polls.views.category', name='category'), + url(base + r'poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll', + name='poll'), + url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'papillon.polls.views.poll', + name='vote'), + url(base + r'feeds/poll/(?P<poll_url>\w+)$', PollLatestEntries(), + name='feed'), ) + +urlpatterns += staticfiles_urlpatterns() |