X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f938afb8ab4cb091d12e0ef0311eaea14b774798..d2d235d21ca86ea846ef0b6174f2820df086f4d7:/redakcja/urls.py diff --git a/redakcja/urls.py b/redakcja/urls.py index 904ad447..dd7f884d 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -4,6 +4,8 @@ from django.conf.urls.defaults import * from django.contrib import admin from django.conf import settings +import wiki.urls + admin.autodiscover() urlpatterns = patterns('', @@ -16,6 +18,9 @@ urlpatterns = patterns('', url(r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), + url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), + url(r'^documents/', include('wiki.urls')), + # Static files (should be served by Apache) url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), @@ -23,7 +28,8 @@ 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}), - + (r'^documents/', include(wiki.urls)), + url(r'^themes$', 'wiki.views.themes', name="themes"), url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), - url(r'^documents/', include('wiki.urls')), + )