X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/793b39c86e9583467f1cbc41f8b1a4677d079f23..391b7a7b21da0ae7aae68826cfee514c8ea7eca9:/apps/wiki/urls.py?ds=sidebyside diff --git a/apps/wiki/urls.py b/apps/wiki/urls.py index 7ed47a01..dc866cd5 100644 --- a/apps/wiki/urls.py +++ b/apps/wiki/urls.py @@ -1,33 +1,14 @@ # -*- 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'^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'^gallery/(?P[^/]+)/$', 'gallery', name="wiki_gallery"), @@ -43,14 +24,8 @@ urlpatterns = patterns('wiki.views', url(r'^revert/(?P[^/]+)/(?:(?P[^/]+)/)?$', 'revert', name='wiki_revert'), - #url(r'^(?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'^(?P[^/]+)/tags$', 'add_tag', name="wiki_add_tag"), - - url(r'^full/(?P[^/]+)/$', 'compiled', name="wiki_compiled"), + url(r'^pubmark/(?P[^/]+)/(?:(?P[^/]+)/)?$', 'pubmark', name="wiki_pubmark"), - url(r'^book/(?P[^/]+)/$', object_detail, - {"queryset": Book.objects.all()}, name="wiki_book"), + url(r'^themes$', 'themes', name="themes"), )