summaryrefslogtreecommitdiffstats
path: root/askbot/skins
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-12 13:29:04 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-12 13:29:04 -0400
commitc2587287e11a31ced679e7127af2b204ce559abd (patch)
treebe4ab3f98a225b0e7abb8bfca5644a3662e65fbe /askbot/skins
parentc8b8eaeb0f971d16809c0902c085bdecc2f147f0 (diff)
parent2e6653f348a7496f7be08c919c8197e4ca8c1a6d (diff)
downloadaskbot-c2587287e11a31ced679e7127af2b204ce559abd.tar.gz
askbot-c2587287e11a31ced679e7127af2b204ce559abd.tar.bz2
askbot-c2587287e11a31ced679e7127af2b204ce559abd.zip
merged Adolfo's branch
Diffstat (limited to 'askbot/skins')
-rw-r--r--askbot/skins/common/templates/question/answer_controls.html2
-rw-r--r--askbot/skins/default/templates/question.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/askbot/skins/common/templates/question/answer_controls.html b/askbot/skins/common/templates/question/answer_controls.html
index 4e53f880..21d12dd6 100644
--- a/askbot/skins/common/templates/question/answer_controls.html
+++ b/askbot/skins/common/templates/question/answer_controls.html
@@ -69,6 +69,6 @@
</form>
</span>
<script type="text/javascript">
- askbot['functions']['renderPostControls']('{{answer.id}}');
askbot['functions']['hideConvertAnswerLinks']('{{answer.id}}');
+ askbot['functions']['renderPostControls']('{{answer.id}}');
</script>
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 85210bbd..794853c2 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -175,7 +175,7 @@
function hide_convert_links(){
if (!askbot['data']['userIsAdminOrMod']){
- var links = document.getElementsByClassName('convert');
+ var links = document.getElementsByClassName('convert-comment');
for (i=0; i<links.length; i++){
links[i].setAttribute('style', 'display:none;');
}