-urlpatterns = patterns('catalogue.views',
- url(r'^$', 'main_page', name='main_page'),
- url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/formaty/$', 'shelf_book_formats', name='shelf_book_formats'),
- url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/(?P<book>[a-zA-Z0-9-0-]+)/usun$', 'remove_from_shelf', name='remove_from_shelf'),
- 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'),
+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_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'),
+
+ url(r'^p/(?P<pk>\d+)/short\.(?P<lang>.+)\.html', 'picture_short', name='picture_short'),
+ url(r'^pa/(?P<pk>\d+)/short\.(?P<lang>.+)\.html', 'picturearea_short', name='picture_area_short'),
+)
+
+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'),
+