From c880304ef5b3c6cc6b10644358fe49d33751d614 Mon Sep 17 00:00:00 2001
From: Alexey Skobkin <x@skobkin.ru>
Date: Tue, 29 Mar 2016 07:13:01 +0300
Subject: [PATCH] Test post comments templates implementation.

---
 .../Resources/public/css/main.css             | 17 +++++++
 .../Resources/translations/messages.ru.yml    |  3 ++
 .../views/Post/comment_list.html.twig         |  3 ++
 .../views/Post/comment_tree.html.twig         | 48 +++++++++++++++++++
 .../views/Post/comments_list.html.twig        |  5 ++
 .../views/Post/comments_tree.html.twig        |  5 ++
 .../Resources/views/Post/show.html.twig       | 18 ++++++-
 7 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_list.html.twig
 create mode 100644 src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_tree.html.twig
 create mode 100644 src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_list.html.twig
 create mode 100644 src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_tree.html.twig

diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css b/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css
index a6f42c5..d849ba6 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css
@@ -133,4 +133,21 @@ a.tag {
 
 a.post {
     font-weight: bold;
+}
+
+/* Comments */
+.comment {
+    margin-top: 20px;
+}
+
+.comment .comment-text {
+    margin-top: 5px;
+}
+
+.comment .comment-footer .comment-number {
+    margin-top: -8px;
+}
+
+.comments .children .comment {
+    margin-left: 20px;
 }
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml b/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml
index 8aa3477..7a5f564 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/translations/messages.ru.yml
@@ -35,6 +35,9 @@ No subscribers data found: Информация о подписчиках отс
 No rename log data found: Лог переименований отсутствует
 No subscribers log data found: Лог подписчиков отсутствует
 
+# Страница поста
+in response to: в ответ на
+
 # Топ пользователей
 Top users: Популярные пользователи
 Subscribers count: Подписчиков
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_list.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_list.html.twig
new file mode 100644
index 0000000..0187aed
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_list.html.twig
@@ -0,0 +1,3 @@
+{% extends '@SkobkinPointTools/Post/comment_tree.html.twig' %}
+
+{% block comment_children %}{% endblock %}
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_tree.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_tree.html.twig
new file mode 100644
index 0000000..7fb3ec5
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comment_tree.html.twig
@@ -0,0 +1,48 @@
+<a name="{{ comment.number }}"></a>
+<div class="comment">
+    <div class="container content">
+        <div class="row">
+            <div class="col-xs-1">
+                <div class="userpic">
+                    <img src="{{ point_avatar_medium(comment.author.login) }}" alt="{{ comment.author.login }} avatar">
+                </div>
+                <div class="post-date">
+                    {{ comment.createdAt|date('j M Y G:i') }}
+                </div>
+            </div>
+            <div class="col-xs-11">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <a href="{{ path('user_show', {'login': comment.author.login}) }}">@{{ comment.author.login }}</a>
+                        </div>
+                    </div>
+                    <div class="row comment-text">
+                        <div class="col-xs-12">
+                            {{ comment.text|markdown('markdown.parser.point') }}
+                        </div>
+                    </div>
+                    <div class="row comment-footer">
+                        <div class="col-xs-12 comment-number">
+                            <a href="#{{ comment.number }}" class="post">#{{ comment.post.id }}/{{ comment.number }}</a>
+                            {% if comment.parent is not null %}
+                                {{ 'in response to'|trans }} <a href="#{{ comment.parent.number }}" class="post">/{{ comment.parent.number }}</a>
+                            {% endif %}
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    {% block comment_children %}
+        {% if comment.children|length > 0 %}
+            <div class="children">
+                {% include '@SkobkinPointTools/Post/comments_tree.html.twig' with {
+                'comments': comment.children
+                } only %}
+            </div>
+        {% endif %}
+    {% endblock %}
+</div>
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_list.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_list.html.twig
new file mode 100644
index 0000000..962b54d
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_list.html.twig
@@ -0,0 +1,5 @@
+{% if comments|length > 0 %}
+    {% for comment in comments %}
+        {% include '@SkobkinPointTools/Post/comment_list.html.twig' with {'comment': comment} only %}
+    {% endfor %}
+{% endif %}
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_tree.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_tree.html.twig
new file mode 100644
index 0000000..b011791
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/comments_tree.html.twig
@@ -0,0 +1,5 @@
+{% if comments|length > 0 %}
+    {% for comment in comments %}
+        {% include '@SkobkinPointTools/Post/comment_tree.html.twig' with {'comment': comment} only %}
+    {% endfor %}
+{% endif %}
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/show.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/show.html.twig
index 6884c45..20db784 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/show.html.twig
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/Post/show.html.twig
@@ -16,7 +16,7 @@
     <div class="container post-block">
         <div class="row">
             <div class="col-xs-1">
-                <img src="{{ avatar_url }}" alt="Avatar">
+                <img src="{{ point_avatar_large(post.author.login) }}" alt="Avatar">
             </div>
             <div class="col-xs-11">
                 <div><a href="{{ path('user_show', {'login': post.author.login}) }}">@{{ post.author.login }}</a></div>
@@ -33,7 +33,7 @@
                 {{ post.text|markdown('markdown.parser.point') }}
             </div>
         </div>
-        <div class="row">
+        <div class="row post-files">
             <div class="col-xs-2">
                 {% for file in post.files %}
                     <div class="post-attachment">
@@ -45,5 +45,19 @@
         <div class="row">
             <div class="col-xs-12"><a href="https://point.im/{{ post.id }}" class="post">#{{ post.id }}</a></div>
         </div>
+
+        {% if post.comments|length > 0 %}
+        <div class="row comments">
+            {#
+            {% include '@SkobkinPointTools/Post/comments_tree.html.twig' with {
+                'comments': post.firstLevelComments
+            } only %}
+            #}
+
+            {% include '@SkobkinPointTools/Post/comments_list.html.twig' with {
+                'comments': post.comments
+            } %}
+        </div>
+        {% endif %}
     </div>
 {% endblock %}