-urlpatterns = patterns('catalogue.views',
- url(r'^$', 'main_page', name='main_page'),
- url(r'^polki/$', 'user_shelves', name='user_shelves'),
- url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'),
- url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)\.zip$', 'download_shelf', name='download_shelf'),
- url(r'^lektury/', 'book_list', name='book_list'),
- url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)/polki/', 'book_sets', name='book_shelves'),
- url(r'^polki/nowa/$', 'new_set', name='new_set'),
+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')
+)
+
+urlpatterns += patterns('',
+ # old search page - redirected
+ url(r'^szukaj/$', RedirectView.as_view(
+ url='/szukaj/', query_string=True)),
+)
+
+urlpatterns += patterns('catalogue.views',
+ url(r'^$', 'catalogue', name='catalogue'),
+
+ url(r'^lektury/$', 'book_list', name='book_list'),
+ url(r'^lektury/(?P<slug>[a-zA-Z0-9-]+)/$', 'collection', name='collection'),
+ url(r'^audiobooki/$', 'audiobook_list', name='audiobook_list'),
+ url(r'^daisy/$', 'daisy_list', name='daisy_list'),