X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/891b9e3b7ecaedc9ac32bc941400a267c77482a0..baa59549fe58affd61a31bac8642e56a227fd643:/wolnelektury/urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 0628b1568..ed0228aa3 100644
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -12,49 +12,52 @@ 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')),
+    url(r'^przypisy/', include('dictionary.urls')),
+    url(r'^raporty/', include('reporting.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'),
     url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'),
     url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),
-    
+    url(r'^uzytkownicy/login/$', 'django.contrib.auth.views.login', name='simple_login'),
+
     # API
     (r'^api/', include('api.urls')),
-    
+
     # Static files
-    url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', 
+    url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     url(r'^%s(?P<path>.*)$' % 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'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/',
+        'permanent': False}),
+    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')),