X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cb24d32c18f294a8d2d128f32db162457cddcb52..8d9f0f1b6f7607545370131c60738e37c3fd4d6f:/apps/catalogue/urls.py?ds=sidebyside diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index 1c52961fb..dc8cc9bdf 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -4,6 +4,7 @@ from django.conf.urls.defaults import * urlpatterns = patterns('catalogue.views', url(r'^$', 'main_page', name='main_page'), + url(r'^polki/(?P[a-zA-Z0-9-]+)/(?P[a-zA-Z0-9-0-]+)/usun$', 'remove_from_shelf', name='remove_from_shelf'), url(r'^polki/$', 'user_shelves', name='user_shelves'), url(r'^polki/(?P[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'), url(r'^polki/(?P[a-zA-Z0-9-]+)\.zip$', 'download_shelf', name='download_shelf'), @@ -16,6 +17,8 @@ urlpatterns = patterns('catalogue.views', # Public interface. Do not change this URLs. url(r'^lektura/(?P[a-zA-Z0-9-]+)\.html$', 'book_text', name='book_text'), url(r'^lektura/(?P[a-zA-Z0-9-]+)/$', 'book_detail', name='book_detail'), - url(r'^(?P[a-zA-Z0-9-/]+)/$', 'tagged_object_list', name='tagged_object_list'), + url(r'^lektura/(?P[a-zA-Z0-9-]+)/motyw/(?P[a-zA-Z0-9-]+)/$', + 'book_fragments', name='book_fragments'), + url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'), )