X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d2199704c75d29ba98e0f92d27cb63743183e906..9bbc3e87eb5de5206ed040f47a31ac47d96b3300:/apps/catalogue/urls.py diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index 6d5ff795a..53928589d 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -14,9 +14,9 @@ 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'), + url(r'^obraz/$', 'picture_list_thumb', name='picture_list_thumb'), url(r'^obraz/(?P%s).html$' % SLUG, 'picture_viewer', name='picture_viewer'), - url(r'^obraz/(?P%s)/?$' % SLUG, 'picture_detail'), + url(r'^obraz/(?P%s)/$' % SLUG, 'picture_detail'), ) @@ -65,7 +65,5 @@ urlpatterns += patterns('catalogue.views', 'book_fragments', name='book_fragments'), # This should be the last pattern. - url(r'^literatura/(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', {'literature': True, 'gallery': False}, name='tagged_object_list'), - url(r'^galeria/(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', {'literature': False, 'gallery': True}, name='tagged_object_list'), url(r'^(?P[a-zA-Z0-9-/]*)/$', 'tagged_object_list', name='tagged_object_list'), )