X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d09ed2493a6532135e8ab6613def2e62b695fe95..4e17ee1bbde80e43ae80fb6f28946e9364423ec8:/apps/catalogue/urls.py?ds=inline diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index d88a68f15..53928589d 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -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('', @@ -32,12 +34,12 @@ 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'^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__in=('mp3', 'ogg')).annotate(m=Max('media__uploaded_at')).order_by('-m'), + 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'),