X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9c5d9a4e77a10b4e60d89d3890e49002bd7f3993..ed20fe9aabacabc81232e58bed2372124e538afa:/wolnelektury/urls.py?ds=sidebyside diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 4026ea348..e3704f439 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -12,24 +12,20 @@ from infopages.models import InfoPage admin.autodiscover() -infopages = { - 'queryset': InfoPage.objects.all(), - 'template_name': 'info/base.html', -} - 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'), # Static pages - url(r'^wolontariat/$', 'django.views.generic.list_detail.object_detail', - dict(infopages, slug='voluntary_services'), name='voluntary_services'), - url(r'^mozesz-nam-pomoc/$', 'django.views.generic.list_detail.object_detail', - dict(infopages, slug='help_us'), name='help_us'), - url(r'^o-projekcie/$', 'django.views.generic.list_detail.object_detail', - dict(infopages, slug='about_us'), name='about_us'), - + url(r'^wolontariat/$', 'infopages.views.infopage', {'slug': 'voluntary_services'}, name='voluntary_services'), + url(r'^mozesz-nam-pomoc/$', 'infopages.views.infopage', {'slug': 'help_us'}, name='help_us'), + 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'^1procent/$', 'django.views.generic.simple.direct_to_template', { 'template': '1percent.html' }, name='1percent'), @@ -37,7 +33,7 @@ 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'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'),