From eb79a71079fc8315a682bc5450746ee8a97c9ef6 Mon Sep 17 00:00:00 2001
From: qw3rty <qw3rty@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 29 Jun 2010 17:59:10 +0000
Subject: [PATCH] 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
---
 .../default/templates/answer_edit_tips.html   | 33 ++---------------
 .../default/templates/osqaadmin/base.html     | 35 ++-----------------
 .../default/templates/question_edit_tips.html | 34 ++----------------
 forum/templatetags/general_sidebar_tags.py    | 12 +++++--
 4 files changed, 15 insertions(+), 99 deletions(-)

diff --git a/forum/skins/default/templates/answer_edit_tips.html b/forum/skins/default/templates/answer_edit_tips.html
index bcbe76c..43240c8 100644
--- 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 47b77b6..428f655 100644
--- a/forum/skins/default/templates/osqaadmin/base.html
+++ b/forum/skins/default/templates/osqaadmin/base.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
-{% load i18n %}
-{% load extra_tags %}
+{% load i18n extra_tags general_sidebar_tags %}
 
 {% block forejs %}
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/admin.css" %}"/>
@@ -33,37 +32,7 @@
         </ul>
     </div>
     {% if markdown %}
-
-        <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="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} </a>
-            </p>
-        </div>
+        {% markdown_help %}
     {% endif %}
 {% endblock %}
 
diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html
index cd94876..855e9c3 100644
--- 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 d17f74b..4493f32 100644
--- a/forum/templatetags/general_sidebar_tags.py
+++ b/forum/templatetags/general_sidebar_tags.py
@@ -4,9 +4,9 @@ from forum import settings
 
 register = template.Library()
 
-@register.inclusion_tag('sidebar/recent_tags.html')
-def recent_tags():
-    return {'tags': Tag.active.order_by('-id')[:settings.RECENT_TAGS_SIZE]}
+@register.inclusion_tag('sidebar/markdown_help.html')
+def markdown_help():
+    return {}
 
 @register.inclusion_tag('sidebar/recent_awards.html')
 def recent_awards():
@@ -29,3 +29,9 @@ def sidebar_lower():
         'wrap': not settings.SIDEBAR_LOWER_DONT_WRAP,
         'blockid': 'sidebar-lower'
     }
+
+@register.inclusion_tag('sidebar/recent_tags.html')
+def recent_tags():
+    return {'tags': Tag.active.order_by('-id')[:settings.RECENT_TAGS_SIZE]}
+
+    
\ No newline at end of file
-- 
2.39.5