* Readonly document view.

[redakcja.git] / platforma / urls.py

diff --git a/platforma/urls.py b/platforma/urls.py
old mode 100755 (executable)
new mode 100644 (file)
index cfa2300..904ad44
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -5,34 +5,16 @@ 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')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/(.*)', admin.site.root),
+    (r'^admin/', include(admin.site.urls)),
 
     # Static files (should be served by Apache)
     url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
@@ -42,7 +24,6 @@ urlpatterns += patterns('',
     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'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
+    url(r'^documents/', include('wiki.urls')),
 )
-