diff --git a/Resources/views/Timeline/event_person_context.html.twig b/Resources/views/Timeline/event_person_context.html.twig
index 274ace1f3..01910c44f 100644
--- a/Resources/views/Timeline/event_person_context.html.twig
+++ b/Resources/views/Timeline/event_person_context.html.twig
@@ -11,23 +11,27 @@
{% endfor %}
#}
-{% if "now"|date('d/m/Y') < event.date|date('d/m/Y') %}
+{% if "now"|date('U') > event.date|date('U') %}
{% set boolDate = 'past' %}
{% else %}
{% set boolDate = 'futur' %}
{% endif %}
-
{{ event.date|localizeddate('long', 'none') }}
- / {{ 'Event'|trans }} {{ boolDate|trans }}
+
{{ event.date|localizeddate('long', 'short') }}
+ /
+ {% if boolDate|trans == 'futur' %}
+ Prochain événement
+ {% else %}
+ {{ 'Event'|trans }} passé
+ {% endif %}
+
+
-
{{ 'subscribed by %user% to event "%event%" (%event_type%)'|trans({
- '%user%' : user,
- '%person%' : person,
- '%event%' : event.name,
- '%event_type%': event.type.name|localize_translatable_string,
- '%date%' : event.date|localizeddate('long', 'none') }
- ) }}
+
+ - {{ 'Type: ' ~ event.type.name|localize_translatable_string }}
+ - {{ 'Nom: ' ~ event.name }}
+
{% if is_granted(constant('Chill\\ActivityBundle\\Security\\Authorization\\ActivityVoter::SEE_DETAILS'), event) %}
@@ -53,13 +57,5 @@
{{ 'Show the event'|trans }}
- {% if is_granted('CHILL_EVENT_UPDATE', event) %}
-
-
- {{ 'Edit the event'|trans }}
-
-
- {% endif %}
-
diff --git a/Timeline/TimelineEventProvider.php b/Timeline/TimelineEventProvider.php
index a718882d4..07b0f6829 100644
--- a/Timeline/TimelineEventProvider.php
+++ b/Timeline/TimelineEventProvider.php
@@ -96,7 +96,7 @@ class TimelineEventProvider implements TimelineProviderInterface
'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person'])
);
- dump($query);
+ //dump($query);
return $query;
}