X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/139af81833f2b6727618d8e2c30cc7157c42e8a1..0966a5718a1735d063c8f99471138c2b1924f2b7:/wolnelektury/urls.py diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 0d61a3611..5586bf072 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -20,15 +20,9 @@ urlpatterns = patterns('', url(r'^lesmianator/', include('lesmianator.urls')), # Static pages - 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'), @@ -36,7 +30,6 @@ urlpatterns = patterns('', 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'), @@ -53,6 +46,14 @@ urlpatterns = patterns('', url(r'^i18n/', include('django.conf.urls.i18n')), ) +urlpatterns += patterns('django.views.generic.simple', + # old static pages - redirected + (r'^1procent/$', 'redirect_to', {'url': 'http://nowoczesnapolska.org.pl/wesprzyj_nas/'}), + (r'^wolontariat/$', 'redirect_to', {'url': '/mozesz-nam-pomoc/'}), + (r'^epub/$', 'redirect_to', {'url': '/katalog/lektury/'}), +) + + if 'rosetta' in settings.INSTALLED_APPS: urlpatterns += patterns('', url(r'^rosetta/', include('rosetta.urls')),