transform exercises order and true-or-false to WL1

[redakcja.git] / redakcja / urls.py

diff --git a/redakcja/urls.py b/redakcja/urls.py
index 17fa1bb..a381caa 100644 (file)
--- a/redakcja/urls.py
+++ b/redakcja/urls.py
@@ -10,10 +10,13 @@ from django.views.generic import RedirectView
 
 admin.autodiscover()
 
 
 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'),
     # 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')),
 
     # Admin panel
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),


@@ -21,13 +24,28 @@ urlpatterns = patterns('',
 
     (r'^comments/', include('django.contrib.comments.urls')),
 
 
     (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'^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:
     urlpatterns += staticfiles_urlpatterns()
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 )
 
 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}
+        ),
+    )