X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/afdb8fd05511c5280e8ee251389cb893786eb810..24c1d259ba4af084959d70c6a1f355d0a57f1191:/platforma/urls.py?ds=sidebyside diff --git a/platforma/urls.py b/platforma/urls.py index 9b4b1a28..d875a6ea 100644 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -7,14 +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'), - url(r'^(?P[^/]+)/history$', 'wiki.views.document_history'), - url(r'^(?P[^/]+)/diff/(?P\d+)/(?P\d+)$', 'wiki.views.document_diff'), - # 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')), @@ -28,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')), )