diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-11-22 21:58:06 -0500 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-11-22 21:58:06 -0500 |
commit | 76788fb1f6deebf806a0199e6183ad6a9af4096a (patch) | |
tree | 2d5d2a51e8456183606008018e49c9e71cc67c77 /templates/question.html | |
parent | 46e48e400f30bde76a9b21db78f9b727149a3e24 (diff) | |
download | askbot-76788fb1f6deebf806a0199e6183ad6a9af4096a.tar.gz askbot-76788fb1f6deebf806a0199e6183ad6a9af4096a.tar.bz2 askbot-76788fb1f6deebf806a0199e6183ad6a9af4096a.zip |
fixed broken links in few places, added Arvyd's modification of user_reputation view, email sender cron job, some edits in INSTALL file
Diffstat (limited to 'templates/question.html')
-rw-r--r-- | templates/question.html | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/templates/question.html b/templates/question.html index 6929b762..9183767f 100644 --- a/templates/question.html +++ b/templates/question.html @@ -140,10 +140,6 @@ <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span> {% endif %} {% separator %} - {% if request.user|can_delete_post:question %} - <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span> - {% endif %} - {% separator %} {% 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 +159,10 @@ {% endif %} </span> {% endif %} + {% separator %} + {% if request.user|can_delete_post:question %} + <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span> + {% endif %} {% endjoinitems %} </div> <div class="post-update-info-container"> @@ -294,15 +294,6 @@ <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span> {% endif %} {% 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 %} - {% separator %} {% 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 +303,15 @@ {% endif %} </span> {% endif %} + {% 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 %} {% endjoinitems %} </div> <div class="post-update-info-container"> |