diff options
Diffstat (limited to 'templates/question.html')
| -rw-r--r-- | templates/question.html | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/templates/question.html b/templates/question.html index 6929b762..e88f7ef1 100644 --- a/templates/question.html +++ b/templates/question.html @@ -140,10 +140,13 @@ <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> @@ -163,6 +166,13 @@ {% 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"> @@ -294,6 +304,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"> @@ -303,6 +314,8 @@ {% 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.)" %}"> @@ -312,6 +325,18 @@ {% endif %} </span> {% endif %} +<<<<<<< HEAD:templates/question.html +======= + {% separator %} + {% 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 %} +>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/question.html {% endjoinitems %} </div> <div class="post-update-info-container"> |