From 1e881e1647e3ac95b854a008d31eb20bbf786007 Mon Sep 17 00:00:00 2001
From: liangliangyy <liangliangyy@gmail.com>
Date: Wed, 13 Feb 2019 23:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=B1=82=E7=BA=A7=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=20close=20#212?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comments/tags/comment_item_tree.html      | 44 +++++++++++++++++++
 templates/comments/tags/comment_list.html     | 20 ++-------
 2 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 templates/comments/tags/comment_item_tree.html

diff --git a/templates/comments/tags/comment_item_tree.html b/templates/comments/tags/comment_item_tree.html
new file mode 100644
index 0000000..676b792
--- /dev/null
+++ b/templates/comments/tags/comment_item_tree.html
@@ -0,0 +1,44 @@
+{% load blog_tags %}
+<li class="comment even thread-even depth-{{ depth }} parent" id="comment-{{ comment_item.pk }}"
+    style="margin-left: {% widthratio depth 1 3 %}rem">
+    <div id="div-comment-{{ comment_item.pk }}" class="comment-body">
+        <div class="comment-author vcard">
+            <img alt=""
+                 src="{{ comment_item.author.email|gravatar_url:150 }}"
+                 srcset="{{ comment_item.author.email|gravatar_url:150 }}"
+                 class="avatar avatar-96 photo" height="96" width="96">
+            <cite class="fn">
+                <a rel="nofollow"
+                        {% if comment_item.author.is_superuser %}
+                   href="{{ comment_item.author.get_absolute_url }}"
+                        {% else %}
+                   href="#"
+                        {% endif %}
+                   rel="external nofollow"
+                   class="url">{{ comment_item.author.username }}
+                </a>
+            </cite>
+            <span class="says">说道：</span>
+        </div>
+
+        <div class="comment-meta commentmetadata">
+            {{ comment_item.created_time }}
+        </div>
+
+        <p>{{ comment_item.body |escape|custom_markdown }}</p>
+
+        <div class="reply"><a rel="nofollow" class="comment-reply-link"
+                              href="javascript:void(0)"
+                              onclick="do_reply({{ comment_item.pk }})"
+                              aria-label="回复给{{ comment_item.author.username }}">回复</a></div>
+    </div>
+
+</li><!-- #comment-## -->
+{% query article_comments parent_comment=comment_item as cc_comments %}
+{% for cc in cc_comments %}
+    {% with comment_item=cc template_name="comments/tags/comment_item_tree.html" %}
+        {% with depth=depth|add:1 %}
+            {% include template_name %}
+        {% endwith %}
+    {% endwith %}
+{% endfor %}
\ No newline at end of file
diff --git a/templates/comments/tags/comment_list.html b/templates/comments/tags/comment_list.html
index 44a15a8..79d36c0 100644
--- a/templates/comments/tags/comment_list.html
+++ b/templates/comments/tags/comment_list.html
@@ -11,28 +11,16 @@
     {% if article_comments %}
         {% cache 36000 article_comments article.id %}
             <div id="commentlist-container" class="comment-tab" style="display: block;">
-
                 <ol class="commentlist">
                     {% query article_comments parent_comment=None as parent_comments %}
-                    {% for comment in parent_comments %}
-                        {% show_comment_item comment False %}
-
-                        {% parse_commenttree article_comments comment as childcomments %}
-                        {% if childcomments %}
-                            <ul class="children">
-                                {% for child in childcomments %}
-                                    {% show_comment_item child True %}
-
-                                {% endfor %}
-                            </ul><!-- .children -->
-                        {% endif %}
-
-
+                    {% for comment_item in parent_comments %}
+                        {% with 0 as depth %}
+                            {% include "comments/tags/comment_item_tree.html" %}
+                        {% endwith %}
                     {% endfor %}
 
                 </ol><!--/.commentlist-->
 
-
             </div>
         {% endcache %}
     {% endif %}