summaryrefslogtreecommitdiffstats
path: root/askbot
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-06-16 16:49:35 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-06-16 16:49:35 -0400
commit3c6d5b53359ebc1661b3edd33b8b971574e0ea5b (patch)
treee8d42dc2b5d8c87a6b1030a8dd6f0ea060359df9 /askbot
parentfe453b6e8042e5c6f70777ee1876dd6e9f0f0de0 (diff)
downloadaskbot-3c6d5b53359ebc1661b3edd33b8b971574e0ea5b.tar.gz
askbot-3c6d5b53359ebc1661b3edd33b8b971574e0ea5b.tar.bz2
askbot-3c6d5b53359ebc1661b3edd33b8b971574e0ea5b.zip
small changes in the skin and Ru locale
Diffstat (limited to 'askbot')
-rw-r--r--askbot/locale/ru/LC_MESSAGES/django.po2
-rw-r--r--askbot/skins/default/media/style/style.less4
-rw-r--r--askbot/skins/default/templates/question/sidebar.html2
3 files changed, 5 insertions, 3 deletions
diff --git a/askbot/locale/ru/LC_MESSAGES/django.po b/askbot/locale/ru/LC_MESSAGES/django.po
index 0a8b54f0..7d7f8b7d 100644
--- a/askbot/locale/ru/LC_MESSAGES/django.po
+++ b/askbot/locale/ru/LC_MESSAGES/django.po
@@ -4844,7 +4844,7 @@ msgstr "редактировать"
#: skins/default/templates/macros.html:525
#: skins/default/templates/question.html:511
msgid "add comment"
-msgstr "добавить комментарий"
+msgstr "добавить"
#: skins/default/templates/macros.html:518
#, python-format
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index f5316829..ea404391 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -1969,8 +1969,8 @@ ul#related-tags li {
float: left;
text-align: center;
padding-top: 2px;
- margin:10px 10px 0px 3px;
- /* smalls IE fixes */
+ margin:0px 10px 0px 3px;
+ /* small IE fixes */
*margin:0;
*height:210px;
*width:30px;
diff --git a/askbot/skins/default/templates/question/sidebar.html b/askbot/skins/default/templates/question/sidebar.html
index 620268e1..fe3f41c1 100644
--- a/askbot/skins/default/templates/question/sidebar.html
+++ b/askbot/skins/default/templates/question/sidebar.html
@@ -1,7 +1,9 @@
{% from "macros.html" import timeago %}
+{% if settings.SIDEBAR_QUESTION_HEADER %}
<div class="box">
{{ settings.SIDEBAR_QUESTION_HEADER }}
</div>
+{% endif %}
<div class="box vote-buttons">
<h2 >{% trans %}Question tools{% endtrans %}</h2>
{% if favorited %}