diff options
-rw-r--r-- | askbot/skins/default/templates/embed/ask_by_widget.html | 18 | ||||
-rwxr-xr-x | askbot/skins/default/templates/embed/askbot_widget.css | 12 | ||||
-rwxr-xr-x | askbot/skins/default/templates/embed/askbot_widget.js | 1 | ||||
-rw-r--r-- | askbot/views/widgets.py | 1 |
4 files changed, 29 insertions, 3 deletions
diff --git a/askbot/skins/default/templates/embed/ask_by_widget.html b/askbot/skins/default/templates/embed/ask_by_widget.html index a82cf24b..8455ccdb 100644 --- a/askbot/skins/default/templates/embed/ask_by_widget.html +++ b/askbot/skins/default/templates/embed/ask_by_widget.html @@ -4,7 +4,15 @@ {% if editor_type == 'markdown' %} <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" /> {%endif%} + {% if settings.USE_LOCAL_FONTS %} + {% include "meta/fonts.html" %} + {% else %} + <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:400,700&subset=latin,cyrillic-ext,latin-ext' rel='stylesheet' type='text/css' /> + {% endif %} <style type="text/css" media="screen"> + body{ + font-family: Verdana, Arial, Helvetica, sans-serif; + } #editor { display: block; min-height: 200px; @@ -18,9 +26,15 @@ } #id_title{ + {% if editor_type == 'markdown' %} width: 100%; + {%else%} + padding: 0px 0 0 5px; + width: 99.2%; + {%endif%} font-size: 130%; border: #CCE6EC 3px solid; + max-width: 600px; } #submit{ @@ -97,7 +111,9 @@ <form action="." method="POST" accept-charset="utf-8"> {% csrf_token %} <label>{%trans%}Please enter a descriptive title for your question{%endtrans%}</label> - <input autocomplete="off" id="id_title" type="text" name="title" size="70" class='questionTitleInput'> + <div class="input-title"> + <input autocomplete="off" id="id_title" type="text" name="title" size="70" class='questionTitleInput'> + </div> {% if related_questions %} <div id='question-list'> </div> diff --git a/askbot/skins/default/templates/embed/askbot_widget.css b/askbot/skins/default/templates/embed/askbot_widget.css index d2a75a1f..ec1da2a0 100755 --- a/askbot/skins/default/templates/embed/askbot_widget.css +++ b/askbot/skins/default/templates/embed/askbot_widget.css @@ -12,7 +12,11 @@ #{{variable_name}} div{ width:600px; {%if widget.include_text_field%} - height:450px; + {% if editor_type == 'markdown' %} + height:480px; + {%else%} + height:420px; + {%endif%} {%else%} height:210px; {%endif%} @@ -25,5 +29,9 @@ #{{variable_name}} iframe{ width:600px; - height:450px; + {% if editor_type == 'markdown' %} + height:480px; + {%else%} + height:420px; + {%endif%} } diff --git a/askbot/skins/default/templates/embed/askbot_widget.js b/askbot/skins/default/templates/embed/askbot_widget.js index a6b48452..0ff320bf 100755 --- a/askbot/skins/default/templates/embed/askbot_widget.js +++ b/askbot/skins/default/templates/embed/askbot_widget.js @@ -17,6 +17,7 @@ var {{variable_name}} = { //creating the div var motherDiv = document.createElement('div'); motherDiv.setAttribute("id", {{variable_name}}.element_id); + motherDiv.style.visibility = "hidden"; var containerDiv = document.createElement('div'); motherDiv.appendChild(containerDiv); diff --git a/askbot/views/widgets.py b/askbot/views/widgets.py index bb020133..41913d39 100644 --- a/askbot/views/widgets.py +++ b/askbot/views/widgets.py @@ -220,6 +220,7 @@ def render_ask_widget_css(request, widget_id): content_tpl = get_template('embed/askbot_widget.css', request) context_dict = {'widget': widget, 'host': request.get_host(), + 'editor_type': askbot_settings.EDITOR_TYPE, 'variable_name': variable_name} content = content_tpl.render(Context(context_dict)) return HttpResponse(content, mimetype='text/css') |