X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a73b3d8f83229ad3ebf10115d38992ca68577b78..42faac096df5479bd7747d9068eb88d1410d6d34:/platforma/urls.py

diff --git a/platforma/urls.py b/platforma/urls.py
old mode 100755
new mode 100644
index cfa23001..c31e1459
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -5,29 +5,11 @@ from django.contrib import admin
 from django.conf import settings
 
 admin.autodiscover()
-PATH_SEC = r"(?P<path>[^/]+)"
-PATH_END = PATH_SEC + "/$"
 
-
-
-urlpatterns = patterns('')
-
-if 'cas_consumer' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
-        # django-cas-consumer
-        url(r'^accounts/login/$', 'cas_consumer.views.login', name = 'login'),
-        url(r'^accounts/logout/$', 'cas_consumer.views.logout', name = 'logout'),
-    )
-else:
-    urlpatterns += patterns('',
-        # Django auth
-        url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name = 'login'),
-        url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name = 'logout'),
-    )
-
-urlpatterns += patterns('',
-    url(r'^$', 'wiki.views.document_list'),
-    url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'),
+urlpatterns = patterns('',
+    # Auth
+    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')),
@@ -41,8 +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}),
-
-    url(r'^(?P<name>[^/]+)$', 'wiki.views.document_detail'),
-
+    url(r'^', include('wiki.urls')),
 )
-