X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/64af15fe792f42d3a7dc3e857a45577d16806255..f3e8dfa015744bd72796fdd8eff0d81f863cdc46:/src/catalogue/urls.py?ds=inline diff --git a/src/catalogue/urls.py b/src/catalogue/urls.py index 458f336f1..16c4567ca 100644 --- a/src/catalogue/urls.py +++ b/src/catalogue/urls.py @@ -20,7 +20,6 @@ urlpatterns = [ url(r'^obraz/(?P%s).html$' % SLUG, picture.views.picture_viewer, name='picture_viewer'), url(r'^obraz/(?P%s)/$' % SLUG, picture.views.picture_detail, name='picture_detail'), - url(r'^p/(?P\d+)/mini\.(?P.+)\.html', picture.views.picture_mini, name='picture_mini'), url(r'^p/(?P\d+)/short\.(?P.+)\.html', picture.views.picture_short, name='picture_short'), url(r'^pa/(?P\d+)/short\.(?P.+)\.html', picture.views.picturearea_short, name='picture_area_short'), @@ -57,7 +56,7 @@ urlpatterns = [ url(r'^audiobooki/(?Pmp3|ogg|daisy|all).xml$', AudiobookFeed(), name='audiobook_feed'), - url(r'^pobierz/(?P%s).(?P[a-z0-9]*)$' % SLUG, views.embargo_link, name='embargo_link'), + url(r'^pobierz/(?P.*)/(?P%s).(?P[a-z0-9]*)$' % SLUG, views.embargo_link, name='embargo_link'), # zip url(r'^zip/pdf\.zip$', views.download_zip, {'format': 'pdf', 'slug': None}, 'download_zip_pdf'), @@ -77,9 +76,6 @@ urlpatterns = [ url(r'^isbn/(?P(pdf|epub|mobi|txt|html))/(?P%s)/' % SLUG, views.get_isbn), # Includes. - url(r'^b/(?P\d+)/mini\.(?P.+)\.html', views.book_mini, name='catalogue_book_mini'), - url(r'^b/(?P\d+)/mini_nolink\.(?P.+)\.html', views.book_mini, {'with_link': False}, - name='catalogue_book_mini_nolink'), url(r'^b/(?P\d+)/short\.(?P.+)\.html', views.book_short, name='catalogue_book_short'), url(r'^b/(?P\d+)/wide\.(?P.+)\.html', views.book_wide, name='catalogue_book_wide'), url(r'^f/(?P\d+)/promo\.(?P.+)\.html', views.fragment_promo, name='catalogue_fragment_promo'),