Some extra admin stuff and applied a patch from Ekalinin on OSQA 95.

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

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 04cfe753b933594e58c3ab932f1bafa23a700454..fc050c218e013cd7882bd97ffeca4d802a4cdf29 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -13,21 +13,13 @@ 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):
     return HttpResponseRedirect(str(settings.APP_FAVICON))
 
-def about(request):
-    return render_to_response('about.html', {'text': settings.ABOUT_PAGE_TEXT.value }, context_instance=RequestContext(request))
-
-def faq(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 static(request, title, content):
+    return render_to_response('static.html', {'content' : content, 'title': title}, context_instance=RequestContext(request))
 
 def opensearch(request):   
     return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request))
@@ -78,7 +70,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):