diff options
Diffstat (limited to 'templates/question.html')
| -rw-r--r-- | templates/question.html | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/templates/question.html b/templates/question.html index e88f7ef1..9652e3f6 100644 --- a/templates/question.html +++ b/templates/question.html @@ -140,13 +140,6 @@ <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span> {% endif %} {% separator %} -<<<<<<< HEAD:templates/question.html - {% if request.user|can_delete_post:question %} - <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span> - {% endif %} - {% separator %} -======= ->>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/question.html {% if question.closed %} {% if request.user|can_reopen_question:question %} <span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span> @@ -166,13 +159,10 @@ {% endif %} </span> {% endif %} -<<<<<<< HEAD:templates/question.html -======= {% separator %} {% if request.user|can_delete_post:question %} <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span> {% endif %} ->>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/question.html {% endjoinitems %} </div> <div class="post-update-info-container"> @@ -304,18 +294,7 @@ <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span> {% endif %} {% separator %} -<<<<<<< HEAD:templates/question.html - {% if request.user|can_delete_post:answer %} - {% spaceless %} - <span class="action-link"> - <a id="answer-delete-link-{{answer.id}}"> - {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a> - </span> - {% endspaceless %} - {% endif %} - {% separator %} -======= ->>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/question.html + {% if request.user|can_flag_offensive %} <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}"> @@ -325,8 +304,6 @@ {% endif %} </span> {% endif %} -<<<<<<< HEAD:templates/question.html -======= {% separator %} {% if request.user|can_delete_post:answer %} {% spaceless %} @@ -336,7 +313,6 @@ </span> {% endspaceless %} {% endif %} ->>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/question.html {% endjoinitems %} </div> <div class="post-update-info-container"> @@ -384,6 +360,13 @@ {% endif %} </div> </div> + <div id="comment-{{ answer.id }}" class="post-comments" > + <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments }}"/> + <a id="comments-link-answer-{{answer.id}}" class="comments-link"> + {% if answer.comment_count %}{% trans "comments" %} + <strong>({{answer.comment_count}})</strong>{% else %}{% trans "add comment" %}{% endif %}</a> + <div id="comments-answer-{{answer.id}}" class="comments-container"> + <div class="comments"/></div> </td> </tr> |