Fix OSQA 162, Error running cron/send_email_alerts.

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

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 05bd2f4b8dbffdfc4f4014041c2c6cdee5a85a1c..97c852f0a7e5d6194eb07367ab254391bb085f1b 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -13,7 +13,6 @@ from forum.models import Badge, Award, User
 from forum.badges.base import BadgesMeta
 from forum import settings
 from forum.utils.mail import send_email
-from forum.settings.settingsmarkdown import SettingsExtension, markdown
 import re
 
 def favicon(request):
@@ -22,6 +21,13 @@ def favicon(request):
 def static(request, title, content):
     return render_to_response('static.html', {'content' : content, 'title': title}, context_instance=RequestContext(request))
 
+def markdown_help(request):
+    # md = markdown.Markdown([SettingsExtension({})])
+    # text = md.convert(settings.FAQ_PAGE_TEXT.value)
+
+    return render_to_response('markdown_help.html', context_instance=RequestContext(request))
+
+
 def opensearch(request):   
     return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request))
     
@@ -71,7 +77,6 @@ def badges(request):
     return render_to_response('badges.html', {
         'badges' : badges,
         'mybadges' : my_badges,
-        'feedback_faq_url' : reverse('feedback'),
     }, context_instance=RequestContext(request))
 
 def badge(request, id, slug):