From c60d46c68b24a33361793ca58cea50d45af4fedd Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 7 Jan 2022 12:51:03 +0100
Subject: [PATCH] put macro show_comment in a separate template

---
 .../Comment/index.html.twig                   | 41 ++-----------------
 .../Comment/macro_showItem.html.twig          | 36 ++++++++++++++++
 2 files changed, 39 insertions(+), 38 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/macro_showItem.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig
index a45aef6bb..56dda187e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig
@@ -4,42 +4,7 @@
     {{ 'Accompanying Course Comment list'|trans }}
 {% endblock %}
 
-{% macro show_comment(comment, options) %}
-<div class="item-bloc">
-    <div class="item-row">
-        <div>
-            {% if options.pinned is defined %}
-                <i class="fa fa-flag fa-fw fa-lg" title="{{ 'pinned'|trans }}"></i>
-            {% endif %}
-            <a id="comment{{ comment.id }}" href="{{ '#comment' ~ comment.id }}" class="fa fa-pencil-square-o fa-fw"></a>
-            {{ 'by'|trans }}<b>{{ comment.creator }}</b>{{ ', '  ~ 'on'|trans ~ ' ' ~ comment.createdAt|format_date('long') }}<br>
-            <i>{{ 'Last updated on'|trans ~ ' ' ~ comment.updatedAt|format_datetime('long', 'short') }}</i>
-        </div>
-        <ul class="record_actions">
-            {% if options.pinned is not defined %}
-                <li>
-                    <button class="btn btn-sm btn-misc" type="button">
-                        <i class="fa fa-flag fa-fw"></i>
-                        {{ 'Pin comment'|trans }}
-                    </button>
-                </li>
-            {% endif %}
-            <li>
-                <a class="btn btn-sm btn-edit" title="{{ 'Edit'|trans }}" href="{{ path('chill_person_accompanying_period_comment_list',  {
-                   'accompanying_period_id': comment.accompanyingPeriod.id,
-                   'edit': comment.id
-                   }) ~ '#comment' ~ comment.id }}"></a>
-            </li>
-            <li>
-                <a class="btn btn-sm btn-delete" title="{{ 'Delete'|trans }}" href=""></a>
-            </li>
-        </ul>
-    </div>
-    <div class="item-row separator">
-        <blockquote class="chill-user-quote col">{{ comment.content|chill_markdown_to_html }}</blockquote>
-    </div>
-</div>
-{% endmacro %}
+{% import '@ChillPerson/AccompanyingCourse/Comment/macro_showItem.html.twig' as macro %}
 
 {% macro form_comment(type, form) %}
     {% if type == 'edit' %}
@@ -73,14 +38,14 @@
             {% if commentEditId == accompanyingCourse.pinnedComment.id %}
                 {{ _self.form_comment('edit', edit_form) }}
             {% else %}
-                {{ _self.show_comment(accompanyingCourse.pinnedComment, {'pinned': 'true'}) }}
+                {{ macro.show_comment(accompanyingCourse.pinnedComment, {'pinned': 'true'}) }}
             {% endif %}
         {% endif %}
         {% for c in accompanyingCourse.comments %}
             {% if commentEditId == c.id %}
                 {{ _self.form_comment('edit', edit_form) }}
             {% else %}
-                {{ _self.show_comment(c) }}
+                {{ macro.show_comment(c) }}
             {% endif %}
         {% endfor %}
     </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/macro_showItem.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/macro_showItem.html.twig
new file mode 100644
index 000000000..82309300e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/macro_showItem.html.twig
@@ -0,0 +1,36 @@
+{% macro show_comment(comment, options) %}
+    <div class="item-bloc">
+        <div class="item-row">
+            <div>
+                {% if options.pinned is defined %}
+                    <i class="fa fa-flag fa-fw fa-lg" title="{{ 'pinned'|trans }}"></i>
+                {% endif %}
+                <a id="comment{{ comment.id }}" href="{{ '#comment' ~ comment.id }}" class="fa fa-pencil-square-o fa-fw"></a>
+                {{ 'by'|trans }}<b>{{ comment.creator }}</b>{{ ', '  ~ 'on'|trans ~ ' ' ~ comment.createdAt|format_date('long') }}<br>
+                <i>{{ 'Last updated on'|trans ~ ' ' ~ comment.updatedAt|format_datetime('long', 'short') }}</i>
+            </div>
+            <ul class="record_actions">
+                {% if options.pinned is not defined %}
+                    <li>
+                        <button class="btn btn-sm btn-misc" type="button">
+                            <i class="fa fa-flag fa-fw"></i>
+                            {{ 'Pin comment'|trans }}
+                        </button>
+                    </li>
+                {% endif %}
+                <li>
+                    <a class="btn btn-sm btn-edit" title="{{ 'Edit'|trans }}" href="{{ path('chill_person_accompanying_period_comment_list',  {
+                        'accompanying_period_id': comment.accompanyingPeriod.id,
+                        'edit': comment.id
+                    }) ~ '#comment' ~ comment.id }}"></a>
+                </li>
+                <li>
+                    <a class="btn btn-sm btn-delete" title="{{ 'Delete'|trans }}" href=""></a>
+                </li>
+            </ul>
+        </div>
+        <div class="item-row separator">
+            <blockquote class="chill-user-quote col">{{ comment.content|chill_markdown_to_html }}</blockquote>
+        </div>
+    </div>
+{% endmacro %}