X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e50a9a26fd33d555ffc3a8363f8aa936afbbcb2f..00a90d6175599e055f5a84697c8388d81ac1b007:/platforma/urls.py?ds=sidebyside

diff --git a/platforma/urls.py b/platforma/urls.py
old mode 100755
new mode 100644
index bd296a92..904ad447
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -7,17 +7,14 @@ from django.conf import settings
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^$', 'wiki.views.document_list'),
-    url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'),
-
     # Auth
-    url(r'^accounts/login/$', 'django_cas.views.login', name = 'login'),
-    url(r'^accounts/logout/$', 'django_cas.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')),
     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',
@@ -27,5 +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')),
 )