X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/83559fba0846ad77721b31231d1d807a91e52157..14b70eccc2fec2c214671ca2aeb169baf40dacf2:/catalogue/urls.py?ds=inline diff --git a/catalogue/urls.py b/catalogue/urls.py index 2fc293912..f4779067c 100644 --- a/catalogue/urls.py +++ b/catalogue/urls.py @@ -4,12 +4,15 @@ from django.conf.urls.defaults import * urlpatterns = patterns('catalogue.views', url(r'^$', 'main_page', name='main_page'), - url(r'^lektury/', 'book_list'), - url(r'^lektura/(?P[a-zA-Z0-9-]+)/zestawy/', 'book_sets'), - url(r'^zestawy/nowy/$', 'new_set'), - url(r'^lektura/(?P[a-zA-Z0-9-]+)/$', 'book_detail'), + url(r'^polki/$', 'user_shelves', name='user_shelves'), + url(r'^polki/(?P[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'), + url(r'^lektury/', 'book_list', name='book_list'), + url(r'^lektura/(?P[a-zA-Z0-9-]+)/polki/', 'book_sets', name='book_shelves'), + url(r'^fragment/(?P[0-9]+)/polki/', 'fragment_sets', name='fragment_shelves'), + url(r'^polki/nowa/$', 'new_set', name='new_set'), + url(r'^lektura/(?P[a-zA-Z0-9-]+)/$', 'book_detail', name='book_detail'), url(r'^tags/$', 'tags_starting_with', name='hint'), url(r'^szukaj/$', 'search', name='search'), - url(r'^(?P[a-zA-Z-/]+)/$', 'tagged_object_list', name='tagged_object_list'), + url(r'^(?P[a-zA-Z0-9-/]+)/$', 'tagged_object_list', name='tagged_object_list'), )