make {% comments %} template tag decoratable and add ability to attach additional...

[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 044a1a37d423ce34b280ae0ab4d855b7af7b123f..a84ef89d5583d46b518aa6a61ee647e75434f683 100644 (file)
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -1,6 +1,8 @@
 {% load extra_tags %}\r
 {% load i18n %}\r
 \r
+{% if show_latest_comments_first %}{% include "node/comment_skeleton.html" %}{% endif %}\r
+\r
 <div class="comments-container" id="comments-container-{{ post.id }}">\r
     {% for comment in comments %}\r
         <a name="{{ comment.id }}"></a>\r
@@ -24,8 +26,13 @@
                 {% 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
+                    <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" %}"\r
+                        class="comment-convert-to-question" rel="nofollow"> </a>\r
+                {% endif %}\r
+\r
+                {% if comment.additional_controls %}\r
+                    {{ comment.additional_controls }}\r
                 {% endif %}\r
-                    \r
 \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.decorated_name}}</a>\r
@@ -39,48 +46,11 @@
         <span class="comments-showing">\r
             {% blocktrans %}showing {{ showing }} of {{ total }}{% endblocktrans %}\r
         </span>\r
-        <a href="#" class="show-all-comments-link">{% trans "show all" %}</a>\r
+        <a href="#" class="show-all-comments-link">{% blocktrans %}show {{ more_comments_count }} more comments{% endblocktrans %}</a>\r
     {% endifnotequal %}\r
     {% if can_comment %}\r
         <a href="#" class="add-comment-link">{% trans "add new comment" %}</a>\r
     {% endif %}\r
 </div>\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
-            <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
-                    <span class="comments-chars-togo-msg">{% trans "characters needed" %}</span>\r
-                    <span class="comments-chars-left-msg">{% trans "characters left" %}</span>\r
-                </span>\r
-                <input type="submit" class="comment-submit" value="{% trans " comment" %}" />\r
-                <input type="submit" class="comment-cancel" value="{% trans " cancel" %}" />\r
-            </div>\r
-        </div>\r
-        <script type="text/html" class="new-comment-skeleton" id="new-comment-skeleton-{{ post.id }}">\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-%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 confirm" 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
-                        {% if show_gravatar %}{% gravatar user 18 %}{% endif %}\r
-                    {% endif %}\r
-                </div>\r
-             </div>\r
-        </script>\r
-    </form>\r
-    {% endif %}\r
-</div>\r
-    \r
+{% if not show_latest_comments_first %}{% include "node/comment_skeleton.html" %}{% endif %}\r