X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..f73c15a3bd47e9f7fe3a29645f968528fb6415e4:/forum/skins/default/templates/question_edit_tips.html

diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html
index ae876a2..ce7ac95 100644
--- a/forum/skins/default/templates/question_edit_tips.html
+++ b/forum/skins/default/templates/question_edit_tips.html
@@ -1,58 +1,25 @@
 <!-- question_edit_tips.html -->
-{% load i18n %}
-<div class="boxC">
-    <p class="subtitle darkred">{% trans "question tips" %}</p>
-    <div>
-        <ul class="list-item">
-            <li>
-            <b>
-                {% blocktrans with settings.APP_SHORT_NAME as app_title %}
-                ask a question relevant to the {{ app_title }} community 
-                {% endblocktrans %}
-            </b>
-            </li>
-            <li>
-                {% trans "please try provide enough details" %}
-            </li>
-            <li>
-				{% trans "be clear and concise" %}
-            </li>
-        </ul>
+{% load markup %}
+{% load i18n general_sidebar_tags %}
+<div class="boxC" id="title_side_bar">
+    <p class="subtitle darkred">{% trans "Title Tips" %}</p>
+    <div class="list-item">
+        {{ settings.QUESTION_TITLE_TIPS|markdown:"settingsparser" }}
         <p class='info-box-follow-up-links'>
-            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">{% trans "faq" %} »</a>
+            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">{% trans "faq" %} &raquo;</a>
         </p>
     </div>
 </div>
 
-<div class="boxC">
-    <p class="subtitle">{% trans "Markdown tips" %}</p>
-    <ul class="list-item">
-        <li>
-            {% trans "*italic* or __italic__" %}
-        </li>
-        <li>
-			{% trans "**bold** or __bold__" %}
-        </li>
-        <li>
-            <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}")
+{% markdown_help %}
 
-        </li>
-        
-        <li>
-            <b>{% trans "image" %}</b>：![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
-
-        </li>
-        <li>
-			{% trans "numbered list:" %}
-            1.  Foo
-            2.  Bar
-        </li>
-        <li>
-			{% trans "basic HTML tags are also supported" %}
-        </li>
-    </ul>
-    <p class='info-box-follow-up-links'>
-        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} »</a>
-    </p>
+<div class="boxC" id="tags_side_bar" align="left">
+    <p class="subtitle darkred">{% trans "What Are Tags" %}</p>
+    <div class="list-item">
+        {{ settings.QUESTION_TAG_TIPS|markdown:"settingsparser" }}
+    </div>
 </div>
-<!-- end question_edit_tips.html -->
+
+
+<!-- end question_edit_tips.html  -->
+                                  
\ No newline at end of file