X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/8830e06ad0b466c40747540b5122e6825114a90a..daacf83adcf2305add277eae0081f59c4c1a7863:/apps/wiki/urls.py diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py index f0b602c7..211bb3a7 100644 --- a/apps/wiki/urls.py +++ b/apps/wiki/urls.py @@ -1,73 +1,31 @@ # -*- 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 -#PART = ur"""[ ĄĆĘŁŃÓŚŻŹąćęłńóśżź0-9\w_.-]+""" - 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'^unassigned/$', 'unassigned', name='wiki_unassigned'), - url(r'^user/$', 'my', name='wiki_user'), - url(r'^user/(?P[^/]+)/$', 'user', name='wiki_user'), - url(r'^edit/(?P[^/]+)/(?:(?P[^/]+)/)?$', 'editor', name="wiki_editor"), url(r'^readonly/(?P[^/]+)/(?:(?P[^/]+)/)?$', 'editor_readonly', name="wiki_editor_readonly"), - url(r'^upload/$', - 'upload', name='wiki_upload'), - - url(r'^create/(?P[^/]*)/', - 'create_missing', name='wiki_create_missing'), - url(r'^create/', - 'create_missing', name='wiki_create_missing'), - url(r'^gallery/(?P[^/]+)/$', 'gallery', name="wiki_gallery"), - url(r'^history/(?P[^/]+)/(?:(?P[^/]+)/)?$', + url(r'^history/(?P\d+)/$', 'history', name="wiki_history"), - url(r'^rev/(?P[^/]+)/(?:(?P[^/]+)/)?$', + url(r'^rev/(?P\d+)/$', 'revision', name="wiki_revision"), - url(r'^text/(?P[^/]+)/(?:(?P[^/]+)/)?$', + url(r'^text/(?P\d+)/$', 'text', name="wiki_text"), - url(r'^revert/(?P[^/]+)/(?:(?P[^/]+)/)?$', + url(r'^revert/(?P\d+)/$', 'revert', name='wiki_revert'), - url(r'^book/(?P[^/]+)/publish$', 'publish', name="wiki_publish"), - #url(r'^(?P[^/]+)/publish/(?P\d+)$', 'publish', name="wiki_publish"), - - url(r'^diff/(?P[^/]+)/(?:(?P[^/]+)/)?$', 'diff', name="wiki_diff"), - url(r'^tag/(?P[^/]+)/(?:(?P[^/]+)/)?$', 'add_tag', name="wiki_add_tag"), - url(r'^pubmark/(?P[^/]+)/(?:(?P[^/]+)/)?$', 'pubmark', name="wiki_pubmark"), - - url(r'^book/(?P[^/]+)/$', 'book', name="wiki_book"), - url(r'^book/(?P[^/]+)/xml$', 'book_xml', name="wiki_book_xml"), - url(r'^book/(?P[^/]+)/txt$', 'book_txt', name="wiki_book_txt"), - url(r'^book/(?P[^/]+)/html$', 'book_html', name="wiki_book_html"), - #url(r'^book/(?P[^/]+)/epub$', 'book_epub', name="wiki_book_epub"), - #url(r'^book/(?P[^/]+)/pdf$', 'book_pdf', name="wiki_book_pdf"), - url(r'^chunk_add/(?P[^/]+)/(?P[^/]+)/$', - 'chunk_add', name="wiki_chunk_add"), - url(r'^chunk_edit/(?P[^/]+)/(?P[^/]+)/$', - 'chunk_edit', name="wiki_chunk_edit"), - url(r'^book_append/(?P[^/]+)/$', - 'book_append', name="wiki_book_append"), - url(r'^book_edit/(?P[^/]+)/$', - 'book_edit', name="wiki_book_edit"), + url(r'^diff/(?P\d+)/$', 'diff', name="wiki_diff"), + url(r'^pubmark/(?P\d+)/$', 'pubmark', name="wiki_pubmark"), + url(r'^themes$', 'themes', name="themes"), )