Merge master into img-playground. Image support with new management features. Missing...

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

diff --git a/apps/wiki_img/urls.py b/apps/wiki_img/urls.py
index 075e5ad..b4396c6 100644 (file)
--- a/apps/wiki_img/urls.py
+++ b/apps/wiki_img/urls.py
@@ -1,20 +1,18 @@
 # -*- coding: utf-8
 from django.conf.urls.defaults import *
-from django.conf import settings
-from django.views.generic.list_detail import object_list
 
-from wiki_img.models import ImageDocument
-
-
-PART = ur"""[ ĄĆĘŁŃÓŚŻŹąćęłńóśżź0-9\w_.-]+"""
 
 urlpatterns = patterns('wiki_img.views',
-    url(r'^$', object_list, {'queryset': ImageDocument.objects.all(), "template_name": "wiki_img/document_list.html"}),
-
-    url(r'^edit/(?P<slug>%s)$' % PART,
+    url(r'^edit/(?P<slug>[^/]+)/$',
         'editor', name="wiki_img_editor"),
 
-    url(r'^(?P<slug>[^/]+)/text$',
+    url(r'^readonly/(?P<slug>[^/]+)/$',
+        'editor_readonly', name="wiki_img_editor_readonly"),
+
+    url(r'^text/(?P<image_id>\d+)/$',
         'text', name="wiki_img_text"),
 
+    url(r'^history/(?P<chunk_id>\d+)/$',
+        'history', name="wiki_history"),
+
 )