X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/87e084d47c335cd6f0b3e91d614999f55d148044..b6acaa277803adf1f39dd61b362ca499b1bb6064:/src/catalogue/urls.py?ds=inline diff --git a/src/catalogue/urls.py b/src/catalogue/urls.py index 35a08e11d..50a4a4af9 100644 --- a/src/catalogue/urls.py +++ b/src/catalogue/urls.py @@ -12,7 +12,10 @@ from catalogue.models import Book SLUG = r'[a-z0-9-]*' -urlpatterns = patterns('picture.views', +urlpatterns = patterns( + 'picture.views', + + url(r'^obraz/strona/$', 'picture_page', name='picture_page'), # pictures - currently pictures are coupled with catalogue, hence the url is here url(r'^obraz/$', 'picture_list_thumb', name='picture_list_thumb'), url(r'^obraz/(?P%s).html$' % SLUG, 'picture_viewer', name='picture_viewer'), @@ -23,13 +26,15 @@ urlpatterns = patterns('picture.views', url(r'^pa/(?P\d+)/short\.(?P.+)\.html', 'picturearea_short', name='picture_area_short'), ) -urlpatterns += patterns('', +urlpatterns += patterns( + '', # old search page - redirected url(r'^szukaj/$', RedirectView.as_view( url='/szukaj/', query_string=True, permanent=True)), ) -urlpatterns += patterns('catalogue.views', +urlpatterns += patterns( + 'catalogue.views', url(r'^$', 'catalogue', name='catalogue'), url(r'^autor/$', 'tag_catalogue', {'category': 'author'}, name='author_catalogue'), @@ -38,29 +43,28 @@ urlpatterns += patterns('catalogue.views', 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'), url(r'^nowe/audiobooki/$', ListView.as_view( queryset=Book.objects.filter(media__type='ogg').annotate(m=Max('media__uploaded_at')).order_by('-m'), - template_name='catalogue/recent_audiobooks_list.html'), name='recent_audiobooks_list'), + template_name='catalogue/recent_audiobooks_list.html'), name='recent_audiobooks_list'), url(r'^nowe/daisy/$', ListView.as_view( queryset=Book.objects.filter(media__type='daisy').annotate(m=Max('media__uploaded_at')).order_by('-m'), - template_name='catalogue/recent_daisy_list.html'), name='recent_daisy_list'), + template_name='catalogue/recent_daisy_list.html'), name='recent_daisy_list'), url(r'^custompdf/(?P%s)/$' % SLUG, CustomPDFFormView(), name='custom_pdf_form'), 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'), @@ -76,10 +80,13 @@ urlpatterns += patterns('catalogue.views', 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'^(?P[^/]+)\.json$', 'catalogue_json'), 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}, name='catalogue_book_mini_nolink'), + url(r'^b/(?P\d+)/mini_nolink\.(?P.+)\.html', 'book_mini', {'with_link': False}, + name='catalogue_book_mini_nolink'), url(r'^b/(?P\d+)/short\.(?P.+)\.html', 'book_short', name='catalogue_book_short'), url(r'^b/(?P\d+)/wide\.(?P.+)\.html', 'book_wide', name='catalogue_book_wide'), url(r'^f/(?P\d+)/promo\.(?P.+)\.html', 'fragment_promo', name='catalogue_fragment_promo'), @@ -88,6 +95,10 @@ urlpatterns += patterns('catalogue.views', 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}, name='tagged_object_list_gallery'), - url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'), + url(r'^galeria/(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', {'list_type': 'gallery'}, + name='tagged_object_list_gallery'), + 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'), )