diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 50dcbcd92..bf9c8d5ca 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -34,13 +34,13 @@
{% if context == 'person' and activity.accompanyingPeriod is not empty %}
-
+
{% if activity.user and t.userVisible %}
-
ref:
@@ -70,7 +71,7 @@
-
{{ 'location'|trans ~ ': ' }}
Domicile de l'usager
- {#
+ {# TODO
{% if activity.location %}{{ activity.location }}{% endif %}
#}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index 9c2b93811..d5ea0e172 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -45,19 +45,15 @@
{% endif %}
{% if context == 'user' and calendar.accompanyingPeriod is not empty %}
-
{% endif %}
-
+
@@ -66,14 +62,14 @@
{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}
{% endif %}
-
+
{% if calendar.mainUser is not empty %}
-
{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}
{% endif %}
-
+
-
{%- if calendar.comment.isEmpty -%}
{{ 'No comments'|trans }}
@@ -81,8 +77,8 @@
{{ calendar.comment|chill_entity_render_box }}
{%- endif -%}
-
-
+
+
-
- {%
+
+ {%
if calendar.comment.comment is not empty
or calendar.users|length > 0
or calendar.thirdParties|length > 0
- or calendar.users|length > 0
+ or calendar.users|length > 0
%}
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
-
+
{% if calendar.comment.comment is not empty %}
{% endif %}
-
+
{% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
index a6727593e..ec6e8a791 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
@@ -1,5 +1,5 @@
$social-issue-color: #4bafe8;
-$social-action-color: $pink;
+$social-action-color: $orange;
///
/// Social Issue mixin
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 8c8add139..61a3cd035 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -146,6 +146,7 @@ and %number% other: '{0} et aucun autre| {1} et une autre |]1, Inf] et %number%
'Period opened': 'Période ouverte'
'Close accompanying period': 'Clôre la période'
'Open accompanying period': 'Ouvrir la période'
+Period number %number%: 'Période n° %number%'
'Add an accompanying period in the past': Ajouter une période d'accompagnement dans le passé
Begin a new accompanying period: Commencer une nouvelle période d'accompagnement
Create an accompanying period: Créer une période d'accompagnement