The convert to answer action now works only if the comment parent is a question or...

[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 79f4df041fb663044d7df5b749afaecd4385284a..9105f56872df0122a63d69d86b326021495f3660 100644 (file)
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -4,39 +4,37 @@
 <div class="comments-container" id="comments-container-{{ post.id }}">\r
     {% for comment in comments %}\r
         <a name="{{ comment.id }}"></a>\r
 <div class="comments-container" id="comments-container-{{ post.id }}">\r
     {% for comment in comments %}\r
         <a name="{{ comment.id }}"></a>\r

-        <table class="comment{% if not comment.top_scorer %} not_top_scorer{% endif %}" id="comment-{{comment.id}}">\r
-            <tr>\r
-                <td rowspan="2" class="comment-score" id="comment-{{ comment.id }}-score">\r
-                    {% if comment.score %}{{ comment.score }}{% endif %}\r
-                </td>\r
-                <td class="comment-text" id="comment-{{comment.id}}-text">\r
-                    {{ comment.body }}\r
-                </td>\r
-            </tr>\r
-            <tr>\r
-                <td class="comment-info" id="comment-{{comment.id}}-info">\r
-                    <a class="comment-user userinfo" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>\r
-                    <span class="comment-age">({% diff_date comment.added_at %})</span>\r
-                    {% if comment.can_like %}\r
-                        <a id="comment-{{ comment.id }}-like" href="{% url like_comment id=comment.id %}"\r
-                         title="{% trans "I like this comment (click again to cancel)" %}" class="ajax-command comment-like{% if comment.likes %} on{% endif %}"\r
-                        rel="nofollow"> </a>\r
-                    {% endif %}\r
-                    {% if comment.can_edit %}\r
-                        <a id="comment-{{ comment.id }}-edit" href="#" title="{% trans "Edit comment" %}"\r
-                            class="comment-edit" rel="nofollow"> </a>\r
-                    {% endif %}\r
-                    {% if comment.can_delete %}\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
-                </td>\r
-            </tr>\r
-        </table>\r
+        <div class="comment{% if not comment.top_scorer %} not_top_scorer{% endif %}" id="comment-{{comment.id}}">\r
+            <div id="post-{{ comment.id }}-score" class="comment-score">{% if comment.score %}{{ comment.score }}{% endif %}</div>\r
+            <div class="comment-text">{{ comment.comment }}</div>\r
+            <div class="comment-info" id="comment-{{comment.id}}-info">\r
+                {% if comment.can_like %}\r
+                    <a id="post-{{ comment.id }}-upvote" href="{% url like_comment id=comment.id %}"\r
+                     title="{% trans "I like this comment (click again to cancel)" %}" class="ajax-command comment-like{% if comment.likes %} on{% endif %}"\r
+                    rel="nofollow"> </a>\r
+                {% endif %}\r
+                {% if comment.can_edit %}\r
+                    <a id="comment-{{ comment.id }}-edit" href="{% url node_markdown id=comment.id %}" title="{% trans "Edit comment" %}"\r
+                        class="comment-edit" rel="nofollow"> </a>\r
+                {% endif %}\r
+                {% if comment.can_delete %}\r
+                    <a id="comment-{{ comment.id }}-delete" href="{% url delete_comment id=comment.id %}" title="{% trans "Delete comment" %}"\r
+                        class="ajax-command comment-delete confirm" 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
+                <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

     {% endfor %}\r
 </div>\r
 <div id="comment-tools-{{ post.id }}" class="comment-tools">\r
     {% endfor %}\r
 </div>\r
 <div id="comment-tools-{{ post.id }}" class="comment-tools">\r

-    <img src="/m/default/media/images/gray-up-arrow-h18px.png" />\r

     {% ifnotequal showing total %}\r
         <span class="comments-showing">\r
             {% blocktrans %}showing {{ showing }} of {{ total }}{% endblocktrans %}\r
     {% ifnotequal showing total %}\r
         <span class="comments-showing">\r
             {% blocktrans %}showing {{ showing }} of {{ total }}{% endblocktrans %}\r


@@ -47,37 +45,42 @@
         <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

-    <form id="comment-{{ post.id }}-form" method="post" action="{% url comment id=post.id %}">\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
         <div class="comment-form-widgets-container">\r

-            <textarea name="comment"></textarea>\r
-            <input type="submit" value="{% trans " add comment" %}" />\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
         </div>\r

-        <span id="comment-{{ post.id }}-chars-left" class="comment-chars-left">\r
-            {% blocktrans %}\r
-                have <span class="comments-char-left-count">{{ max_length }}</span> characters left\r
-            {% endblocktrans %}\r
-        </span>\r

         <script type="text/html" class="new-comment-skeleton" id="new-comment-skeleton-{{ post.id }}">\r
         <script type="text/html" class="new-comment-skeleton" id="new-comment-skeleton-{{ post.id }}">\r

-            <table class="comment" id="comment-%ID%" style="display: none">\r
-                <tr>\r
-                    <td rowspan="2" class="comment-score" id="comment-%ID%-score"></td>\r
-                    <td class="comment-text" id="comment-%ID%-text">%COMMENT%</td>\r
-                </tr>\r
-                <tr>\r
-                    <td class="comment-info" id="comment-%ID%-info">\r
-                        <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>\r
-                        <span class="comment-age">({% trans "just now" %})</span>\r
-                        <a id="comment-%ID%-edit" href="#"\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
-                    </td>\r
-                </tr>\r
-            </table>\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%" title="{% trans "Edit comment" %}"\r
+                        class="comment-edit" rel="nofollow"> </a>\r
+                    <a id="comment-%ID%-delete" href="%DELETE_URL%" title="{% trans "Delete comment" %}"\r
+                        class="ajax-command comment-delete confirm" rel="nofollow"> </a>\r
+                    <a rel="nofollow" id="comment-%ID%-convert" style="display:none;" 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
         </script>\r
     </form>\r

+    {% endif %}\r

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

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