Merged FAQ and About into the same template, and added a special folder markdownext...

[osqa.git] / forum / urls.py

diff --git a/forum/urls.py b/forum/urls.py
index 534bfcfde18f9b30a4041253bdc0221692ab6b96..71f414947d050227f3c2f936ac130fc9ce9648e2 100644 (file)
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -46,8 +46,8 @@ urlpatterns += patterns('',
         name='uploaded_file',
     ),
     #url(r'^%s/$' % _('signin/'), 'django_authopenid.views.signin', name='signin'),
-    url(r'^%s$' % _('about/'), app.meta.about, name='about'),
-    url(r'^%s$' % _('faq/'), app.meta.faq, name='faq'),
+    url(r'^%s$' % _('faq/'), app.meta.static, {'content': settings.FAQ_PAGE_TEXT, 'title': _('FAQ')}, name='faq'),
+    url(r'^%s$' % _('about/'), app.meta.static, {'content': settings.ABOUT_PAGE_TEXT, 'title': _('About')}, name='about'),
     url(r'^opensearch\.xml$', app.meta.opensearch, name='opensearch'),
     url(r'^%s$' % _('privacy/'), app.meta.privacy, name='privacy'),
     url(r'^%s$' % _('logout/'), app.meta.logout, name='logout'),