X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/98e12313596c58738fc7e3eeaccfde202b91ef2a..ed20fe9aabacabc81232e58bed2372124e538afa:/wolnelektury/urls.py?ds=sidebyside diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 5101355ef..e3704f439 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -12,48 +12,44 @@ 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'), - + # 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'), url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'), url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'), - + # API (r'^api/', include('api.urls')), - + # Static files - url(r'^%s(?P.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', + url(r'^%s(?P.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), url(r'^%s(?P.*)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}), - url(r'^i18n/', include('django.conf.urls.i18n')), + url(r'^i18n/', include('django.conf.urls.i18n')), ) if 'rosetta' in settings.INSTALLED_APPS: