Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / 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 43b1553b55cb6805dd3d0fa1841c3c9fd3aa4df3..49d529a0aded38e532ead3e1afb282781781ebb4 100644 (file)
--- 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" %}"\r
                         class="ajax-command comment-delete" rel="nofollow"> </a>\r
                 {% endif %}\r
                     <a id="comment-{{ comment.id }}-delete" href="{% url delete_comment id=comment.id %}" title="{% trans "Delete comment" %}"\r
                         class="ajax-command comment-delete" rel="nofollow"> </a>\r
                 {% endif %}\r

+                {% if comment.can_convert %}\r
+                    <a rel="nofollow" id="comment-{{ comment.id }}-convert" href="{% url convert_comment id=comment.id %}" title="{% trans "Convert comment to answer" %}"\r
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>\r
+                {% endif %}\r
+                    \r
+\r

                 <span class="comment-age">({% diff_date comment.added_at %})</span>\r
                 <span class="comment-age">({% diff_date comment.added_at %})</span>\r

-                <a class="comment-user userinfo" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>\r
+                <a class="comment-user userinfo" href="{{comment.user.get_profile_url}}">{{comment.user.decorated_name}}</a>\r

                 {% if show_gravatar %}{% gravatar comment.user 18 %}{% endif %}\r
             </div>\r
         </div>\r
                 {% if show_gravatar %}{% gravatar comment.user 18 %}{% endif %}\r
             </div>\r
         </div>\r


@@ -39,11 +45,11 @@
         <a href="#" class="add-comment-link">{% trans "add new comment" %}</a>\r
     {% endif %}\r
 </div>\r
         <a href="#" class="add-comment-link">{% trans "add new comment" %}</a>\r
     {% endif %}\r
 </div>\r

-{% if can_comment %}\r

 <div id="comment-{{ post.id }}-form-container" class="comment-form-container">\r
 <div id="comment-{{ post.id }}-form-container" class="comment-form-container">\r

+    {% if can_comment %}\r

     <form id="comment-{{ post.id }}-form" method="post" action="{% url comment id=post.id %}" accept-charset="utf-8">\r
         <div class="comment-form-widgets-container">\r
     <form id="comment-{{ post.id }}-form" method="post" action="{% url comment id=post.id %}" accept-charset="utf-8">\r
         <div class="comment-form-widgets-container">\r

-            <textarea name="comment"></textarea>\r
+            <textarea name="comment" class="commentBox"></textarea>\r

             <div class="comment-form-buttons">\r
                 <span id="comment-{{ post.id }}-chars-left" class="comment-chars-left">\r
                     <span class="comments-char-left-count">{{ min_length }}|{{ max_length }}</span>\r
             <div class="comment-form-buttons">\r
                 <span id="comment-{{ post.id }}-chars-left" class="comment-chars-left">\r
                     <span class="comments-char-left-count">{{ min_length }}|{{ max_length }}</span>\r


@@ -58,11 +64,14 @@
             <div class="comment{% if not comment.top_scorer %} not_top_scorer{% endif %}" id="comment-%ID%">\r
                 <div id="post-%ID%-score" class="comment-score"></div>\r
                 <div class="comment-text">%COMMENT%</div>\r
             <div class="comment{% if not comment.top_scorer %} not_top_scorer{% endif %}" id="comment-%ID%">\r
                 <div id="post-%ID%-score" class="comment-score"></div>\r
                 <div class="comment-text">%COMMENT%</div>\r

-                <div class="comment-info" id="comment-{{comment.id}}-info">\r
+                <div class="comment-info" id="comment-%ID%-info">\r

                     <a id="comment-%ID%-edit" href="%EDIT_URL%"\r
                         class="comment-edit" rel="nofollow"> </a>\r
                     <a id="comment-%ID%-delete" href="%DELETE_URL%"\r
                         class="ajax-command comment-delete" rel="nofollow"> </a>\r
                     <a id="comment-%ID%-edit" href="%EDIT_URL%"\r
                         class="comment-edit" rel="nofollow"> </a>\r
                     <a id="comment-%ID%-delete" href="%DELETE_URL%"\r
                         class="ajax-command comment-delete" rel="nofollow"> </a>\r

+                    <a rel="nofollow" id="comment-%ID%-convert" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"\r
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>\r
+\r

                     <span class="comment-age">({% trans "just now" %})</span>\r
                     <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>\r
                     {% if user.is_authenticated %}\r
                     <span class="comment-age">({% trans "just now" %})</span>\r
                     <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>\r
                     {% if user.is_authenticated %}\r


@@ -72,6 +81,6 @@
              </div>\r
         </script>\r
     </form>\r
              </div>\r
         </script>\r
     </form>\r

+    {% endif %}\r

 </div>\r
 </div>\r

-{% endif %}\r
-    
\ No newline at end of file
+    \r