It is now possable for users to add tags like "REP_TO_VOTE_UP" to the faq page and...

[osqa.git] / forum / views / meta.py

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 940bc4a52dc705f76ebe871629fdd4674b928975..be41bd29530ea2702c7aedd3683d7edbcd220620 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -12,6 +12,8 @@ from forum.models import Badge, Award, User
 from forum.badges import ALL_BADGES
 from forum import settings
 from forum.utils.mail import send_email
 from forum.badges import ALL_BADGES
 from forum import settings
 from forum.utils.mail import send_email

+from forum.settings.settingsmarkdown import *
+

 import re
 
 def favicon(request):
 import re
 
 def favicon(request):


@@ -21,11 +23,10 @@ def about(request):
     return render_to_response('about.html', {'text': settings.ABOUT_PAGE_TEXT.value }, context_instance=RequestContext(request))
 
 def faq(request):
     return render_to_response('about.html', {'text': settings.ABOUT_PAGE_TEXT.value }, context_instance=RequestContext(request))
 
 def faq(request):

-    data = {
-        'gravatar_faq_url': reverse('faq') + '#gravatar',
-        'ask_question_url': reverse('ask'),
-    }
-    return render_to_response('faq.html', data, context_instance=RequestContext(request))
+    md = markdown.Markdown([SettingsExtension({})])
+    text = md.convert(settings.FAQ_PAGE_TEXT.value)
+
+    return render_to_response('faq.html', {'text' : text}, context_instance=RequestContext(request))

 
 def feedback(request):
     if request.method == "POST":
 
 def feedback(request):
     if request.method == "POST":


@@ -35,6 +36,7 @@ def feedback(request):
 
             if not request.user.is_authenticated:
                 context['email'] = form.cleaned_data.get('email',None)
 
             if not request.user.is_authenticated:
                 context['email'] = form.cleaned_data.get('email',None)

+            

             context['message'] = form.cleaned_data['message']
             context['name'] = form.cleaned_data.get('name',None)
 
             context['message'] = form.cleaned_data['message']
             context['name'] = form.cleaned_data.get('name',None)