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

[redakcja.git] / apps / wiki / urls.py

diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py
index b319465..f4da5f3 100644 (file)
--- a/apps/wiki/urls.py
+++ b/apps/wiki/urls.py
@@ -1,19 +1,46 @@
+# -*- coding: utf-8

 from django.conf.urls.defaults import *
 from django.conf.urls.defaults import *

+from django.views.generic.simple import redirect_to

 from django.conf import settings
 
 from django.conf import settings
 

-urlpatterns = patterns('wiki.views',    
-    url(r'^$', 
-        'document_list', name='wiki_doclist'),
-    url(r'^gallery/(?P<directory>[^/]+)$', 
-        'document_gallery', name="wiki_gallery"),
-    url(r'^(?P<name>[^/]+)/history$', 
-        'document_history', name="wiki_history"),
-    url(r'^(?P<name>[^/]+)/text$', 
-        'document_text', name="wiki_text"),
-    url(r'^(?P<name>[^/]+)/publish/(?P<version>\d+)$', 
-        'document_publish', name="wiki_publish"),
-    url(r'^(?P<name>[^/]+)/diff$', 
-        'document_diff', name="wiki_diff"),    
-    url(r'^(?P<name>[^/]+)$', 
-        'document_detail', name="wiki_details"),       
-)   
\ No newline at end of file
+
+PART = ur"""[ ĄĆĘŁŃÓŚŻŹąćęłńóśżź0-9\w_.-]+"""
+
+urlpatterns = patterns('wiki.views',
+    url(r'^$', redirect_to, {'url': 'catalogue/'}),
+
+    url(r'^catalogue/$', 'document_list', name='wiki_document_list'),
+    url(r'^catalogue/([^/]+)/$', 'document_list'),
+    url(r'^catalogue/([^/]+)/([^/]+)/$', 'document_list'),
+    url(r'^catalogue/([^/]+)/([^/]+)/([^/]+)$', 'document_list'),
+
+    url(r'^(?P<name>%s)$' % PART,
+        'editor', name="wiki_editor"),
+
+    url(r'^(?P<name>[^/]+)/readonly$',
+        'editor_readonly', name="wiki_editor_readonly"),
+
+    url(r'^upload/$',
+        'upload', name='wiki_upload'),
+
+    url(r'^create/(?P<name>[^/]+)',
+        'create_missing', name='wiki_create_missing'),
+
+    url(r'^(?P<directory>[^/]+)/gallery$',
+        'gallery', name="wiki_gallery"),
+
+    url(r'^(?P<name>[^/]+)/history$',
+        'history', name="wiki_history"),
+
+    url(r'^(?P<name>[^/]+)/text$',
+        'text', name="wiki_text"),
+
+    url(r'^(?P<name>[^/]+)/publish$', 'publish', name="wiki_publish"),
+    url(r'^(?P<name>[^/]+)/publish/(?P<version>\d+)$', 'publish', name="wiki_publish"),
+
+    url(r'^(?P<name>[^/]+)/diff$', 'diff', name="wiki_diff"),
+    url(r'^(?P<name>[^/]+)/tags$', 'add_tag', name="wiki_add_tag"),
+
+
+
+)