X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/80b56e4c5f668a8011bdf859504d45b7b7f6d914..013ec8a416d4ff1ea3e1f2fa9ee2935623197ecd:/apps/libraries/urls.py?ds=sidebyside

diff --git a/apps/libraries/urls.py b/apps/libraries/urls.py
index 92621144b..754b17e44 100644
--- a/apps/libraries/urls.py
+++ b/apps/libraries/urls.py
@@ -1,9 +1,12 @@
-from django.conf.urls.defaults import patterns, url
-from django.http import HttpResponseRedirect
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('libraries.views',
     url(r'^$', 'main_view', name='libraries_main_view'),
-    url(r'^/$', lambda x: HttpResponseRedirect(x.path[:-1])),
-    url(r'^/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='library_view'),
-)
\ No newline at end of file
+    url(r'^(?P<slug>[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'),
+    url(r'^(?P<catalog_slug>[a-zA-Z0-9_-]+)/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='libraries_library_view'),
+)