summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron <byroncorrales@gmail.com>2011-12-04 11:40:54 -0600
committerByron <byroncorrales@gmail.com>2011-12-04 11:40:54 -0600
commit57434f562a22299ce6797025948119b46fdde46f (patch)
tree79c11b60bb205643d92fdfc36eb95e93156205bf
parent7bccda444820b856f6d313cc1b39c0d43fdf0036 (diff)
downloadaskbot-57434f562a22299ce6797025948119b46fdde46f.tar.gz
askbot-57434f562a22299ce6797025948119b46fdde46f.tar.bz2
askbot-57434f562a22299ce6797025948119b46fdde46f.zip
fixing offensive flags count position
-rw-r--r--askbot/skins/common/templates/question/answer_controls.html3
-rw-r--r--askbot/skins/common/templates/question/question_controls.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/askbot/skins/common/templates/question/answer_controls.html b/askbot/skins/common/templates/question/answer_controls.html
index 4d26ffb9..bbb08d59 100644
--- a/askbot/skins/common/templates/question/answer_controls.html
+++ b/askbot/skins/common/templates/question/answer_controls.html
@@ -12,10 +12,11 @@
{% if request.user|can_flag_offensive(answer) %}{{ pipe() }}
<span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag"
title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}">
- <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a>
+ <a class="question-flag">{% trans %}flag offensive{% endtrans %}
{% if request.user|can_see_offensive_flags(answer) %}
<span class="darkred">{% if answer.offensive_flag_count > 0 %}({{ answer.offensive_flag_count }}){% endif %}</span>
{% endif %}
+ </a>
</span>
{% endif %}
{% if request.user|can_delete_post(answer) %}{{ pipe() }}
diff --git a/askbot/skins/common/templates/question/question_controls.html b/askbot/skins/common/templates/question/question_controls.html
index 9de54526..3d08b284 100644
--- a/askbot/skins/common/templates/question/question_controls.html
+++ b/askbot/skins/common/templates/question/question_controls.html
@@ -20,10 +20,11 @@
{% if request.user|can_flag_offensive(question) %}{{ pipe() }}
<span id="question-offensive-flag-{{ question.id }}" class="offensive-flag"
title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}">
- <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a>
+ <a class="question-flag">{% trans %}flag offensive{% endtrans %}
{% if request.user|can_see_offensive_flags(question) %}
<span class="darkred">{% if question.offensive_flag_count > 0 %}({{ question.offensive_flag_count }}){% endif %}</span>
{% endif %}
+ </a>
</span>
{% endif %}
{% if request.user|can_delete_post(question) %}{{ pipe() }}