diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 43 |
1 files changed, 4 insertions, 39 deletions
@@ -17,48 +17,13 @@ # See the file COPYING for details. -from django.conf import settings -from django.conf.urls import patterns, url, include -from django.conf.urls.static import static +from django.conf.urls import url, include from django.contrib import admin -from django.contrib.staticfiles.urls import staticfiles_urlpatterns admin.autodiscover() -urlpatterns = patterns( - 'django.views.static', - (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', - {'document_root': settings.MEDIA_ROOT}), -) -if "tinymce" in settings.INSTALLED_APPS: - urlpatterns += patterns( - 'django.views.static', - (r'^tinymce/', include('tinymce.urls')),) -urlpatterns += staticfiles_urlpatterns() - -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+)/' - 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+)/' - 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+)/' - 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")), -) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) +urlpatterns = [ + url(r'^', include('chimere.urls')), +] |