X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9c5d9a4e77a10b4e60d89d3890e49002bd7f3993..d1d38b4cd4c93032c85924cb38d0963cfed0fe7e:/wolnelektury/urls.py?ds=sidebyside

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 4026ea348..5586bf072 100644
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -12,32 +12,22 @@ 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/', include('lesmianator.urls')),
 
     # 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'^1procent/$', 'django.views.generic.simple.direct_to_template', {
-        'template': '1percent.html'
-    }, name='1percent'),
+    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'),
 
     # 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'),
@@ -56,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')),