added a paper clip attachment button and removed markdown help when rich text editor is on

5 files changed, 50 insertions, 88 deletions

diff --git a/askbot/skins/default/media/images/attachment.png b/askbot/skins/default/media/images/attachment.png
new file mode 100644
index 00000000..1cb253dc
--- /dev/null
+++ b/askbot/skins/default/media/images/attachment.png
diff --git a/askbot/skins/default/templates/meta/tinymce.html b/askbot/skins/default/templates/meta/tinymce.html
index 6f8a6018..ba14642a 100644
--- a/askbot/skins/default/templates/meta/tinymce.html
+++ b/askbot/skins/default/templates/meta/tinymce.html
@@ -43,6 +43,7 @@
         background-position: -380px 0px;
     }
     .defaultSkin span.mce_askbot_attachment {
-        background-position: -520px 0px;
+        background-image: url({{ '/images/attachment.png'|media }});
+        background-position: 0px 0px;
     }
 </style>
diff --git a/askbot/skins/default/templates/widgets/answer_edit_tips.html b/askbot/skins/default/templates/widgets/answer_edit_tips.html
index 1c2cdc60..2bb5b256 100644
--- a/askbot/skins/default/templates/widgets/answer_edit_tips.html
+++ b/askbot/skins/default/templates/widgets/answer_edit_tips.html
@@ -22,46 +22,6 @@
         </p>
     </div>
 </div>
-
-<div class="box">
-    <h2>{% trans %}Markdown basics{% endtrans %}</h2>
-    <ul>
-        {% if settings.MARKUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %}
-        <li>
-            {% trans %}*italic*{% endtrans %}
-        </li>
-        <li>
-            {% trans %}**bold**{% endtrans %}
-        </li>
-        {% else %}
-        <li>
-            {% trans %}*italic* or _italic_{% endtrans %}
-        </li>
-        <li>
-            {% trans %}**bold** or __bold__{% endtrans %}
-        </li>
-        {% endif %}
-        <li>
-            <b>{% trans %}link{% endtrans %}</b>:[{% trans %}text{% endtrans %}](http://url.com/ "{% trans %}title{% endtrans %}")
-
-        </li>
-        <li>
-            <b>{% trans %}image{% endtrans %}</b>:![alt {% trans %}text{% endtrans %}](/path/img.jpg "{% trans %}title{% endtrans %}")
-
-        </li>
-        <li>
-        {% trans %}numbered list:{% endtrans %}
-            1.  Foo
-            2.  Bar
-        </li>
-        <li>
-        {% trans %}basic HTML tags are also supported{% endtrans %}
-        </li>
-    </ul>
-    <p class='info-box-follow-up-links'>
-<!-- will be change to a popup windows
-        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans %}learn more about Markdown{% endtrans %} »</a>
--->
-    </p>
-</div>
-<!-- end template answer_edit_tips.html -->
+{% if settings.EDITOR_TYPE == 'markdown' %}
+    {% include "widgets/markdown_help.html" %}
+{% endif %}
diff --git a/askbot/skins/default/templates/widgets/markdown_help.html b/askbot/skins/default/templates/widgets/markdown_help.html
new file mode 100644
index 00000000..9816fe26
--- /dev/null
+++ b/askbot/skins/default/templates/widgets/markdown_help.html
@@ -0,0 +1,42 @@
+<div class="box">
+    <h2>{% trans %}Markdown basics{% endtrans %}</h2>
+    <ul>
+        {% if settings.MARKUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %}
+        <li>
+            {% trans %}*italic*{% endtrans %}
+        </li>
+        <li>
+            {% trans %}**bold**{% endtrans %}
+        </li>
+        {% else %}
+        <li>
+            {% trans %}*italic* or _italic_{% endtrans %}
+        </li>
+        <li>
+            {% trans %}**bold** or __bold__{% endtrans %}
+        </li>
+        {% endif %}
+        <li>
+            <b>{% trans %}link{% endtrans %}</b>:[{% trans %}text{% endtrans %}](http://url.com/ "{% trans %}title{% endtrans %}")
+
+        </li>
+        <li>
+            <b>{% trans %}image{% endtrans %}</b>:![alt {% trans %}text{% endtrans %}](/path/img.jpg "{% trans %}title{% endtrans %}")
+
+        </li>
+        <li>
+        {% trans %}numbered list:{% endtrans %}
+            1.  Foo
+            2.  Bar
+        </li>
+        <li>
+        {% trans %}basic HTML tags are also supported{% endtrans %}
+        </li>
+    </ul>
+    <p class='info-box-follow-up-links'>
+<!-- will be change to a popup windows
+        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans %}learn more about Markdown{% endtrans %} »</a>
+-->
+    </p>
+</div>
+<!-- end template answer_edit_tips.html -->
diff --git a/askbot/skins/default/templates/widgets/question_edit_tips.html b/askbot/skins/default/templates/widgets/question_edit_tips.html
index 842aa491..f60304c1 100644
--- a/askbot/skins/default/templates/widgets/question_edit_tips.html
+++ b/askbot/skins/default/templates/widgets/question_edit_tips.html
@@ -17,47 +17,6 @@
 -->
     </p>
 </div>
-
-<div id="markdownHelp"class="box">
-    <h2>{% trans %}Markdown basics{% endtrans %}</h2>
-    <ul>
-        {% if settings.MARKDUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %}
-        <li>
-            {% trans %}*italic*{% endtrans %}
-        </li>
-        <li>
-            {% trans %}**bold**{% endtrans %}
-        </li>
-        {% else %}
-        <li>
-            {% trans %}*italic* or _italic_{% endtrans %}
-        </li>
-        <li>
-            {% trans %}**bold** or __bold__{% endtrans %}
-        </li>
-        {% endif %}
-        <li>
-            <b>{% trans %}link{% endtrans %}</b>:[{% trans %}text{% endtrans %}](http://url.com/ "{% trans %}title{% endtrans %}")
-
-        </li>
-        
-        <li>
-            <b>{% trans %}image{% endtrans %}</b>:![alt {% trans %}text{% endtrans %}](/path/img.jpg "{% trans %}title{% endtrans %}")
-
-        </li>
-        <li>
-            {% trans %}numbered list:{% endtrans %}
-            1.  Foo
-            2.  Bar
-        </li>
-        <li>
-            {% trans %}basic HTML tags are also supported{% endtrans %}
-        </li>
-    </ul>
-    <p class='info-box-follow-up-links'>
-<!-- will be change to a popup windows
-        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans %}learn more about Markdown{% endtrans %} »</a>
--->
-    </p>
-</div>
-<!-- end question_edit_tips.html -->
+{% if settings.EDITOR_TYPE == 'markdown' %}
+    {% include "/widgets/markdown_help.html" %}
+{% endif %}