X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cf57591257968b71cd9b7b6e2745a0d23f0066e0..b4674b1b0f73651289787c379e1bc726d38c97a9:/apps/catalogue/urls.py

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index 11a63783f..b24212ea5 100644
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -4,9 +4,10 @@ from django.conf.urls.defaults import *
 
 urlpatterns = patterns('catalogue.views',
     url(r'^$', 'main_page', name='main_page'),
+    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'),
+    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'),
@@ -16,6 +17,6 @@ urlpatterns = patterns('catalogue.views',
     # Public interface. Do not change this URLs.
     url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)\.html$', 'book_text', name='book_text'),
     url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)/$', 'book_detail', name='book_detail'),
-    url(r'^(?P<tags>[a-zA-Z0-9-/]+)/$', 'tagged_object_list', name='tagged_object_list'),
+    url(r'^(?P<tags>[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'),
 )