+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')
+)
+
+# workaround for Django ticket #17111; redirect when resolved
+urlpatterns += patterns('search.views',
+ url(r'^szukaj/$', 'main'),
+)
+#urlpatterns += patterns('django.views.generic.simple',
+# # old search page - redirected
+# url(r'^szukaj/$', 'redirect_to',
+#
+# {'url': '/szukaj/', 'query_string': True}),
+#)
+
+urlpatterns += patterns('catalogue.views',