X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/43116c58e5c56f94ef358a5a17fb13a252e02531..9c99d7609d675e42ec71a9b1929c0c13137db575:/redakcja/urls.py?ds=sidebyside

diff --git a/redakcja/urls.py b/redakcja/urls.py
index d25312d9..d9297e29 100644
--- a/redakcja/urls.py
+++ b/redakcja/urls.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls.defaults import *
+from django.conf.urls import include, patterns, url
 from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
@@ -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<path>.*)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+    (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
+)