Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

layout of timeline

Browse Source
This commit is contained in:
Julien Fastré 2017-08-19 23:08:00 +02:00
parent 7b9a036589
commit 837beb4cb2
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/translations/messages.fr.yml
View File

@ -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.

21
Resources/views/Timeline/activity_person_context.html.twig
View File

@ -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>