changes from server

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

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index 05f8766..f24b246 100644 (file)
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -18,6 +18,7 @@ urlpatterns = patterns('picture.views',
     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+)/mini\.(?P<lang>.+)\.html', 'picture_mini', name='picture_mini'),
     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'),
 )
@@ -25,7 +26,7 @@ urlpatterns = patterns('picture.views',
 urlpatterns += patterns('',
     # old search page - redirected
     url(r'^szukaj/$', RedirectView.as_view(
-            url='/szukaj/', query_string=True)),
+            url='/szukaj/', query_string=True, permanent=True)),
 )
 
 urlpatterns += patterns('catalogue.views',
@@ -67,7 +68,7 @@ urlpatterns += patterns('catalogue.views',
         'book_fragments', name='book_fragments'),
 
     # Includes.
-    url(r'^(?P<lang>[^/]+)\.json$', 'catalogue_json'),
+    url(r'^(?P<lang>[^/]+)\.json$', 'catalogue_json', name='catalogue_json'),
     url(r'^b/(?P<pk>\d+)/mini\.(?P<lang>.+)\.html', 'book_mini', name='catalogue_book_mini'),
     url(r'^b/(?P<pk>\d+)/mini_nolink\.(?P<lang>.+)\.html', 'book_mini', {'with_link': False}, name='catalogue_book_mini_nolink'),
     url(r'^b/(?P<pk>\d+)/short\.(?P<lang>.+)\.html', 'book_short', name='catalogue_book_short'),