Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index b576a27..5101355 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -7,24 +7,29 @@ from django.contrib import admin
 
 from catalogue.forms import SearchForm
 
+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'^sugestia/', include('suggest.urls')),
     
     # Static pages
-    url(r'^wolontariat/$', 'django.views.generic.simple.direct_to_template', 
-        {'template': 'info/voluntary_services.html', 'extra_context': {'form': SearchForm()}},
-        name='voluntary_services'),
-    url(r'^mozesz-nam-pomoc/$', 'django.views.generic.simple.direct_to_template',
-        {'template': 'info/help_us.html', 'extra_context': {'form': SearchForm()}},
-        name='help_us'),
-    url(r'^o-projekcie/$', 'django.views.generic.simple.direct_to_template', 
-        {'template': 'info/about_us.html', 'extra_context': {'form': SearchForm()}},
-        name='about_us'),
+    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'),
@@ -55,5 +60,3 @@ if 'rosetta' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',
         url(r'^rosetta/', include('rosetta.urls')),
     )
-
-handler500 = 'views.server_error'