Merge branch 'edumed' of github.com:fnp/redakcja into edumed

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

diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py
index d403b76..211bb3a 100644 (file)
--- a/apps/wiki/urls.py
+++ b/apps/wiki/urls.py
@@ -1,18 +1,31 @@
+# -*- coding: utf-8

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

+

 urlpatterns = patterns('wiki.views',
 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>[^/]+)/publish/(?P<version>\d+)$', 
-        'document_publish', name="wiki_publish"),
-    url(r'^(?P<name>[^/]+)/diff/(?P<revA>\d+)/(?P<revB>\d+)$', 
-        'document_diff', name="wiki_diff"),    
-    url(r'^(?P<name>[^/]+)$', 
-        'document_detail', name="wiki_details"),        
-    
-)   
+    url(r'^edit/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
+        'editor', name="wiki_editor"),
+
+    url(r'^readonly/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
+        'editor_readonly', name="wiki_editor_readonly"),
+
+    url(r'^gallery/(?P<directory>[^/]+)/$',
+        'gallery', name="wiki_gallery"),
+
+    url(r'^history/(?P<chunk_id>\d+)/$',
+        'history', name="wiki_history"),
+
+    url(r'^rev/(?P<chunk_id>\d+)/$',
+        'revision', name="wiki_revision"),
+
+    url(r'^text/(?P<chunk_id>\d+)/$',
+        'text', name="wiki_text"),
+
+    url(r'^revert/(?P<chunk_id>\d+)/$',
+        'revert', name='wiki_revert'),
+
+    url(r'^diff/(?P<chunk_id>\d+)/$', 'diff', name="wiki_diff"),
+    url(r'^pubmark/(?P<chunk_id>\d+)/$', 'pubmark', name="wiki_pubmark"),

 
 

+    url(r'^themes$', 'themes', name="themes"),
+)