diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -24,31 +24,34 @@ from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns admin.autodiscover() -urlpatterns = patterns('django.views.static', +urlpatterns = patterns( + 'django.views.static', (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', {'document_root': settings.MEDIA_ROOT}), ) urlpatterns += staticfiles_urlpatterns() -urlpatterns += patterns('', +urlpatterns += patterns( + '', (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'chimere_saclay.views.edit', name="edit"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/(?P<submited>\w+)?$', - 'chimere_saclay.views.edit', name="edit-item"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/' + r'(?P<submited>\w+)?$', + 'chimere_saclay.views.edit', name="edit-item"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-event/$', - 'chimere_saclay.views.edit', name="edit-event", kwargs={'event':True}), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-event/(?P<item_id>\w+)/(?P<submited>\w+)?$', - 'chimere_saclay.views.edit', kwargs={'event':True}, - name="edit-event-item"), + 'chimere_saclay.views.edit', name="edit-event", + kwargs={'event': True}), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-event/(?P<item_id>\w+)/' + r'(?P<submited>\w+)?$', 'chimere_saclay.views.edit', + kwargs={'event': True}, name="edit-event-item"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$', 'chimere_saclay.views.edit_route', name="edit-route"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/(?P<submited>\w+)?$', - 'chimere_saclay.views.edit_route', name="edit-route-item"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/' + r'(?P<submited>\w+)?$', 'chimere_saclay.views.edit_route', + name="edit-route-item"), url(r'^(saclay/)?$', 'chimere_saclay.views.index_saclay', name="index-saclay"), url(r'^', include('chimere.urls', namespace="chimere")), ) - - |