extracted markdown sidebar and included information about how to create a line break.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@473 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/templates/answer_edit_tips.html b/forum/skins/default/templates/answer_edit_tips.html
index bcbe76cea04c8e21f73578d4f538201e4aaf6a18..43240c8e36d18928dab74051adb0dc8d1dd4a025 100644 (file)
--- a/forum/skins/default/templates/answer_edit_tips.html
+++ b/forum/skins/default/templates/answer_edit_tips.html
@@ -1,5 +1,5 @@
 <!-- template answer_edit_tips.html -->
-{% load i18n %}
+{% load i18n general_sidebar_tags %}
 <div class="boxC">
     <p class="subtitle darkred">{% trans "answer tips" %}</p>
     <div>
@@ -22,34 +22,5 @@
     </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" %}")
-
-        </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 %}
 <!-- end template answer_edit_tips.html -->

diff --git a/forum/skins/default/templates/osqaadmin/base.html b/forum/skins/default/templates/osqaadmin/base.html
index 47b77b6e5cb1ca8d212906aa9762a901ab5cfcdc..428f6553b16f3dc168bf19bb45e0a09d019c6a0d 100644 (file)
--- a/forum/skins/default/templates/osqaadmin/base.html
+++ b/forum/skins/default/templates/osqaadmin/base.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}\r
 \r
-{% load i18n %}\r
-{% load extra_tags %}\r
+{% load i18n extra_tags general_sidebar_tags %}\r
 \r
 {% block forejs %}\r
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/admin.css" %}"/>\r
@@ -33,37 +32,7 @@
         </ul>\r
     </div>\r
     {% if markdown %}\r
-\r
-        <div class="boxC">\r
-            <p class="subtitle">{% trans "Markdown tips" %}</p>\r
-            <ul class="list-item">\r
-                <li>\r
-                    {% trans "*italic* or __italic__" %}\r
-                </li>\r
-                <li>\r
-                    {% trans "**bold** or __bold__" %}\r
-                </li>\r
-                <li>\r
-                    <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}")\r
-\r
-                </li>\r
-\r
-                <li>\r
-                    <b>{% trans "image" %}</b>?![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")\r
-\r
-                </li>\r
-                <li>\r
-                    {% trans "numbered list:" %}\r
-                    1.  Foo\r
-                    2.  Bar\r
-                </li>\r
-                <li>\r
-                    {% trans "basic HTML tags are also supported" %}\r
-                </li>\r
-            </ul>            <p class='info-box-follow-up-links'>\r
-                <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} </a>\r
-            </p>\r
-        </div>\r
+        {% markdown_help %}\r
     {% endif %}\r
 {% endblock %}\r
 \r

diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html
index cd94876b1b2d3039a18ef4c3ea70b038a31ed641..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 -->
-{% load i18n %}
+{% load i18n general_sidebar_tags %}
 <div class="boxC" id="title_side_bar">
     <p class="subtitle darkred">{% trans "Title Tips" %}</p>
     <div>
@@ -24,37 +24,7 @@
     </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>

diff --git a/forum/templatetags/general_sidebar_tags.py b/forum/templatetags/general_sidebar_tags.py
index d17f74bb675bad2f340a1416931cd5eb766bb5e2..4493f329110d3e0118bb09b9f6edfda22f6e30c8 100644 (file)
--- a/forum/templatetags/general_sidebar_tags.py
+++ b/forum/templatetags/general_sidebar_tags.py
@@ -4,9 +4,9 @@ from forum import settings
 \r
 register = template.Library()\r
 \r
-@register.inclusion_tag('sidebar/recent_tags.html')\r
-def recent_tags():\r
-    return {'tags': Tag.active.order_by('-id')[:settings.RECENT_TAGS_SIZE]}\r
+@register.inclusion_tag('sidebar/markdown_help.html')\r
+def markdown_help():\r
+    return {}\r
 \r
 @register.inclusion_tag('sidebar/recent_awards.html')\r
 def recent_awards():\r
@@ -29,3 +29,9 @@ def sidebar_lower():
         'wrap': not settings.SIDEBAR_LOWER_DONT_WRAP,\r
         'blockid': 'sidebar-lower'\r
     }\r
+\r
+@register.inclusion_tag('sidebar/recent_tags.html')\r
+def recent_tags():\r
+    return {'tags': Tag.active.order_by('-id')[:settings.RECENT_TAGS_SIZE]}\r
+\r
+    
\ No newline at end of file