#958: keep newlines in autotagging

[redakcja.git] / redakcja / urls.py

diff --git a/redakcja/urls.py b/redakcja/urls.py
index 904ad44..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('',


@@ -16,6 +18,9 @@ urlpatterns = patterns('',
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
 
     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<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     # Static files (should be served by Apache)
     url(r'^%s(?P<path>.+)$' % 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<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/'}),
     url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),

-    url(r'^documents/', include('wiki.urls')),
+

 )
 )