altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Simplified the development-mode static files serving, since we're now using the django staticfiles infrastructure.

Browse source 
- Legacy-Id: 9951
This commit is contained in:
Henrik Levkowetz 2015-08-01 15:02:54 +00:00
parent 4dc4c6dc9a
commit ec84efedcd
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ietf/urls.py
View file

@ -1,15 +1,15 @@
# Copyright The IETF Trust 2007, 2009, All Rights Reserved
from django.conf import settings
from django.conf.urls import patterns, include
from django.contrib import admin
from django.views.generic import TemplateView
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from ietf.liaisons.sitemaps import LiaisonMap
from ietf.ipr.sitemaps import IPRMap
from ietf import api
from django.conf import settings
admin.autodiscover()
api.autodiscover()
@ -72,13 +72,24 @@ for n,a in api._api_list:
(r'^api/v1/', include(a.urls)),
)
# This is needed to serve files which are not handled by collectstatic:
# This is needed to serve files during testing
if settings.SERVER_MODE in ('development', 'test'):
urlpatterns += patterns('',
(r'^(?P<path>(?:images|css|js|test|static)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}),
(r'^(?P<path>admin/(?:img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}),
(r'^(?P<path>secretariat/(img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}),
(r'^(?P<path>robots\.txt)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL+"dev/"}),
(r'^_test500/$', lambda x: None),
(r'^environment/$', 'ietf.help.views.environment'),
)
urlpatterns += ( staticfiles_urlpatterns()
+ patterns('',
(r'^_test500/$', lambda x: None),
(r'^environment/$', 'ietf.help.views.environment'),
## maybe preserve some static legacy URLs ?
(r'^(?P<path>(?:images|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT+'ietf/'}),
)
)
# This is needed to serve files which are not handled by collectstatic :
# if settings.SERVER_MODE in ('development', 'test'):
# urlpatterns += patterns('',
# (r'^(?P<path>(?:images|css|js|test|static)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}),
# (r'^(?P<path>admin/(?:img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}),
# (r'^(?P<path>secretariat/(img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}),
# (r'^(?P<path>robots\.txt)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL+"dev/"}),
# (r'^_test500/$', lambda x: None),
# (r'^environment/$', 'ietf.help.views.environment'),
# )