From ce8207ea6505cbd2030dba358cc1d7962da6515e Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 8 Jul 2021 11:26:26 +0200
Subject: [PATCH] adapt person details page with bootstrap grid

---
 .../Resources/views/Person/view.html.twig     | 56 ++++++++-----------
 .../Resources/views/layout.html.twig          |  4 +-
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index 88e69a389..5a80951ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -35,13 +35,11 @@ This view should receive those arguments:
 {% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
       'form_path_key' : 'chill_person_general_edit' } %}
 
-
 {% block personcontent %}
-
 <div class="person-view">
     <div class="row justify-content-center">
-
         <div class="col-10">
+
             <div class="row">
                 {% if person.memo is not empty and chill_person.fields.memo == 'visible' %}
                 <div class="col-12">
@@ -55,10 +53,10 @@ This view should receive those arguments:
                     </figure>
                 </div>
                 {% endif %}
-                <div class="col-6 my-3">
+                
+                <div class="col-sm-6 my-3">
                     <figure class="person-details">
                         <h2 class="chill-red">{{ 'General information'|trans }}</h2>
-
                         <dl>
                             <dt>{{ 'First name'|trans }}&nbsp;:</dt>
                             <dd>{{ person.firstName }}</dd>
@@ -75,16 +73,12 @@ This view should receive those arguments:
                             <dt>{{ 'Gender'|trans }}&nbsp;:</dt>
                             <dd>{{ ( person.gender|default('Not given'))|trans }}</dd>
                         </dl>
-
-
-                        
                     </figure>
                 </div>
 
-                <div class="col-6 my-3">
+                <div class="col-sm-6 my-3">
                     <figure class="person-details">
                         <h2 class="chill-green"><i class="fa fa-birthday-cake"></i>&nbsp;{{ 'Birth information'|trans }}</h2>
-
                         <dl>
                             <dt>{{ 'Date of birth'|trans }}&nbsp;:</dt>
                             <dd>
@@ -114,17 +108,13 @@ This view should receive those arguments:
                             {% endapply %}</dd>
                             {%- endif -%}
                         </dl>
-
-                        
                     </figure>
                 </div>
             </div>
-        </div>
 
-        <div class="col-10">
             <div class="row">
                 {%- if chill_person.fields.nationality == 'visible' or chill_person.fields.spoken_languages == 'visible'-%}
-                <div class="col-6 my-3">
+                <div class="col-sm-6 my-3">
                     <figure class="person-details">
                         <h2 class="chill-orange">{{ 'Administrative information'|trans }}</h2>
 
@@ -166,13 +156,15 @@ This view should receive those arguments:
                             </dd>
                         </dl>
                         {%- endif -%}
-
-                        
                     </figure>
                 </div>
                 {%- endif -%}
-                {%- if chill_person.fields.email == 'visible' or chill_person.fields.phonenumber == 'visible' or chill_person.fields.mobilenumber == 'visible' or chill_person.fields.contact_info == 'visible'  -%}
-                <div class="col-6 my-3">
+                
+                {%- if chill_person.fields.email == 'visible' 
+                    or chill_person.fields.phonenumber == 'visible' 
+                    or chill_person.fields.mobilenumber == 'visible' 
+                    or chill_person.fields.contact_info == 'visible' -%}
+                <div class="col-sm-6 my-3">
                     <figure class="person-details">
                         <h2 class="chill-blue"><i class="fa fa-envelope-o"></i>&nbsp;{{ 'Contact information'|trans }}</h2>
 
@@ -233,16 +225,13 @@ This view should receive those arguments:
                             <dd>{% if person.contactInfo is not empty %}{{ person.contactInfo|nl2br }}{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd>
                         </dl>
                         {%- endif -%}
-
                         
                     </figure>
                 </div>
                 {%- endif -%}
             </div>
-        </div>
-
-        {% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
-        <div class="col-10">
+        
+            {% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
             <div class="row">
                 <div class="col-12 custom-fields">
                     <figure class="person-details">
@@ -250,25 +239,24 @@ This view should receive those arguments:
                     </figure>
                 </div>
             </div>
-        </div>
-
-        <div class="col-10">
-            <figure class="person-details"></figure>
-        </div>
-        {% endif %}
+        
+            <div class="row">
+                <figure class="person-details"></figure>
+            </div>
+            {% endif %}
     
+        </div>
+        
         {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-        <ul class="sticky-form-buttons record_actions ">
+        <ul class="col-10 sticky-form-buttons record_actions ">
             <li>
                 <a class="btn btn-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
                    {{ 'Edit'|trans }}
                 </a>
             </li>
-
         </ul>
         {% endif %}
 
     </div>
-</div> <!-- end of div.person-view -->
-
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig
index f50bbd746..33c0cbf7a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig
@@ -124,8 +124,8 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    <div class="mt-3 content">
-        {% block personcontent %}<!-- block personcontent empty -->{%endblock%}
+    <div class="mt-3">
+        {% block personcontent %}{# block personcontent empty #}{% endblock %}
     </div>
 {% endblock %}