should now be working for chrome/safari/firefox. still need to fix markdown display...

[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 df199ca2f8e9f31d2b100275803fba0d659ca2a5..855e9c3ac44a8bfd6fbfa9e3fcb1a0f1362899cc 100644 (file)
--- a/forum/skins/default/templates/question_edit_tips.html
+++ b/forum/skins/default/templates/question_edit_tips.html
@@ -1,5 +1,5 @@
 <!-- question_edit_tips.html -->
 <!-- question_edit_tips.html -->

-{% load i18n %}
+{% load i18n general_sidebar_tags %}

 <div class="boxC" id="title_side_bar">
     <p class="subtitle darkred">{% trans "Title Tips" %}</p>
     <div>
 <div class="boxC" id="title_side_bar">
     <p class="subtitle darkred">{% trans "Title Tips" %}</p>
     <div>


@@ -24,37 +24,7 @@
     </div>
 </div>
 
     </div>
 </div>
 

-<div class="boxC" id="editor_side_bar">
-    <p class="subtitle darkred">{% trans "Markdown Basics" %}</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" %}")
-
-        </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="{% url markdown_help %}" target="_blank">{% trans "learn more about Markdown" %} </a>
-    </p>
-</div>
+{% markdown_help %}

 
 <div class="boxC" id="tags_side_bar" align="left">
     <p class="subtitle darkred">{% trans "What Are Tags" %}</p>
 
 <div class="boxC" id="tags_side_bar" align="left">
     <p class="subtitle darkred">{% trans "What Are Tags" %}</p>


@@ -66,7 +36,9 @@
             {% trans "They will help other find your question." %}
         </li>
         <li>
             {% trans "They will help other find your question." %}
         </li>
         <li>

-            {% trans "A question can have up to " %} {{settings.FORM_MAX_NUMBER_OF_TAGS}} {% trans " tags, but it must have at least " %} {{settings.FORM_MIN_NUMBER_OF_TAGS}} {% trans "." %}
+            {% 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>
 </div>
         </li>
     </ul>
 </div>