X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/577bb2b84d936d65bf072ef0a6b898db9d6e77ab..082959e2bac9f53965f8fcdf56bfeaf8fb2e48dc:/redakcja/urls.py?ds=inline

diff --git a/redakcja/urls.py b/redakcja/urls.py
index edb5fc2e..4aedf58f 100644
--- a/redakcja/urls.py
+++ b/redakcja/urls.py
@@ -4,14 +4,16 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 from django.conf import settings
 
-import wiki.urls
 
 admin.autodiscover()
 
 urlpatterns = patterns('',
     # Auth
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
-    url(r'^accounts/logout/$', 'wiki.views.logout_then_redirect', name='logout'),
+    #url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
+    #url(r'^accounts/logout/$', 'catalogue.views.logout_then_redirect', name='logout'),
+
+    url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
+    url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
 
     # Admin panel
     (r'^admin/filebrowser/', include('filebrowser.urls')),
@@ -21,9 +23,9 @@ urlpatterns = patterns('',
     (r'^comments/', include('django.contrib.comments.urls')),
 
     url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
-    url(r'^documents/', include('wiki.urls')),
-    url(r'^storage/', include('dvcs.urls')),
+    url(r'^documents/', include('catalogue.urls')),
     url(r'^apiclient/', include('apiclient.urls')),
+    url(r'^editor/', include('wiki.urls')),
 
     # Static files (should be served by Apache)
     url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
@@ -32,8 +34,7 @@ urlpatterns = patterns('',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
         {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
-    (r'^documents/', include(wiki.urls)),
-    url(r'^themes$', 'wiki.views.themes', name="themes"),
+
     url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
 
 )