X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bb7b805e9838225a912041690e6a4cd0654dcbd8..db50b75e23a5cd6b29d1315f3a8ed2b7befeb81f:/redakcja/urls.py diff --git a/redakcja/urls.py b/redakcja/urls.py index f8538fa8..20994ce1 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('', @@ -18,6 +20,7 @@ urlpatterns = patterns('', url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), url(r'^documents/', include('wiki.urls')), + url(r'^storage/', include('dvcs.urls')), # Static files (should be served by Apache) url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', @@ -26,4 +29,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/'}), + )