X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/881f902757e0d053b0dc9016055630b28c79c3b5..6ebde88b50458c1ba0d81d42ab3bc59e131537b1:/forum/skins/default/templates/node/comments.html

diff --git a/forum/skins/default/templates/node/comments.html b/forum/skins/default/templates/node/comments.html
index 49d529a..f67e079 100644
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -19,11 +19,13 @@
                 {% endif %}
                 {% if comment.can_delete %}
                     <a id="comment-{{ comment.id }}-delete" href="{% url delete_comment id=comment.id %}" title="{% trans "Delete comment" %}"
-                        class="ajax-command comment-delete" rel="nofollow"> </a>
+                        class="ajax-command comment-delete confirm" rel="nofollow"> </a>
                 {% endif %}
                 {% if comment.can_convert %}
                     <a rel="nofollow" id="comment-{{ comment.id }}-convert" href="{% url convert_comment id=comment.id %}" title="{% trans "Convert comment to answer" %}"
                         class="ajax-command comment-convert confirm" rel="nofollow"> </a>
+                    <a rel="nofollow" id="comment-{{ comment.id }}-convert-to-question" href="{% url convert_to_question id=comment.id %}?node_type=comment" title="{% trans "Convert comment to question" %}"
+                        class="comment-convert-to-question" rel="nofollow"> </a>
                 {% endif %}
                     
 
@@ -48,8 +50,9 @@
 <div id="comment-{{ post.id }}-form-container" class="comment-form-container">
     {% if can_comment %}
     <form id="comment-{{ post.id }}-form" method="post" action="{% url comment id=post.id %}" accept-charset="utf-8">
+        {% csrf_token %}
         <div class="comment-form-widgets-container">
-            <textarea name="comment" class="commentBox"></textarea>
+            <textarea name="comment" class="commentBox" id="comment"></textarea>
             <div class="comment-form-buttons">
                 <span id="comment-{{ post.id }}-chars-left" class="comment-chars-left">
                     <span class="comments-char-left-count">{{ min_length }}|{{ max_length }}</span>
@@ -59,17 +62,23 @@
                 <input type="submit" class="comment-submit" value="{% trans " comment" %}" />
                 <input type="submit" class="comment-cancel" value="{% trans " cancel" %}" />
             </div>
+            <div class="clear"></div>
+            {% if user.can_use_canned_comments %}
+            <div class="canned_comment">
+                <a href="{% url canned_comments post.id %}" class="ajax-command withprompt">{% trans "Use canned comment" %}</a>
+            </div>
+            {% endif %}
         </div>
         <script type="text/html" class="new-comment-skeleton" id="new-comment-skeleton-{{ post.id }}">
             <div class="comment{% if not comment.top_scorer %} not_top_scorer{% endif %}" id="comment-%ID%">
                 <div id="post-%ID%-score" class="comment-score"></div>
                 <div class="comment-text">%COMMENT%</div>
                 <div class="comment-info" id="comment-%ID%-info">
-                    <a id="comment-%ID%-edit" href="%EDIT_URL%"
+                    <a id="comment-%ID%-edit" href="%EDIT_URL%" title="{% trans "Edit comment" %}"
                         class="comment-edit" rel="nofollow"> </a>
-                    <a id="comment-%ID%-delete" href="%DELETE_URL%"
-                        class="ajax-command comment-delete" rel="nofollow"> </a>
-                    <a rel="nofollow" id="comment-%ID%-convert" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"
+                    <a id="comment-%ID%-delete" href="%DELETE_URL%" title="{% trans "Delete comment" %}"
+                        class="ajax-command comment-delete confirm" rel="nofollow"> </a>
+                    <a rel="nofollow" id="comment-%ID%-convert" style="display:none;" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"
                         class="ajax-command comment-convert confirm" rel="nofollow"> </a>
 
                     <span class="comment-age">({% trans "just now" %})</span>