Merge remote-tracking branch 'origin/master' into issue294_suggestPersonInActivity

src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig

@@ -27,14 +27,16 @@
         {{ activity.type.name | localize_translatable_string }}
 
         <ul class="small_in_title">
+            {% if activity.location and t.locationVisible %}
             <li>
-                <abbr title="{{ 'location'|trans }}">{{ 'location'|trans ~ ': ' }}</abbr>
-                {# TODO {% if activity.location %}{{ activity.location }}{% endif %} #}
-                Domicile de l'usager
+                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                {{ activity.location.name }}
             </li>
+            {% endif %}
             {% if activity.user and t.userVisible %}
                 <li>
-                    <abbr title="{{ 'Referrer'|trans }}">{{ 'Referrer'|trans ~ ': ' }}</abbr>
+                    <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
                     {{ activity.user.usernameCanonical }}
                 </li>
             {% endif %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig

@@ -22,6 +22,7 @@
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
         window.activity = {{ activity_json|json_encode|raw }};
+        window.default_location_id = {{ default_location_id }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -55,7 +55,7 @@
     {% endif %}
 
 <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc', 'badge_person': 'true' } %}
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig

@@ -1,4 +1,2 @@
 
-{{ dump(notification) }}
-
 <a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>