Changed WSGI script.

[redakcja.git] / platforma / urls.py

diff --git a/platforma/urls.py b/platforma/urls.py
old mode 100755 (executable)
new mode 100644 (file)
index 1abc899..d875a6e
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -6,18 +6,10 @@ from django.conf import settings
 
 admin.autodiscover()
 
 
 admin.autodiscover()
 

-if 'cas_consumer' in settings.INSTALLED_APPS:
-    auth_views = 'cas_consumer.views'
-else:
-    auth_views = 'django.contrib.auth.views'
-

 urlpatterns = patterns('',
 urlpatterns = patterns('',

-    url(r'^$', 'wiki.views.document_list'),
-    url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'),
-

     # Auth
     # Auth

-    url(r'^accounts/login/$', auth_views + '.login', name = 'login'),
-    url(r'^accounts/logout/$', auth_views + '.logout', 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')),
 
     # Admin panel
     (r'^admin/filebrowser/', include('filebrowser.urls')),


@@ -31,6 +23,5 @@ 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}),
         {'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}),

-
-    url(r'^(?P<name>[^/]+)$', 'wiki.views.document_detail'),
+    url(r'^', include('wiki.urls')),

 )
 )