Celery 3.1, librarian update

[wolnelektury.git] / apps / catalogue / urls.py

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index e9f6383..7b1fb3d 100644 (file)
--- 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<picture>%s)/?$' % SLUG, 'picture_detail')
+    url(r'^obraz/$', 'picture_list_thumb', name='picture_list_thumb'),
+    url(r'^obraz/(?P<slug>%s).html$' % SLUG, 'picture_viewer', name='picture_viewer'),
+    url(r'^obraz/(?P<slug>%s)/$' % SLUG, 'picture_detail'),
+
 )
 
 urlpatterns += patterns('',
@@ -32,7 +34,7 @@ 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'),
@@ -57,7 +59,6 @@ urlpatterns += patterns('catalogue.views',
 
     # Public interface. Do not change this URLs.
     url(r'^lektura/(?P<slug>%s)\.html$' % SLUG, 'book_text', name='book_text'),
-    url(r'^lektura/(?P<slug>%s)\.html2$' % SLUG, 'book_text2'),
     url(r'^lektura/(?P<slug>%s)/audiobook/$' % SLUG, 'player', name='book_player'),
     url(r'^lektura/(?P<slug>%s)/$' % SLUG, 'book_detail', name='book_detail'),
     url(r'^lektura/(?P<slug>%s)/motyw/(?P<theme_slug>[a-zA-Z0-9-]+)/$' % SLUG,