diff options
Diffstat (limited to 'askbot/skins/common/templates')
3 files changed, 20 insertions, 8 deletions
diff --git a/askbot/skins/common/templates/question/answer_controls.html b/askbot/skins/common/templates/question/answer_controls.html index 4d26ffb9..0dddc72d 100644 --- a/askbot/skins/common/templates/question/answer_controls.html +++ b/askbot/skins/common/templates/question/answer_controls.html @@ -1,7 +1,7 @@ {% set pipe=joiner('<span class="sep">|</span>') %} <span class="linksopt">{{ pipe() }} <a class="permant-link" - href="{{ answer.get_absolute_url() }}" + href="{{ answer.get_absolute_url() }}" title="{% trans %}answer permanent link{% endtrans %}"> {% trans %}permanent link{% endtrans %} </a> @@ -10,13 +10,21 @@ <span class="action-link"><a class="question-edit" href="{% url edit_answer answer.id %}">{% trans %}edit{% endtrans %}</a></span> {% endif %} {% if request.user|can_flag_offensive(answer) %}{{ pipe() }} -<span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" +<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> {% if request.user|can_see_offensive_flags(answer) %} <span class="darkred">{% if answer.offensive_flag_count > 0 %}({{ answer.offensive_flag_count }}){% endif %}</span> {% endif %} </span> +{% elif request.user|can_remove_flag_offensive(answer)%}{{ pipe() }} +<span id="answer-offensive-flag-remove-{{ answer.id }}" class="offensive-flag" + title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"> + <a class="question-flag">{% trans %}remove flag{% endtrans %}</a> + {% if request.user|can_see_offensive_flags(answer) %} + <span class="darkred">{% if answer.offensive_flag_count > 0 %}({{ answer.offensive_flag_count }}){% endif %}</span> + {% endif %} +</span> {% endif %} {% if request.user|can_delete_post(answer) %}{{ pipe() }} {% spaceless %} diff --git a/askbot/skins/common/templates/question/question_controls.html b/askbot/skins/common/templates/question/question_controls.html index 163fa4ec..6d1871e5 100644 --- a/askbot/skins/common/templates/question/question_controls.html +++ b/askbot/skins/common/templates/question/question_controls.html @@ -18,13 +18,21 @@ {% endif %} {% endif %} {% if request.user|can_flag_offensive(question) %}{{ pipe() }} -<span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" +<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> {% if request.user|can_see_offensive_flags(question) %} <span class="darkred">{% if question.offensive_flag_count > 0 %}({{ question.offensive_flag_count }}){% endif %}</span> {% endif %} </span> +{% elif request.user|can_remove_flag_offensive(question)%}{{ pipe() }} +<span id="question-offensive-flag-remove-{{ question.id }}" class="offensive-flag" + title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"> + <a class="question-flag">{% trans %}remove flag{% endtrans %}</a> + {% if request.user|can_see_offensive_flags(question) %} + <span class="darkred">{% if question.offensive_flag_count > 0 %}({{ question.offensive_flag_count }}){% endif %}</span> + {% endif %} +</span> {% endif %} {% if request.user|can_delete_post(question) %}{{ pipe() }} <a id="question-delete-link-{{question.id}}" class="question-delete">{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %}</a> diff --git a/askbot/skins/common/templates/widgets/search_bar.html b/askbot/skins/common/templates/widgets/search_bar.html index d5a7859b..5efe3860 100644 --- a/askbot/skins/common/templates/widgets/search_bar.html +++ b/askbot/skins/common/templates/widgets/search_bar.html @@ -21,12 +21,8 @@ {% endif %} {# class was searchInput #} <input - {% if query and request.user.is_authenticated() %} - class="searchInputCancelableAuth" - {% elif query %} + {% if query %} class="searchInputCancelable" - {% elif request.user.is_authenticated() %} - class="searchInputAuth" {% else %} class="searchInput" {% endif %} |