From 7f367a857e3abe61d89035a486992591d4b1d61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sun, 5 Jul 2015 23:45:49 +0200
Subject: [PATCH] layout of show and list

- remove attendee from list
- multiple case in show + layout
---
 Resources/translations/messages.fr.yml  | 1 +
 Resources/views/Activity/list.html.twig | 2 --
 Resources/views/Activity/show.html.twig | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 574b12017..54cf7de0b 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -14,6 +14,7 @@ not present: absent
 Delete: Supprimer
 Update: Mettre à jour
 Update activity: Édition de l'activité
+Scope: Cercle
 
 #forms
 Activity creation: Nouvelle activité
diff --git a/Resources/views/Activity/list.html.twig b/Resources/views/Activity/list.html.twig
index 5e2871555..c68371dd5 100644
--- a/Resources/views/Activity/list.html.twig
+++ b/Resources/views/Activity/list.html.twig
@@ -28,7 +28,6 @@
                 <th>{{'Duration Time' | trans }}</th>
                 <th>{{'Reason' | trans}}</th>
                 <th>{{'Type' | trans}}</th>
-                <th>{{'Attendee' | trans }}</th>
                 <th></th>
                 <th></th>
             </tr>
@@ -40,7 +39,6 @@
                 <td>{{ activity.durationTime|date('H:i') }}</td>
                 <td>{{ activity.reason.name | localize_translatable_string }}</td>
                 <td>{{ activity.type.name | localize_translatable_string }}</td>
-                <td>{{ activity.attendee }}</td>
                 <td>
                     <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}">{{ 'Show the activity' | trans }}</a>
                 </td>
diff --git a/Resources/views/Activity/show.html.twig b/Resources/views/Activity/show.html.twig
index 32717fa48..f09b3a8de 100644
--- a/Resources/views/Activity/show.html.twig
+++ b/Resources/views/Activity/show.html.twig
@@ -3,6 +3,8 @@
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
 {% block personcontent -%}
+    <h1>{{ "Activity"|trans }}</h1>
+    
     <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">
         <i class="fa fa-pencil"></i> {{ 'Edit the activity'|trans }}
     </a>
@@ -23,9 +25,9 @@
         <dt class="inline">{{ 'Type'|trans }}</dt>
         <dd>{{ entity.type.name | localize_translatable_string }}</dd>
         <dt class="inline">{{ 'Attendee'|trans }}</dt>
-        <dd>{{ entity.attendee }}</dd>
+        <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
         <dt class="inline">{{ 'Remark'|trans }}</dt>
-        <dd>{{ entity.remark }}</dd>
+        <dd>{% if entity.remark is empty %}{{ 'No remarks'|trans }}{% else %}<pre>{{ entity.remark }}</pre>{% endif %}</dd>
         <dt class="inline">{{ ''|trans }}</dt>
         <dd></dd>
         <dt class="inline">{{ ''|trans }}</dt>