From 27125b838ec89bf6a15cbc8232cbb8d7fcb7aee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 4 Oct 2021 15:15:26 +0200
Subject: [PATCH] various minor fixes in aside activities

---
 .../asideActivityCategory.html.twig                         | 4 +---
 .../src/Resources/views/asideActivity/index.html.twig       | 6 +++---
 .../src/Templating/Entity/CategoryRender.php                | 4 ++--
 .../src/translations/messages.fr.yml                        | 2 ++
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Bundle/ChillAsideActivityBundle/src/Resources/views/{asideActivityCategory => Entity}/asideActivityCategory.html.twig (75%)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/asideActivityCategory.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Entity/asideActivityCategory.html.twig
similarity index 75%
rename from src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/asideActivityCategory.html.twig
rename to src/Bundle/ChillAsideActivityBundle/src/Resources/views/Entity/asideActivityCategory.html.twig
index 8521b3132..1b31cc765 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/asideActivityCategory.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Entity/asideActivityCategory.html.twig
@@ -1,7 +1,6 @@
 {% set reversed_parents = parents|reverse %}
 <span
-	class="chill-entity entity-social-issue">
-	{# <span class="badge bg-chill-l-gray text-dark"> #}
+	class="chill-entity entity-aside_activity-category">
 	{%- for p in reversed_parents %}
 		<span class="parent-{{ loop.revindex0 }}">
 			{{ p.title|localize_translatable_string }}{{ options['default.separator'] }}
@@ -10,5 +9,4 @@
 	<span class="child">
 		{{ asideActivityCategory.title|localize_translatable_string }}
 	</span>
-	{# </span> #}
 </span>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
index a97a29875..6cc45aeaf 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -24,7 +24,7 @@
 
 							<div class="item-col">
 								<h3>
-									<b>{{ entity.type|chill_entity_render_box }}</b>
+									{{ entity.type|chill_entity_render_box }}
 								</h3>
 								<div>
 									{% if entity.date %}
@@ -46,13 +46,13 @@
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created by'|trans }}>{{ 'By'|trans }}:</abbr>
-												<b>{{ entity.createdBy.usernameCanonical }}</b>
+												<b>{{ entity.createdBy|chill_entity_render_box }}</b>
 											</span>
 										</li>
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created for'|trans }}>{{ 'For'|trans }}:</abbr>
-												<b>{{ entity.agent.usernameCanonical }}</b>
+												<b>{{ entity.agent|chill_entity_render_box }}</b>
 
 											</span>
 										</li>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
index 8bab0986c..902ed7a68 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
@@ -70,11 +70,11 @@ final class CategoryRender implements ChillEntityRenderInterface
         $options = array_merge(self::DEFAULT_ARGS, $options);
         $parents = $this->buildParents($asideActivityCategory);
 
-        return $this->engine->render('@ChillAsideActivity/asideActivityCategory/asideActivityCategory.html.twig',
+        return $this->engine->render('@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
         [
             'asideActivityCategory' => $asideActivityCategory,
             'parents' => $parents,
             'options' => $options
         ]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 6ee180ad9..c16f6af6a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -49,6 +49,8 @@ Agent: Utilisateur
 date: Date
 Duration: Durée
 Note: Note
+Choose the agent for whom this activity is created: Choisissez l'agent pour qui l'activité est créée
+Choose the activity category: Choisir la catégorie
 
 #Duration
 minutes: minutes