X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a23dbb7035ceaf340540f9db370aa2292eddfe4e..2d0cc46d3bc3357c19d13fc585c0a9492e5ee1b7:/apps/catalogue/urls.py diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index 55ced66ff..7b1fb3d50 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 @@ -14,8 +14,10 @@ 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'), + ) urlpatterns += patterns('',