From 39dfd17c5dedfbd3cda780832d88a3ecb45c7f5a Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc@champs-libres.coop>
Date: Fri, 4 Dec 2015 19:37:47 +0100
Subject: [PATCH] Improving UI

---
 Resources/views/Person/create.html.twig       |  2 +-
 .../views/Person/create_review.html.twig      |  2 +-
 Resources/views/Person/view.html.twig         | 26 +++++++++----------
 Resources/views/layout.html.twig              | 17 +++++-------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/Resources/views/Person/create.html.twig b/Resources/views/Person/create.html.twig
index 2f373e43f..2e247b299 100644
--- a/Resources/views/Person/create.html.twig
+++ b/Resources/views/Person/create.html.twig
@@ -20,7 +20,7 @@
     
 {% block content %}
     <div class="grid-12 parent" >
-        <div class="grid-10 push-1 parent">
+        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
             {{ form_start(form) }}
             
                 <h1>{{ 'Add a person'|trans }}</h1>
diff --git a/Resources/views/Person/create_review.html.twig b/Resources/views/Person/create_review.html.twig
index 46baa312a..168ffc750 100644
--- a/Resources/views/Person/create_review.html.twig
+++ b/Resources/views/Person/create_review.html.twig
@@ -20,7 +20,7 @@
     
 {% block content %}
     <div class="grid-12 parent" >
-        <div class="grid-10 push-1 parent">
+        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
             {% if alternatePersons is not empty %}
                 <table>
                     <thead>
diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig
index 6114d9442..317ea6fa9 100644
--- a/Resources/views/Person/view.html.twig
+++ b/Resources/views/Person/view.html.twig
@@ -35,19 +35,19 @@ This view should receive those arguments:
 
 {% block personcontent %}
 
-<div class="grid-10 push-1 parent">
+<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
     <div class="grid-6">
         <figure class="person-details">
             <h2 class="chill-red">{{ 'General information'|trans|upper }}</h2>
             
             <dl>
-                <dt>{{ 'First name'|trans }} :</dt>
+                <dt>{{ 'First name'|trans }}&nbsp;:</dt>
                 <dd>{{ person.firstName }}</dd>
                 
-                <dt>{{ 'Last name'|trans }} :</dt>
+                <dt>{{ 'Last name'|trans }}&nbsp;:</dt>
                 <dd>{{ person.lastName }}</dd>
                 
-                <dt>{{ 'Gender'|trans }} :</dt>
+                <dt>{{ 'Gender'|trans }}&nbsp;:</dt>
                 <dd>{{ ( person.gender|default('Not given'))|trans }}</dd>
             </dl>
 
@@ -63,7 +63,7 @@ This view should receive those arguments:
             <h2 class="chill-green"><i class="fa fa-birthday-cake"></i>&nbsp;{{ 'Birth information'|trans|upper }}</h2>
 
             <dl>
-                <dt>{{ 'Date of birth'|trans }} :</dt>
+                <dt>{{ 'Date of birth'|trans }}&nbsp;:</dt>
                 <dd>
                     {%- if person.birthdate is not null -%}
                     {{ person.birthdate|localizeddate('long', 'none') }}
@@ -72,7 +72,7 @@ This view should receive those arguments:
                     {%- endif -%}
                 </dd>
                 
-                <dt>{{ 'Place of birth'|trans }} :</dt>
+                <dt>{{ 'Place of birth'|trans }}&nbsp;:</dt>
                 <dd>{{ person.placeOfBirth }}</dd>
                 <dd>{% spaceless %}  
                     {% if person.countryOfBirth is not null %}
@@ -90,13 +90,13 @@ This view should receive those arguments:
     </div>
 </div>
 
-<div class="grid-10 push-1 parent">
+<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
     <div class="grid-6">
         <figure class="person-details">
             <h2 class="chill-orange">{{ 'Administrative information'|trans|upper }}</h2>
 
             <dl>
-              <dt>{{ 'Nationality'|trans }} :</dt>
+              <dt>{{ 'Nationality'|trans }}&nbsp;:</dt>
                 <dd>
                     {% if person.nationality is not null %}
                         {{ person.nationality.name|localize_translatable_string }}
@@ -106,7 +106,7 @@ This view should receive those arguments:
                 </dd> 
             </dl>
             <dl>
-                <dt>{{'Spoken languages'|trans}} :</dt>
+                <dt>{{'Spoken languages'|trans}}&nbsp;:</dt>
                 <dd>
                     {% if person.spokenLanguages|length == 0 %}
                         {{ 'Unknown spoken languages'|trans }}
@@ -118,7 +118,7 @@ This view should receive those arguments:
                 </dd>
             </dl>
             <dl>
-                <dt>{{'Marital status'|trans}} :</dt>
+                <dt>{{'Marital status'|trans}}&nbsp;:</dt>
                 <dd>
                     {% if person.maritalStatus is not null %}
                         {{ person.maritalStatus.name|localize_translatable_string }}
@@ -138,11 +138,11 @@ This view should receive those arguments:
             <h2 class="chill-blue"><i class="fa fa-envelope-o"></i>&nbsp;{{ 'Contact information'|trans|upper }}</h2>
 
             <dl>
-                <dt>{{ 'Email'|trans }} :</dt>
+                <dt>{{ 'Email'|trans }}&nbsp;:</dt>
                 <dd><pre>{{ person.email}}&nbsp;</pre></dd>
             </dl>
             <dl>
-                <dt>{{ 'Phonenumber'|trans }} :</dt>
+                <dt>{{ 'Phonenumber'|trans }}&nbsp;:</dt>
                 <dd><pre>{{ person.phonenumber}}&nbsp;</pre></dd>
             </dl>
 
@@ -155,7 +155,7 @@ This view should receive those arguments:
 </div>
 
 {% if cFGroup  %}
-    <div class="grid-10 push-1 parent">
+    <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
         <div class="grid-6">
             <figure class="person-details">
                 {{ chill_custom_fields_group_widget(person.cFData, cFGroup) }}
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 1dd448a90..871fb0faa 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -34,12 +34,12 @@
 
 {% block top_banner %}
     <div class="grid-12 parent" id="header-person-name" >
-        <div class="grid-10 push-1 parent">
+        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
             <div class="grid-3">
-                <span class="open_sansbold">{{ 'Last name'|trans|upper  }} :</span> {{ person.lastName|upper }}
+                <span class="open_sansbold">{{ 'Last name'|trans|upper  }}&nbsp;:</span> {{ person.lastName|upper }}
             </div>
             <div class="grid-3">
-                <span class="open_sansbold">{{ 'First name'|trans|upper}} :</span> {{  person.firstName|upper }}
+                <span class="open_sansbold">{{ 'First name'|trans|upper}}&nbsp;:</span> {{  person.firstName|upper }}
             </div>
             <div class="grid-3">
                 <i class="fa  fa-{% spaceless %}
@@ -61,9 +61,9 @@
     </div>
 
     <div class="grid-12 parent" id="header-person-details" >
-        <div class="grid-10 push-1 parent">
+        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
             <div class="grid-3">
-                <span class="open_sansbold">{{ 'Birthdate'|trans|upper  }} :</span>
+                <span class="open_sansbold">{{ 'Birthdate'|trans|upper  }}&nbsp;:</span>
                 {% if person.birthdate == null %}
                     {{ 'Unknown date of birth'|trans }}, {{ ('person.gender.' ~ 
                         person.gender)|trans }}
@@ -72,7 +72,7 @@
                 {% endif %}
             </div>
             <div class="grid-3">
-                <span class="open_sansbold">{{ 'Nationality'|trans|upper}} :</span>
+                <span class="open_sansbold">{{ 'Nationality'|trans|upper}}&nbsp;:</span>
                 {% if person.nationality is not null %}
                     {{ person.nationality.name|localize_translatable_string }}
                 {% else %}
@@ -80,7 +80,7 @@
                 {% endif %}
             </div>
             <div class="grid-3">
-                <span class="open_sansbold">{{ 'Spoken languages'|trans|upper}} :</span>
+                <span class="open_sansbold">{{ 'Spoken languages'|trans|upper}}&nbsp;:</span>
                 {% if person.spokenLanguages|length == 0 %}
                     {{ 'Unknown spoken languages'|trans }}
                 {% else %}
@@ -105,7 +105,4 @@
         'args' : {'person_id': person.id },
         'activeRouteKey': activeRouteKey
     }) }}
-{% endblock %}
-
-{% block layout_content %}
 {% endblock %}
\ No newline at end of file