X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/fdd62169ba22c4c1be2f2306b5339eadd74ffb6d..92adaf4060fa5f65bfd8022ec03ebe94311f4552:/apps/wiki/urls.py

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