Catalogue improvements.

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

diff --git a/src/wiki/urls.py b/src/wiki/urls.py
index 0c73aed..f2fa3f5 100644 (file)
--- a/src/wiki/urls.py
+++ b/src/wiki/urls.py
@@ -1,31 +1,27 @@
-# -*- coding: utf-8
-from django.conf.urls import patterns, url
-
-
-urlpatterns = patterns('wiki.views',
-    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'^gallery/(?P<directory>[^/]+)/$',
-        'gallery', name="wiki_gallery"),
-
-    url(r'^history/(?P<chunk_id>\d+)/$',
-        'history', name="wiki_history"),
-
-    url(r'^rev/(?P<chunk_id>\d+)/$',
-        'revision', name="wiki_revision"),
-
-    url(r'^text/(?P<chunk_id>\d+)/$',
-        'text', name="wiki_text"),
-
-    url(r'^revert/(?P<chunk_id>\d+)/$',
-        'revert', name='wiki_revert'),
-
-    url(r'^diff/(?P<chunk_id>\d+)/$', 'diff', name="wiki_diff"),
-    url(r'^pubmark/(?P<chunk_id>\d+)/$', 'pubmark', name="wiki_pubmark"),
-
-    url(r'^themes$', 'themes', name="themes"),
-)
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.urls import path
+from . import views
+
+
+urlpatterns = [
+    path('edit/<slug:slug>/<slug:chunk>/', views.editor, name="wiki_editor"),
+    path('edit/<slug:slug>/', views.editor, name="wiki_editor"),
+
+    path('readonly/<slug:slug>/<slug:chunk>/',
+         views.editor_readonly, name="wiki_editor_readonly"),
+    path('readonly/<slug:slug>/',
+         views.editor_readonly, name="wiki_editor_readonly"),
+
+    path('gallery/<directory>/', views.gallery, name="wiki_gallery"),
+    path('history/<int:chunk_id>/', views.history, name="wiki_history"),
+    path('rev/<int:chunk_id>/', views.revision, name="wiki_revision"),
+    path('text/<int:chunk_id>/', views.text, name="wiki_text"),
+    path('revert/<int:chunk_id>/', views.revert, name='wiki_revert'),
+    path('diff/<int:chunk_id>/', views.diff, name="wiki_diff"),
+    path('pubmark/<int:chunk_id>/', views.pubmark, name="wiki_pubmark"),
+    path('themes', views.themes, name="themes"),
+    path('back/', views.back),
+    path('editor-user-area/', views.editor_user_area),
+]