From 961d942f388e0062fed4cd663dd29f8ee1f81880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 15 Nov 2016 21:33:53 +0100
Subject: [PATCH] layout improvement in UI

---
 Resources/translations/messages.fr.yml |  2 +-
 Resources/views/Address/list.html.twig |  8 ++++----
 Resources/views/Address/new.html.twig  |  4 ++++
 Resources/views/Person/view.html.twig  | 14 +++++++-------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index a39322b0e..84af5146c 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -89,7 +89,7 @@ Re-Open a period: Ré-ouvrir une période d'accompagnement
 Are you sure you want to re-open this period ?: Êtes-vous sûr de vouloir ré-ouvrir cette période d'accompagnement ?
 'The period has been re-opened': La période d'accompagnement a été ré-ouverte.
 Pediod closing form is not valid: Le formulaire n'est pas valide
-
+No data given: Pas d'information
 # pickAPersonType
 Pick a person: Choisir une personne
 
diff --git a/Resources/views/Address/list.html.twig b/Resources/views/Address/list.html.twig
index cc382514f..0115e0f35 100644
--- a/Resources/views/Address/list.html.twig
+++ b/Resources/views/Address/list.html.twig
@@ -70,13 +70,13 @@
         
         <ul class="record_actions">
             <li>
-                <a href="{{ path('chill_person_view', { 'person_id' : person.id } ) }}" class="sc-button btn-cancel">
-                        {{ 'Back to the person details'|trans }}
+                <a href="{{ path('chill_person_view', { 'person_id' : person.id } ) }}" class="sc-button bt-cancel">
+                        <i class="fa fa-arrow-left"></i>{{ 'Back to the person details'|trans }}
                     </a>
             </li>
             <li>
-                <a href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}" class="sc-button btn-create">
-                        {{ 'Add an address'|trans }}
+                <a href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}" class="sc-button bt-create">
+                        <i class="fa fa-plus"></i>{{ 'Add an address'|trans }}
                     </a>
             </li>
         </ul>
diff --git a/Resources/views/Address/new.html.twig b/Resources/views/Address/new.html.twig
index 8e9f9a4ca..680951130 100644
--- a/Resources/views/Address/new.html.twig
+++ b/Resources/views/Address/new.html.twig
@@ -27,9 +27,13 @@
     {{ form_start(form) }}
     
     {{ form_row(form.streetAddress1) }}
+    {{ form_errors(form.streetAddress1) }}
     {{ form_row(form.streetAddress2) }}
+    {{ form_errors(form.streetAddress2) }}
     {{ form_row(form.postCode) }}
+    {{ form_errors(form.postCode) }}
     {{ form_row(form.validFrom) }}
+    {{ form_errors(form.validFrom) }}
     
     <ul class="record_actions">
         <li>
diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig
index 33cb4fff4..18f2bfc63 100644
--- a/Resources/views/Person/view.html.twig
+++ b/Resources/views/Person/view.html.twig
@@ -84,7 +84,7 @@ This view should receive those arguments:
                     {%- if person.birthdate is not null -%}
                     {{ person.birthdate|localizeddate('long', 'none') }}
                     {%- else -%}
-                    {{ 'Unknown date of birth'|trans }}
+                    <span class="chill-no-data-statement">{{ 'Unknown date of birth'|trans }}</span>
                     {%- endif -%}
                 </dd>
                 
@@ -98,7 +98,7 @@ This view should receive those arguments:
                     {% if person.countryOfBirth is not null %}
                         {{ person.countryOfBirth.name|localize_translatable_string }}
                     {% else %}
-                        {{ 'Unknown country of birth'|trans }}
+                        <span class="chill-no-data-statement">{{ 'Unknown country of birth'|trans }}</span>
                     {% endif %}
                 {% endspaceless %}</dd>
                 {%- endif -%}
@@ -124,7 +124,7 @@ This view should receive those arguments:
                     {% if person.nationality is not null %}
                         {{ person.nationality.name|localize_translatable_string }}
                     {% else %}
-                        {{ 'Without nationality'|trans }}
+                        <span class="chill-no-data-statement">{{ 'Without nationality'|trans }}</span>
                     {% endif %}
                 </dd> 
             </dl>
@@ -134,7 +134,7 @@ This view should receive those arguments:
                 <dt>{{'Spoken languages'|trans}}&nbsp;:</dt>
                 <dd>
                     {% if person.spokenLanguages|length == 0 %}
-                        {{ 'Unknown spoken languages'|trans }}
+                        <span class="chill-no-data-statement">{{ 'Unknown spoken languages'|trans }}</span>
                     {% else %}
                         {% for lang in person.spokenLanguages %}
                             {{ lang.name|localize_translatable_string }}{% if not loop.last %},{% endif %}
@@ -150,7 +150,7 @@ This view should receive those arguments:
                     {% if person.maritalStatus is not null %}
                         {{ person.maritalStatus.name|localize_translatable_string }}
                     {% else %}
-                        {{ 'no data given'|trans }}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                     {% endif %}
                 </dd>
             </dl>
@@ -192,13 +192,13 @@ This view should receive those arguments:
             {%- if chill_person.fields.email == 'visible' -%}
             <dl>
                 <dt>{{ 'Email'|trans }}&nbsp;:</dt>
-                <dd><pre>{{ person.email}}&nbsp;</pre></dd>
+                <dd>{% if person.email is not empty %}<pre>{{ person.email}}</pre>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd>
             </dl>
             {%- endif -%}
             {%- if chill_person.fields.phonenumber == 'visible' -%}
             <dl>
                 <dt>{{ 'Phonenumber'|trans }}&nbsp;:</dt>
-                <dd><pre>{{ person.phonenumber}}&nbsp;</pre></dd>
+                <dd>{% if person.phonenumber is not empty %}<pre>{{ person.phonenumber}}</pre>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
             </dl>
             {% endif %}