X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/410bfa05ee36ed1d99356c443a5f3f6aa3ee9578..881f902757e0d053b0dc9016055630b28c79c3b5:/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 571fd24..49d529a 100644
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -21,8 +21,14 @@
                     <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>
                 {% 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>
+                {% endif %}
+                    
+
                 <span class="comment-age">({% diff_date comment.added_at %})</span>
-                <a class="comment-user userinfo" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>
+                <a class="comment-user userinfo" href="{{comment.user.get_profile_url}}">{{comment.user.decorated_name}}</a>
                 {% if show_gravatar %}{% gravatar comment.user 18 %}{% endif %}
             </div>
         </div>
@@ -39,15 +45,15 @@
         <a href="#" class="add-comment-link">{% trans "add new comment" %}</a>
     {% endif %}
 </div>
-{% if can_comment %}
 <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">
         <div class="comment-form-widgets-container">
-            <textarea name="comment"></textarea>
+            <textarea name="comment" class="commentBox"></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>
-                    <span class="comments-chars-togo-msg">{% trans "characters to go" %}</span>
+                    <span class="comments-chars-togo-msg">{% trans "characters needed" %}</span>
                     <span class="comments-chars-left-msg">{% trans "characters left" %}</span>
                 </span>
                 <input type="submit" class="comment-submit" value="{% trans " comment" %}" />
@@ -58,11 +64,14 @@
             <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-{{comment.id}}-info">
+                <div class="comment-info" id="comment-%ID%-info">
                     <a id="comment-%ID%-edit" href="%EDIT_URL%"
                         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" %}"
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>
+
                     <span class="comment-age">({% trans "just now" %})</span>
                     <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>
                     {% if user.is_authenticated %}
@@ -72,6 +81,6 @@
              </div>
         </script>
     </form>
+    {% endif %}
 </div>
-{% endif %}
-    
\ No newline at end of file
+