X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e50a9a26fd33d555ffc3a8363f8aa936afbbcb2f..f7712b20c83a39b1020064cb87b1128f87b0ae51:/platforma/urls.py diff --git a/platforma/urls.py b/platforma/urls.py old mode 100755 new mode 100644 index bd296a92..d875a6ea --- a/platforma/urls.py +++ b/platforma/urls.py @@ -7,12 +7,9 @@ from django.conf import settings admin.autodiscover() urlpatterns = patterns('', - url(r'^$', 'wiki.views.document_list'), - url(r'^gallery/(?P[^/]+)$', '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')), @@ -26,6 +23,5 @@ urlpatterns = patterns('', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), - - url(r'^(?P[^/]+)$', 'wiki.views.document_detail'), + url(r'^', include('wiki.urls')), )