X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f29c8cb6c8bb788fe4dcd93f59dee829d1281c69..b6acaa277803adf1f39dd61b362ca499b1bb6064:/src/catalogue/urls.py?ds=inline diff --git a/src/catalogue/urls.py b/src/catalogue/urls.py index bc9f78d87..50a4a4af9 100644 --- a/src/catalogue/urls.py +++ b/src/catalogue/urls.py @@ -43,15 +43,13 @@ urlpatterns += patterns( url(r'^rodzaj/$', 'tag_catalogue', {'category': 'kind'}, name='kind_catalogue'), url(r'^motyw/$', 'tag_catalogue', {'category': 'theme'}, name='theme_catalogue'), - url(r'^galeria/$', 'tagged_object_list', {'gallery': True}, name='gallery'), + url(r'^galeria/$', 'gallery', name='gallery'), url(r'^kolekcje/$', 'collections', name='catalogue_collections'), - url(r'^lektury/$', 'tagged_object_list', name='book_list'), + url(r'^lektury/$', 'literature', name='book_list'), url(r'^lektury/(?P[a-zA-Z0-9-]+)/$', 'collection', name='collection'), - url(r'^audiobooki/$', 'audiobook_list', name='audiobook_list'), + url(r'^audiobooki/$', 'audiobooks', name='audiobook_list'), url(r'^daisy/$', 'daisy_list', name='daisy_list'), - url(r'^tags/$', 'tags_starting_with', name='hint'), - url(r'^jtags/?$', 'json_tags_starting_with', name='jhint'), url(r'^nowe/$', ListView.as_view( queryset=Book.objects.filter(parent=None).order_by('-created_at'), template_name='catalogue/recent_list.html'), name='recent_list'), @@ -66,6 +64,7 @@ urlpatterns += patterns( url(r'^audiobooki/(?Pmp3|ogg|daisy|all).xml$', AudiobookFeed(), name='audiobook_feed'), + url(r'^pobierz/(?P%s).(?P[a-z0-9]*)$' % SLUG, 'embargo_link', name='embargo_link'), # zip url(r'^zip/pdf\.zip$', 'download_zip', {'format': 'pdf', 'slug': None}, 'download_zip_pdf'), @@ -81,6 +80,9 @@ urlpatterns += patterns( url(r'^lektura/(?P%s)/motyw/(?P[a-zA-Z0-9-]+)/$' % SLUG, 'book_fragments', name='book_fragments'), + url(r'^okladka-ridero/(?P%s).png$' % SLUG, 'ridero_cover'), + url(r'^isbn/(?P(pdf|epub|mobi|txt|html))/(?P%s)/' % SLUG, 'get_isbn'), + # Includes. url(r'^b/(?P\d+)/mini\.(?P.+)\.html', 'book_mini', name='catalogue_book_mini'), url(r'^b/(?P\d+)/mini_nolink\.(?P.+)\.html', 'book_mini', {'with_link': False}, @@ -93,7 +95,10 @@ urlpatterns += patterns( url(r'^c/(?P.+)/box\.(?P.+)\.html', 'collection_box', name='catalogue_collection_box'), # This should be the last pattern. - url(r'^galeria/(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', {'gallery': True}, + url(r'^galeria/(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', {'list_type': 'gallery'}, name='tagged_object_list_gallery'), - url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'), + url(r'^audiobooki/(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', {'list_type': 'audiobooks'}, + name='tagged_object_list_audiobooks'), + url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', {'list_type': 'books'}, + name='tagged_object_list'), )