removed custom templates privacy.html and about.html

3 files changed, 11 insertions, 20 deletions

diff --git a/askbot/skins/default/templates/faq.html b/askbot/skins/default/templates/faq.html
deleted file mode 100644
index 51873a06..00000000
--- a/askbot/skins/default/templates/faq.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "two_column_body.html" %}
-<!-- template faq.html -->
-{% block title %}{% spaceless %}{% trans %}FAQ{% endtrans %}{% endspaceless %}{% endblock %}
-{% block content %}
-<div class="content">
-<h1 class="section-title">FAQ</h1>
-    {{forum_faq}}
-</div>
-{% endblock %}
-<!-- end template faq.html -->
diff --git a/askbot/skins/default/templates/privacy.html b/askbot/skins/default/templates/privacy.html
deleted file mode 100644
index e9b6f58b..00000000
--- a/askbot/skins/default/templates/privacy.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "two_column_body.html" %}
-<!-- privacy.html -->
-{% block title %}{% spaceless %}{% trans %}Privacy policy{% endtrans %}{% endspaceless %}{% endblock %}
-{% block content %}
-<h1 class="section-title">{% trans %}Privacy policy{% endtrans %}</h1>
-{{settings.FORUM_PRIVACY}}
-{% endblock %}
-<!-- end privacy.html -->
diff --git a/askbot/views/meta.py b/askbot/views/meta.py
index f8cbe8ae..3ad32b9b 100644
--- a/askbot/views/meta.py
+++ b/askbot/views/meta.py
@@ -33,7 +33,12 @@ def config_variable(request, variable_name = None, mimetype = None):
     return HttpResponse(output, mimetype = mimetype)
 
 def about(request, template='about.html'):
-    return generic_view(request, template = template, page_class = 'meta')
+    title = _('About %(site)s') % {'site': askbot_settings.APP_SHORT_NAME}
+    data = {
+        'title': title,
+        'content': askbot_settings.FORUM_ABOUT
+    }
+    return render_into_skin('static_page.html', data, request)
 
 def page_not_found(request, template='404.html'):
     return generic_view(request, template)
@@ -83,7 +88,11 @@ def feedback(request):
 feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, give it next time :)')
 
 def privacy(request):
-    return render_into_skin('privacy.html', {'page_class': 'meta'}, request)
+    data = {
+        'title': _('Privacy policy'),
+        'content': askbot_settings.FORUM_PRIVACY
+    }
+    return render_into_skin('static_page.html', data, request)
 
 def badges(request):#user status/reputation system
     #todo: supplement database data with the stuff from badges.py