X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7467ef6a69270fb9e502d7d630b50bb17615dc35..ee01d50d05b7d72dd372e8f3a0c78b9da6c23b38:/platforma/urls.py?ds=sidebyside diff --git a/platforma/urls.py b/platforma/urls.py old mode 100755 new mode 100644 index 161b552a..c31e1459 --- 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'), - url(r'^accounts/logout/$', 'django_cas.views.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')), )