From b38924cc3db5d78428d0d74f9f0e11032fa42d24 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 26 Jan 2022 16:04:09 +0100
Subject: [PATCH] Revert "Merge branch 'master' of
 gitlab.com:Chill-Projet/chill-bundles"

This reverts commit 58c4e37116511032fc08ba1e1454cf32df5dea48.
---
 CHANGELOG.md                                           |  1 -
 .../Resources/views/PersonResource/create.html.twig    |  3 +--
 .../Resources/views/PersonResource/list.html.twig      |  9 ++++++---
 .../ChillPersonBundle/translations/messages.fr.yml     | 10 +++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f2fb4a22..1b1e466b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,6 @@ and this project adheres to
 * [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
 * [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
 * [person ressources]: module added
-* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 46ba4ebef..6e05f2d6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -1,6 +1,5 @@
 <div class="col-md col-xxl">
     <div id="collapseForm" class="collapse">
-        <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
         {% include "@ChillPerson/PersonResource/form.html.twig" %}
     </div>
 
@@ -12,4 +11,4 @@
         </li>
     </ul>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index d8a67912f..e67f2d79f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -17,8 +17,7 @@
 {% block personcontent %}
 
 <h1>{{ 'List of resources'|trans }}</h1>
-
-{% if personResources|length > 0 %}
+{% if personResources is not empty %}
     {% for resource in personResources %}
         <div class="flex-table">
             <div class="item-bloc">
@@ -62,7 +61,9 @@
                 {% if resource.comment.comment is not null %}
                     <div class="item-row separator">
                         <section class="chill-entity entity-comment-embeddable">
-                            <div>{{ resource.comment|chill_entity_render_box }}<div>
+                            <blockquote class="chill-user-quote">
+                                <div>{{ resource.comment.comment }}<div>
+                            </blockquote>
                         </section>
                     </div>
                 {% endif %}
@@ -92,6 +93,8 @@
     <p class="chill-no-data-statement">{{ 'There are no available resources'|trans }}</p>
 {% endif %}
 
+<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
+
 {% include "@ChillPerson/PersonResource/create.html.twig" %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index db00540da..6dc1c0b8d 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -225,15 +225,15 @@ Concerned scopes: Services concernés
 
 # person resource
 
-person_resources_menu: "Personnes ressources"
+person_resources_menu: "Ressources"
 Person resources: "Ressources de la personne"
-Add a person resource: "Ajouter une personne ressource"
-edit resource: "Modifier une personne ressource"
-Remove resource: "Supprimer une personne ressource"
+Add a person resource: "Ajouter une ressource"
+edit resource: "Modifier ressource"
+Remove resource: "Supprimer ressource"
 Are you sure you want to remove the resource for "%name%" ?: Étes-vous sûr de vouloir supprimer cette ressource de %name%?
 The resource has been successfully removed.: "La ressource a été supprimée."
 List of resources: "Liste des ressources"
-There are no available resources: "Aucune personne ressources renseignée"
+There are no available resources: "Aucun ressource"
 no comment found: "Aucun commentaire"
 Select a type: "Choisissez un type"
 Select a person: "Choisissez un usager"