From 0d38cae217d5fed48367169a6ed2ed4044686c15 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 1 Mar 2022 11:33:33 +0100
Subject: [PATCH] fix macro metadata + fix merge conflicts from branch
 ux_corrections

---
 .../Resources/views/List/list_item.html.twig  | 88 +++++++++----------
 .../Resources/views/Macro/updatedBy.html.twig | 38 +++++---
 2 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 51a82b5d2..44bcf5cbc 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -1,8 +1,10 @@
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
 {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+{% import '@ChillPerson/Macro/updatedBy.html.twig' as mmm %}
+
 <div class="item-bloc">
     <div class="item-row">
-        <div class="item-col">
+        <div class="item-col" style="width: unset">
             <div class="denomination h2">
                 {{ document.title }}
             </div>
@@ -30,57 +32,51 @@
         </div>
     </div>
     {% if document.description is not empty %}
-        <div class="item-row separator">
-            <blockquote class="chill-user-quote">
+        <div class="item-row">
+            <blockquote class="chill-user-quote col">
                 {{ document.description|chill_markdown_to_html }}
             </blockquote>
         </div>
     {% endif %}
     <div class="item-row separator">
         <div class="item-col item-meta">
-            <div class="updatedBy">
-                {{ 'Created by'|trans }}:
-                <span class="user">{{ document.createdBy|chill_entity_render_string }}</span>
-                <span class="date">le {{ document.createdAt|format_date('long') }}</span>
-            </div>
+            {{ mmm.createdBy(document) }}
+        </div>
+        <div class="item-col">
+            <ul class="record_actions">
+                {% if document.course is defined %}
+                    {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
+                        <li>
+                            {{ m.download_button(document.object, document.title) }}
+                        </li>
+                        <li>
+                            <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+                        <li>
+                            <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
+                        </li>
+                    {% endif %}
+                    <li>
+                        {{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }}
+                    </li>
+                {% else %}
+                    {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
+                        <li>
+                            {{ m.download_button(document.object, document.title) }}
+                        </li>
+                        <li>
+                            <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+                        <li>
+                            <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
+                        </li>
+                    {% endif %}
+                {% endif %}
+            </ul>
         </div>
     </div>
-    <div>
-    {% if document.course is defined %}
-        <ul class="record_actions">
-            <li>
-                {{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }}
-            </li>
-            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
-                <li>
-                    {{ m.download_button(document.object, document.title) }}
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-                <li>
-                    <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
-                </li>
-            {% endif %}
-        </ul>
-    {% else %}
-        <ul class="record_actions">
-            {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
-                <li>
-                    {{ m.download_button(document.object, document.title) }}
-                </li>
-                <li>
-                    <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-                <li>
-                    <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
-                </li>
-            {% endif %}
-        </ul>
-    {% endif %}
-    </div>
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
index e40cbd3f7..cbfd7660b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
@@ -1,11 +1,17 @@
 {% macro updatedBy(entity) %}
     <div class="updatedBy">
-        {{ 'Last updated on'|trans }}
-        <span class="date">
-            {{ entity.updatedAt|format_datetime('medium', 'short') }}
-        </span>
-        {% if entity.updatedBy %}
-            {{ ', ' ~ 'by_user'|trans }}
+        {% if entity.updatedAt != null %}
+            {{ 'Last updated on'|trans }}
+            <span class="date">
+                {{ entity.updatedAt|format_datetime('medium', 'short') }}
+            </span>
+        {% endif %}
+        {% if entity.updatedBy != null %}
+            {% if entity.updatedAt != null %}
+                {{ ', ' ~ 'by_user'|trans }}
+            {% else %}
+                {{ 'Last updated by'|trans }}
+            {% endif %}
             <span class="user">
                 {{ entity.updatedBy|chill_entity_render_box }}
             </span>
@@ -14,13 +20,19 @@
 {% endmacro %}
 
 {% macro createdBy(entity) %}
-    <div class="updatedBy">
-        {{ 'Created on'|trans }}
-        <span class="date">
-            {{ entity.createdAt|format_datetime('medium', 'short') }}
-        </span>
-        {% if entity.createdBy %}
-            {{ ', ' ~ 'by_user'|trans }}
+    <div class="createdBy">
+        {% if entity.createdAt != null %}
+            {{ 'Created on'|trans }}
+            <span class="date">
+                {{ entity.createdAt|format_datetime('medium', 'short') }}
+            </span>
+        {% endif %}
+        {% if entity.createdBy != null %}
+            {% if entity.createdAt != null %}
+                {{ ', ' ~ 'by_user'|trans }}
+            {% else %}
+                {{ 'Created by'|trans }}
+            {% endif %}
             <span class="user">
                 {{ entity.createdBy|chill_entity_render_string }}
             </span>