X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c33d271961f93aecf731282303af150a556cb48b..80d3980873a2c07121f466c187de92be1cea8415:/wolnelektury/urls.py diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 1a09a0ad5..932c440f6 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -15,8 +15,9 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^katalog/', include('catalogue.urls')), url(r'^materialy/', include('lessons.urls')), + url(r'^opds/', include('opds.urls')), url(r'^sugestia/', include('suggest.urls')), - url(r'^lesmianator/?$', 'lesmianator.views.poem', name='lesmianator'), + url(r'^lesmianator/', include('lesmianator.urls')), # Static pages url(r'^wolontariat/$', 'infopages.views.infopage', {'slug': 'voluntary_services'}, name='voluntary_services'), @@ -24,6 +25,7 @@ urlpatterns = patterns('', url(r'^o-projekcie/$', 'infopages.views.infopage', {'slug': 'about_us'}, name='about_us'), url(r'^widget/$', 'infopages.views.infopage', {'slug': 'widget'}, name='widget'), url(r'^epub/$', 'infopages.views.infopage', {'slug': 'epub'}, name='epub'), + url(r'^zaproszenie/$', 'infopages.views.infopage', {'slug': 'invitation'}, name='invitation'), url(r'^1procent/$', 'django.views.generic.simple.direct_to_template', { 'template': '1percent.html' @@ -32,9 +34,10 @@ urlpatterns = patterns('', # Admin panel url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'), url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^admin/(.*)$', admin.site.root), + url(r'^admin/', include(admin.site.urls)), # Authentication + url(r'^users/simple_login/$', 'catalogue.views.simple_login', name='simple_login'), url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'), url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'), url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),