From 837beb4cb2fc3468e052163fb96deb469004df07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sat, 19 Aug 2017 23:08:00 +0200
Subject: [PATCH] layout of timeline

---
 Resources/translations/messages.fr.yml        |  2 +-
 .../activity_person_context.html.twig         | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index e8a6d793a..1546320c5 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -51,7 +51,7 @@ Choose a type: Choisir un type
 
 
 #timeline
-'%user% has done an %activity_type% on %date%': %user% a effectué une activité de type "%activity_type%" le %date%
+'%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
 
 #controller
 'Success : activity created!': Bravo ! L'activité a été créée.
diff --git a/Resources/views/Timeline/activity_person_context.html.twig b/Resources/views/Timeline/activity_person_context.html.twig
index 21b704f6d..6d08d5b14 100644
--- a/Resources/views/Timeline/activity_person_context.html.twig
+++ b/Resources/views/Timeline/activity_person_context.html.twig
@@ -3,13 +3,13 @@
 <div>
     <h3>{{ activity.date|localizeddate('long', 'none') }}<span class="activity"> / {{ 'Activity'|trans }}</span></h3>
     <div class="statement">
-        <span class="statement">{{ '%user% has done an %activity_type% on %date%'|trans(
+        <span class="statement">{{ '%user% has done an %activity_type%'|trans(
            { 
              '%user%' : user, 
              '%activity_type%': activity.type.name|localize_translatable_string, 
              '%date%' : activity.date|localizeddate('long', 'none') }
-        ) }}</span> <span class="links"><a href="{{ path('chill_activity_activity_show', 
-        { 'person_id': person.id, 'id': activity.id} ) }}">{{ 'Show the activity'|trans }}</a></span>
+        ) }}</span> 
+
         
         {% if is_granted(constant('Chill\\ActivityBundle\\Security\\Authorization\\ActivityVoter::SEE_DETAILS'), activity) %}
         <dl class="chill_view_data">
@@ -27,4 +27,19 @@
         {% endif %}
         
     </div>
+        
+    <ul class="record_actions">
+        <li>
+            <a href="{{ path('chill_activity_activity_show', { 'person_id': person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
+                {{ 'Show the activity'|trans }}
+            </a>
+        </li>
+        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
+        <li>
+            <a href="{{ path('chill_activity_activity_edit', { 'person_id': person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
+                {{ 'Edit the activity'|trans }}
+            </a>
+        </li>
+        {% endif %}
+    </ul>
 </div>