X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/af0693ddb5e4f6240d273c8a66fd1e6ef2a52872..1b97de98f9d2907bedc3dc15ab24b239e895e93e:/apps/wiki/urls.py?ds=sidebyside

diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py
index ac731eff..40e1d502 100644
--- a/apps/wiki/urls.py
+++ b/apps/wiki/urls.py
@@ -1,59 +1,17 @@
 # -*- coding: utf-8
-from django.conf.urls.defaults import *
-from django.views.generic.simple import redirect_to
-from django.views.generic.list_detail import object_detail
-from django.conf import settings
-from wiki.models import Book
+from django.conf.urls import url
+from wiki import views
 
+urlpatterns = (
+    url(r'^edit/(?P<pk>[^/]+)/$', views.editor, name="wiki_editor"),
 
-#PART = ur"""[ ĄĆĘŁŃÓŚŻŹąćęłńóśżź0-9\w_.-]+"""
+    url(r'^gallery/(?P<directory>[^/]+)/$', views.gallery, name="wiki_gallery"),
 
-urlpatterns = patterns('wiki.views',
-    url(r'^$', redirect_to, {'url': 'catalogue/'}),
+    url(r'^history/(?P<doc_id>\d+)/$', views.history, name="wiki_history"),
 
-    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'^text/(?P<doc_id>\d+)/$', views.text, name="wiki_text"),
 
-    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'^upload/$',
-        'upload', name='wiki_upload'),
-
-    url(r'^create/(?P<slug>[^/]*)/',
-        'create_missing', name='wiki_create_missing'),
-
-    url(r'^gallery/(?P<directory>[^/]+)/$',
-        'gallery', name="wiki_gallery"),
-
-    url(r'^history/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$',
-        'history', name="wiki_history"),
-
-    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'^(?P<name>[^/]+)/publish$', 'publish', name="wiki_publish"),
-    #url(r'^(?P<name>[^/]+)/publish/(?P<version>\d+)$', 'publish', name="wiki_publish"),
-
-    url(r'^diff/(?P<slug>[^/]+)/(?:(?P<chunk>[^/]+)/)?$', 'diff', name="wiki_diff"),
-    #url(r'^(?P<name>[^/]+)/tags$', 'add_tag', name="wiki_add_tag"),
-
-    url(r'^book/(?P<slug>[^/]+)/$', 'book', name="wiki_book"),
-    url(r'^book/(?P<slug>[^/]+)/xml$', 'book_xml', name="wiki_book_xml"),
-    url(r'^book/(?P<slug>[^/]+)/txt$', 'book_txt', name="wiki_book_txt"),
-    url(r'^book/(?P<slug>[^/]+)/html$', 'book_html', name="wiki_book_html"),
-    #url(r'^book/(?P<slug>[^/]+)/epub$', 'book_epub', name="wiki_book_epub"),
-    #url(r'^book/(?P<slug>[^/]+)/pdf$', 'book_pdf', name="wiki_book_pdf"),
+    url(r'^revert/(?P<doc_id>\d+)/$', views.revert, name='wiki_revert'),
 
+    url(r'^diff/(?P<doc_id>\d+)/$', views.diff, name="wiki_diff"),
 )