X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/31e96ec0d71911f016193d5b67b6da3dc697ac9c..b8e94e0e7cc7576cbaacd3c737d6ffca6b12db53:/apps/catalogue/urls.py?ds=inline diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index 53928589d..6e98fb094 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -2,7 +2,7 @@ # 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 @@ -18,6 +18,9 @@ urlpatterns = patterns('picture.views', 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'), ) urlpatterns += patterns('', @@ -64,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'), )