update localsettings + some cleanup

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

diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py
index ceb7416..40e1d50 100644 (file)
--- a/apps/wiki/urls.py
+++ b/apps/wiki/urls.py
@@ -1,52 +1,17 @@
 # -*- coding: utf-8
 # -*- coding: utf-8

-from django.conf.urls.defaults import *
-from django.views.generic.simple import redirect_to
-from django.conf import settings
+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'^catalogue/$', 'document_list', name='wiki_document_list'),
-    #url(r'^catalogue/([^/]+)/$', 'document_list'),
-    #url(r'^catalogue/([^/]+)/([^/]+)/$', 'document_list'),
-    #url(r'^catalogue/([^/]+)/([^/]+)/([^/]+)$', 'document_list'),
-
-    url(r'^(?P<slug>[^/]+)/$',
-        'editor', name="wiki_editor"),
-
-    url(r'^(?P<slug>[^/]+)/readonly$',
-        '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'^(?P<directory>[^/]+)/gallery$',
-        'gallery', name="wiki_gallery"),
-
-    url(r'^(?P<slug>[^/]+)/history$',
-        'history', name="wiki_history"),
-
-    url(r'^(?P<slug>[^/]+)/rev$',
-        'revision', name="wiki_revision"),
-
-    url(r'^(?P<slug>[^/]+)/text$',
-        'text', name="wiki_text"),
-
-    url(r'^(?P<slug>[^/]+)/revert$',
-        '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'^(?P<slug>[^/]+)/diff$', 'diff', name="wiki_diff"),
-    #url(r'^(?P<name>[^/]+)/tags$', 'add_tag', name="wiki_add_tag"),
+    url(r'^history/(?P<doc_id>\d+)/$', views.history, name="wiki_history"),

 
 

+    url(r'^text/(?P<doc_id>\d+)/$', views.text, name="wiki_text"),

 
 

+    url(r'^revert/(?P<doc_id>\d+)/$', views.revert, name='wiki_revert'),

 
 

+    url(r'^diff/(?P<doc_id>\d+)/$', views.diff, name="wiki_diff"),

 )
 )