diff options
| -rw-r--r-- | urls.py | 34 |
1 files changed, 19 insertions, 15 deletions
@@ -18,31 +18,35 @@ # See the file COPYING for details. from django.conf import settings -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include from django.conf.urls.static import static from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns from chimere_saclay import views +from django.views.static import serve + admin.autodiscover() -urlpatterns = patterns( - 'django.views.static', - (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', - {'document_root': settings.MEDIA_ROOT}), -) + +urlpatterns = [] +if settings.DEBUG: + urlpatterns += [ + url(r'^media/(?P<path>.*)$', serve, { + 'document_root': settings.MEDIA_ROOT, + }), + ] if "tinymce" in settings.INSTALLED_APPS: - urlpatterns += patterns( - 'django.views.static', - (r'^tinymce/', include('tinymce.urls')),) + urlpatterns += [ + url(r'^tinymce/', include('tinymce.urls')), + ] urlpatterns += staticfiles_urlpatterns() -urlpatterns += patterns( - '', - (r'^admin/doc/', include('django.contrib.admindocs.urls')), - (r'^admin/', include(admin.site.urls)), +urlpatterns += [ + url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^admin/', include(admin.site.urls)), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn.css$', views.DynCSS.as_view(), name="dyn-css"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker/' @@ -60,7 +64,7 @@ urlpatterns += patterns( r'(?P<submited>\w+)?$', views.editPolygon, name="editpolygon-item"), url(r'^', include('chimere.urls', namespace="chimere")), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', 'chimere_saclay.views.index_saclay', + url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', views.index_saclay, name="index-saclay"), -) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) +] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) |