Merge branch 'master' of git@github.com:fnp/redakcja

[redakcja.git] / redakcja / urls.py

diff --git a/redakcja/urls.py b/redakcja/urls.py
index f8538fa..dd7f884 100644 (file)
--- 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
 
 from django.contrib import admin
 from django.conf import settings
 

+import wiki.urls
+

 admin.autodiscover()
 
 urlpatterns = patterns('',
 admin.autodiscover()
 
 urlpatterns = patterns('',


@@ -26,4 +28,8 @@ urlpatterns = patterns('',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
         {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     url(r'^%s(?P<path>.+)$' % 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/'}),
+

 )
 )