Fixed http://jira.osqa.net/browse/OSQA-214 and improved awarded badges list.

[osqa.git] / forum / skins / default / templates / about.html

diff --git a/forum/skins/default/templates/about.html b/forum/skins/default/templates/about.html
index e463ac447da96a03e0c0c661c3f086f014a550f1..f591d1a0aa21f7428a93aefa690c33ba9f509471 100644 (file)
--- a/forum/skins/default/templates/about.html
+++ b/forum/skins/default/templates/about.html
@@ -1,36 +1,15 @@
 {% extends "base_content.html" %}
 <!-- template about.html -->
 {% load i18n %}
 {% extends "base_content.html" %}
 <!-- template about.html -->
 {% load i18n %}

-{% load extra_tags %}
-{% load humanize %}
+{% load markup %}

 {% block title %}{% spaceless %}{% trans "About" %}{% endspaceless %}{% endblock %}
 {% block title %}{% spaceless %}{% trans "About" %}{% endspaceless %}{% endblock %}

-{% block forejs %}
-{% endblock %}
+

 {% block content %}
 <div class="headNormal">
 {% trans "About" %}
 </div>
 {% block content %}
 <div class="headNormal">
 {% trans "About" %}
 </div>

-

 <div class="content">
 <div class="content">

-    <p class="strong">Please customize file templates/about.html</p>
-
-    <p>Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
-    and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
-    <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
-    the relevant keywords to simplify future access and organize the accumulated material.
-    </p>
-
-    <p>This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
-    Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
-    points. These points are added to the users account when others vote for his/her questions or answers.
-    These points (very) roughly reflect the level of trust of the community.
-    </p>
-    <p>No points are necessary to ask or answer the questions - so please -
-    <strong><a href="{% url auth_signin %}">join us!</a></strong>
-    </p>
-    <p>
-            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
-    </p>
+{{ text|markdown }}

 </div>
 {% endblock %}
 <!-- end template about.html -->
 </div>
 {% endblock %}
 <!-- end template about.html -->