X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/babe7f68fcbb8f7e73f9b62d611715ca28b4c4e6..3e82fe190f3d1fbfb7300a98ff1a3a0497d9e237:/redakcja/urls.py diff --git a/redakcja/urls.py b/redakcja/urls.py index 17fa1bbb..d9297e29 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -14,6 +14,8 @@ urlpatterns = patterns('', # Auth url(r'^accounts/login/$', 'django_cas.views.login', name='login'), url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), + url(r'^admin/login/$', 'django_cas.views.login', name='login'), + url(r'^admin/logout/$', 'django_cas.views.logout', name='logout'), # Admin panel url(r'^admin/doc/', include('django.contrib.admindocs.urls')), @@ -26,8 +28,16 @@ urlpatterns = patterns('', 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: urlpatterns += staticfiles_urlpatterns() 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}), +)