merged Adolfo's branch

3 files changed, 33 insertions, 18 deletions

diff --git a/askbot/skins/default/templates/embed/ask_by_widget.html b/askbot/skins/default/templates/embed/ask_by_widget.html
index 416dc655..ebeec026 100644
--- a/askbot/skins/default/templates/embed/ask_by_widget.html
+++ b/askbot/skins/default/templates/embed/ask_by_widget.html
@@ -161,6 +161,7 @@
     .field-errors{
       font-size: 10px;
       color: #ff0000;
+      height: 10px;
     }
     {{widget.inner_style}}
   </style>
@@ -176,13 +177,9 @@
   </div>
   <div id='question-list'>
   </div>
-  {% if form.title.errors %}
   <div class="field-errors">
-    {% for error in form.title.errors %}
-      {{error}}
-    {%endfor%}
+    {% for error in form.title.errors %} {{error}} {%endfor%}
   </div>
-  {% endif %}
 {% if widget.include_text_field %}
   {% if editor_type == 'markdown' %}
       <div class="wmd-container">
@@ -195,14 +192,10 @@
           {{ form.text }}
       </div>
   {% endif %}
-  {% if form.text.errors %}
   <div class="field-errors">
-    {% for error in form.text.errors %}
-      {{error}}
-    {%endfor%}
+    {% for error in form.text.errors %} {{error}} {%endfor%}
   </div>
   {% endif %}
-{% endif %}
   {% if form.ask_anonymously %}
     <p>{{form.ask_anonymously.label_tag()}}: {{form.ask_anonymously}}</p>
   {%endif%}
@@ -210,20 +203,22 @@
 </form>
 {%endblock%}
 {% block endjs %}
+<script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
+{% if editor_type == 'markdown' %}
+    <script type='text/javascript' src='{{"/js/wmd/showdown.js"|media}}'></script>
+    <script type='text/javascript' src='{{"/js/wmd/wmd.js"|media}}'></script>
+{% else %}
+    {% include "meta/tinymce_css.html" %}{# todo - maybe move to form media? #}
+{% endif %}
+
 <script type="text/javascript" src='{{"/js/live_search_new_thread.js"|media}}'></script>
 <script type="text/javascript" charset="utf-8">
     var minSearchWordLength = {{settings.MIN_SEARCH_WORD_LENGTH}};
     askbot['urls']['api_get_questions'] = '{% url api_get_questions %}';
+    askbot['urls']['upload'] = '{% url upload %}';
     liveSearchNewThreadInit(true);
     $(document).ready(function(){
       $("#id_title").focus();
     });
 </script>
-
-<script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
-{% if editor_type == 'markdown' %}
-    <script type='text/javascript' src='{{"/js/wmd/showdown.js"|media}}'></script>
-    <script type='text/javascript' src='{{"/js/wmd/wmd.js"|media}}'></script>
-{% endif %}
 {% endblock %}
-  
diff --git a/askbot/skins/default/templates/embed/askbot_widget.css b/askbot/skins/default/templates/embed/askbot_widget.css
index 5f5288b6..a2b37d2c 100755
--- a/askbot/skins/default/templates/embed/askbot_widget.css
+++ b/askbot/skins/default/templates/embed/askbot_widget.css
@@ -13,7 +13,7 @@
      width:600px;
      {%if widget.include_text_field%}
      {% if editor_type == 'markdown' %}
-     height:500px;
+     height:520px;
      {%else%}
      height:520px;
      {%endif%}
diff --git a/askbot/skins/default/templates/meta/tinymce_css.html b/askbot/skins/default/templates/meta/tinymce_css.html
new file mode 100644
index 00000000..b6a1e798
--- /dev/null
+++ b/askbot/skins/default/templates/meta/tinymce_css.html
@@ -0,0 +1,20 @@
+<style type="text/css">{# todo: clean up - this is also in style.less!!! #}
+    .defaultSkin table.mceLayout,
+    .defaultSkin table.mceLayout tr.mceFirst td {
+        border: none;
+    }
+    .defaultSkin table.mceLayout tr.mceLast td {
+        border-bottom: none;
+    }
+    .mceStatusbar {
+        height: 5px;
+        background: #fff;
+    }
+    .defaultSkin span.mce_askbot_imageuploader {
+        background-position: -380px 0px;
+    }
+    .defaultSkin span.mce_askbot_attachment {
+        background-image: url({{ '/images/attachment.png'|media }});
+        background-position: 0px 0px;
+    }
+</style>