X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/56511fcfdd20abcaf54827a90125c527d154125b..e7c8c7e1fd0fe2eb867b26ae205b75822204a45f:/apps/catalogue/urls.py?ds=inline diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index 647bc9f37..6e98fb094 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -2,29 +2,32 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url +from django.db.models import Max +from django.views.generic import ListView, RedirectView from catalogue.feeds import AudiobookFeed from catalogue.views import CustomPDFFormView +from catalogue.models import Book SLUG = r'[a-z0-9-]*' urlpatterns = patterns('picture.views', # pictures - currently pictures are coupled with catalogue, hence the url is here - url(r'^obraz/?$', 'picture_list'), - url(r'^obraz/(?P%s)/?$' % SLUG, 'picture_detail') + url(r'^obraz/$', 'picture_list_thumb', name='picture_list_thumb'), + url(r'^obraz/(?P%s).html$' % SLUG, 'picture_viewer', name='picture_viewer'), + url(r'^obraz/(?P%s)/$' % SLUG, 'picture_detail'), + + url(r'^p/(?P\d+)/mini\.(?P.+)\.html', 'picture_mini', name='picture_mini'), + url(r'^p/(?P\d+)/short\.(?P.+)\.html', 'picture_short', name='picture_short'), + url(r'^pa/(?P\d+)/short\.(?P.+)\.html', 'picturearea_short', name='picture_area_short'), ) -# workaround for Django ticket #17111; redirect when resolved -urlpatterns += patterns('search.views', - url(r'^szukaj/$', 'main'), +urlpatterns += patterns('', + # old search page - redirected + url(r'^szukaj/$', RedirectView.as_view( + url='/szukaj/', query_string=True)), ) -#urlpatterns += patterns('django.views.generic.simple', -# # old search page - redirected -# url(r'^szukaj/$', 'redirect_to', -# -# {'url': '/szukaj/', 'query_string': True}), -#) urlpatterns += patterns('catalogue.views', url(r'^$', 'catalogue', name='catalogue'), @@ -34,8 +37,16 @@ urlpatterns += patterns('catalogue.views', url(r'^audiobooki/$', 'audiobook_list', 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'^szukaj/$', 'search', name='old_search'), + 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'), + 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'), url(r'^custompdf/(?P%s)/$' % SLUG, CustomPDFFormView(), name='custom_pdf_form'), @@ -56,6 +67,15 @@ urlpatterns += patterns('catalogue.views', url(r'^lektura/(?P%s)/motyw/(?P[a-zA-Z0-9-]+)/$' % SLUG, 'book_fragments', name='book_fragments'), + # 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+)/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'), + url(r'^f/(?P\d+)/short\.(?P.+)\.html', 'fragment_short', name='catalogue_fragment_short'), + # This should be the last pattern. url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'), )