X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/132297f0be27da544304733bd24da32282310235..1c4c468783e5f380324c29ebc3b2c452da8cc2a0:/redakcja/urls.py diff --git a/redakcja/urls.py b/redakcja/urls.py index d9297e29..43881059 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -10,7 +10,8 @@ from django.views.generic import RedirectView admin.autodiscover() -urlpatterns = patterns('', +urlpatterns = patterns( + '', # Auth url(r'^accounts/login/$', 'django_cas.views.login', name='login'), url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), @@ -23,13 +24,12 @@ urlpatterns = patterns('', (r'^comments/', include('django.contrib.comments.urls')), - url(r'^$', RedirectView.as_view(url= '/documents/')), + url(r'^$', RedirectView.as_view(url='/documents/')), url(r'^documents/', include('catalogue.urls')), url(r'^apiclient/', include('apiclient.urls')), url(r'^editor/', include('wiki.urls')), url(r'^cover/', include('cover.urls')), (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', dict(packages=['wiki'])), - ) if settings.DEBUG: @@ -37,7 +37,16 @@ if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if getattr(settings, 'SERVE_FILES_WITH_DEBUG_FALSE', False): - urlpatterns += patterns('', - (r'^%s(?P.*)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), - (r'^%s(?P.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), -) + urlpatterns += patterns( + '', + ( + r'^%s(?P.*)$' % settings.STATIC_URL[1:], + 'django.views.static.serve', + {'document_root': settings.STATIC_ROOT} + ), + ( + r'^%s(?P.*)$' % settings.MEDIA_URL[1:], + 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT} + ), + )