Revision 4691814d snf-webproject/synnefo/webproject/urls.py
b/snf-webproject/synnefo/webproject/urls.py | ||
---|---|---|
47 | 47 |
urlpatterns += patterns('django.views.generic.simple', |
48 | 48 |
url(r'^$', 'redirect_to', {'url': ROOT_REDIRECT})) |
49 | 49 |
|
50 |
urlpatterns += patterns('', |
|
50 |
urlpatterns += patterns( |
|
51 |
'', |
|
51 | 52 |
(r'^lang/$', 'synnefo.webproject.i18n.set_language') |
52 | 53 |
) |
53 | 54 |
|
... | ... | |
70 | 71 |
urlns = ns |
71 | 72 |
url_r = r'^%s%s/(?P<path>.*)$' % (settings.MEDIA_URL.lstrip("/"), |
72 | 73 |
urlns) |
73 |
urlpatterns += patterns('', url(url_r, |
|
74 |
'django.views.static.serve', |
|
75 |
{'document_root': static_root, |
|
76 |
'show_indexes': getattr(settings, |
|
77 |
'WEBPROJECT_STATIC_SHOW_INDEXES', True)})) |
|
74 |
urlpatterns += patterns( |
|
75 |
'', url(url_r, |
|
76 |
'django.views.static.serve', |
|
77 |
{'document_root': static_root, |
|
78 |
'show_indexes': getattr( |
|
79 |
settings, 'WEBPROJECT_STATIC_SHOW_INDEXES', True) |
|
80 |
})) |
|
78 | 81 |
|
79 | 82 |
else: |
80 | 83 |
# app contains static files in <appname>/static/<appname> |
81 | 84 |
for fpath in os.listdir(static_root): |
82 | 85 |
urlns = ns + fpath |
83 |
url_r = r'^%s%s/(?P<path>.*)$' % (settings.MEDIA_URL.lstrip("/"), urlns) |
|
86 |
url_r = r'^%s%s/(?P<path>.*)$' % \ |
|
87 |
(settings.MEDIA_URL.lstrip("/"), urlns) |
|
84 | 88 |
static_root = os.path.join(static_root, urlns) |
85 |
urlpatterns += patterns('', url(url_r, |
|
86 |
'django.views.static.serve', |
|
87 |
{'document_root': static_root, |
|
88 |
'show_indexes': getattr(settings, |
|
89 |
'WEBPROJECT_STATIC_SHOW_INDEXES', True)})) |
|
89 |
urlpatterns += patterns( |
|
90 |
'', url(url_r, |
|
91 |
'django.views.static.serve', |
|
92 |
{'document_root': static_root, |
|
93 |
'show_indexes': getattr( |
|
94 |
settings, |
|
95 |
'WEBPROJECT_STATIC_SHOW_INDEXES', True) |
|
96 |
})) |
|
90 | 97 |
|
91 | 98 |
# also serve the media root after all explicitly defined paths |
92 | 99 |
# to be able to serve uploaded files |
93 |
urlpatterns += patterns('', url(r'^%s(?P<path>.*)$' % \ |
|
94 |
settings.MEDIA_URL.lstrip("/"), |
|
95 |
'django.views.static.serve', |
|
96 |
{'document_root': settings.MEDIA_ROOT, |
|
97 |
'show_indexes': getattr(settings, |
|
98 |
'WEBPROJECT_STATIC_SHOW_INDEXES', True)})) |
|
100 |
urlpatterns += patterns( |
|
101 |
'', url(r'^%s(?P<path>.*)$' % |
|
102 |
settings.MEDIA_URL.lstrip("/"), |
|
103 |
'django.views.static.serve', |
|
104 |
{'document_root': settings.MEDIA_ROOT, |
|
105 |
'show_indexes': getattr( |
|
106 |
settings, 'WEBPROJECT_STATIC_SHOW_INDEXES', True) |
|
107 |
})) |
|
99 | 108 |
|
100 | 109 |
urlpatterns = extend_urls(urlpatterns, 'synnefo') |
101 | 110 |
|
Also available in: Unified diff