X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d6c4fb901ad64f828287556a26daab52449dab32..00a90d6175599e055f5a84697c8388d81ac1b007:/platforma/urls.py?ds=sidebyside diff --git a/platforma/urls.py b/platforma/urls.py index c31e1459..904ad447 100644 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -8,13 +8,13 @@ admin.autodiscover() urlpatterns = patterns('', # 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.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', @@ -23,5 +23,7 @@ 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'^', include('wiki.urls')), + + url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), + url(r'^documents/', include('wiki.urls')), )