Merging in changesets from revisions 809, 811, 812, 825, 826, and 827. These all...

[osqa.git] / 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 ae876a2968fdf1d5ca108eb518410d04764e24c2..649ce8ca9d7f8a294bc138615e852986662996e9 100644 (file)
--- a/forum/skins/default/templates/question_edit_tips.html
+++ b/forum/skins/default/templates/question_edit_tips.html
@@ -1,7 +1,7 @@
 <!-- question_edit_tips.html -->
-{% load i18n %}
-<div class="boxC">
-    <p class="subtitle darkred">{% trans "question tips" %}</p>
+{% load i18n general_sidebar_tags %}
+<div class="boxC" id="title_side_bar">
+    <p class="subtitle darkred">{% trans "Title Tips" %}</p>
     <div>
         <ul class="list-item">
             <li>
@@ -11,6 +11,9 @@
                 {% endblocktrans %}
             </b>
             </li>
+            <li>
+                {% trans "the title must be in the form of a question" %}
+            </li>
             <li>
                 {% trans "please try provide enough details" %}
             </li>
@@ -19,40 +22,30 @@
             </li>
         </ul>
         <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>
-        
+<div class="boxC" id="tags_side_bar" align="left">
+    <p class="subtitle darkred">{% trans "What Are Tags" %}</p>
+    <ul class="list-item">
         <li>
-            <b>{% trans "image" %}</b>：![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
-
+            {% trans "Tags are words that will tell others what this question is about." %}
         </li>
         <li>
-                       {% trans "numbered list:" %}
-            1.  Foo
-            2.  Bar
+            {% trans "They will help other find your question." %}
         </li>
         <li>
-                       {% trans "basic HTML tags are also supported" %}
+            {% blocktrans with settings.FORM_MAX_NUMBER_OF_TAGS as max_number_of_tags and settings.FORM_MIN_NUMBER_OF_TAGS as min_number_of_tags %}
+                A question can have up to {{max_number_of_tags}} tags, but it must have at least {{min_number_of_tags}}.
+            {% endblocktrans %}
         </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>
-<!-- end question_edit_tips.html -->
+
+
+<!-- end question_edit_tips.html  -->
+                                  
\ No newline at end of file