X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c26ab6ee15974c1133a6d08c459b51199185f25f..452b47c5a7bafaba6791010094d85c7c06fdac38:/wolnelektury/urls.py diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index ce51801c5..64d9f6293 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -4,6 +4,7 @@ import os from django.conf.urls.defaults import * from django.conf import settings from django.contrib import admin +from django.views.generic import RedirectView import wolnelektury_core.views @@ -34,6 +35,7 @@ urlpatterns += patterns('', url(r'^info/', include('infopages.urls')), url(r'^ludzie/', include('social.urls')), url(r'^uzytkownik/', include('allauth.urls')), + url(r'^czekaj/', include('waiter.urls')), # Admin panel url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'), @@ -43,6 +45,8 @@ urlpatterns += patterns('', # API (r'^api/', include('api.urls')), + # OAIPMH + (r'^oaipmh/', include('oai.urls')), url(r'^szukaj/', include('search.urls')), @@ -54,20 +58,20 @@ urlpatterns += patterns('', url(r'^i18n/', include('django.conf.urls.i18n')), ) -urlpatterns += patterns('django.views.generic.simple', +urlpatterns += patterns('', # old static pages - redirected - url(r'^1procent/$', 'redirect_to', - {'url': 'http://nowoczesnapolska.org.pl/wesprzyj_nas/'}), - url(r'^epub/$', 'redirect_to', - {'url': '/katalog/lektury/'}), - url(r'^mozesz-nam-pomoc/$', 'redirect_to', - {'url': '/info/mozesz-nam-pomoc'}), - url(r'^o-projekcie/$', 'redirect_to', - {'url': '/info/o-projekcie'}), - url(r'^widget/$', 'redirect_to', - {'url': '/info/widget'}), - url(r'^wolontariat/$', 'redirect_to', - {'url': '/info/mozesz-nam-pomoc/'}), + url(r'^1procent/$', RedirectView.as_view( + url='http://nowoczesnapolska.org.pl/wesprzyj_nas/')), + url(r'^epub/$', RedirectView.as_view( + url='/katalog/lektury/')), + url(r'^mozesz-nam-pomoc/$', RedirectView.as_view( + url='/info/mozesz-nam-pomoc')), + url(r'^o-projekcie/$', RedirectView.as_view( + url='/info/o-projekcie')), + url(r'^widget/$', RedirectView.as_view( + url='/info/widget')), + url(r'^wolontariat/$', RedirectView.as_view( + url='/info/mozesz-nam-pomoc/')), )