fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Picture import: split theme names, more space for titles.
[wolnelektury.git]
/
apps
/
libraries
/
urls.py
diff --git
a/apps/libraries/urls.py
b/apps/libraries/urls.py
index
5b13dc5
..
754b17e
100644
(file)
--- a/
apps/libraries/urls.py
+++ b/
apps/libraries/urls.py
@@
-1,6
+1,12
@@
-from django.conf.urls.defaults import patterns, url
+# -*- 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'),
urlpatterns = patterns('libraries.views',
url(r'^$', 'main_view', name='libraries_main_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'),
+)