better ordering for tags

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

diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py
index dc866cd..40e1d50 100644 (file)
--- a/apps/wiki/urls.py
+++ b/apps/wiki/urls.py
@@ -1,31 +1,17 @@
 # -*- coding: utf-8
-from django.conf.urls.defaults import *
+from django.conf.urls import url
+from wiki import views
 
+urlpatterns = (
+    url(r'^edit/(?P<pk>[^/]+)/$', views.editor, name="wiki_editor"),
 
-urlpatterns = patterns('wiki.views',
-    url(r'^edit/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
-        'editor', name="wiki_editor"),
+    url(r'^gallery/(?P<directory>[^/]+)/$', views.gallery, name="wiki_gallery"),
 
-    url(r'^readonly/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
-        'editor_readonly', name="wiki_editor_readonly"),
+    url(r'^history/(?P<doc_id>\d+)/$', views.history, name="wiki_history"),
 
-    url(r'^gallery/(?P<directory>[^/]+)/$',
-        'gallery', name="wiki_gallery"),
+    url(r'^text/(?P<doc_id>\d+)/$', views.text, name="wiki_text"),
 
-    url(r'^history/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
-        'history', name="wiki_history"),
+    url(r'^revert/(?P<doc_id>\d+)/$', views.revert, name='wiki_revert'),
 
-    url(r'^rev/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
-        'revision', name="wiki_revision"),
-
-    url(r'^text/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
-        'text', name="wiki_text"),
-
-    url(r'^revert/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
-        'revert', name='wiki_revert'),
-
-    url(r'^diff/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$', 'diff', name="wiki_diff"),
-    url(r'^pubmark/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$', 'pubmark', name="wiki_pubmark"),
-
-    url(r'^themes$', 'themes', name="themes"),
+    url(r'^diff/(?P<doc_id>\d+)/$', views.diff, name="wiki_diff"),
 )