From d81f5bafe36163e8d25ec7e6d06e2bffd5f5c19f Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 22 Jul 2021 13:19:25 +0200
Subject: [PATCH] adding content classes + divers

---
 .../accompanying_course_work_list/index.scss  |  3 +-
 .../public/sass/person_with_period.scss       |  7 ----
 .../public/vuejs/AccompanyingCourse/App.vue   |  3 --
 .../views/AccompanyingCourse/index.html.twig  |  4 +-
 .../AccompanyingCourseWork/create.html.twig   | 11 +++++-
 .../AccompanyingCourseWork/edit.html.twig     | 11 +++++-
 .../list_by_accompanying_period.html.twig     |  9 ++++-
 .../views/AccompanyingPeriod/_list.html.twig  |  6 ++-
 .../Household/accompanying_period.html.twig   | 39 +++++++++++--------
 .../views/Household/addresses.html.twig       |  7 ++++
 .../views/Person/list_with_period.html.twig   |  9 +++--
 .../translations/messages.fr.yml              |  1 +
 12 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss
index 7d81d06d7..cbdb2d4ec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss
@@ -1,5 +1,4 @@
-
-#accompanying_course_work_list {
+div.accompanying_course_work-list {
 
   .item {
     margin-bottom: 1.5rem;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
index 97c23c36a..9e3ff8f6e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
@@ -15,13 +15,6 @@ div.list-household-members {
        font-weight: 700;
     }
 
-   div.person {
-      ul.record_actions {
-         li {
-            margin-right: 0 !important;
-         }
-      }
-   }
    div.comment {
       // for the comment for household-members
    }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index 8eda199fc..8be5ac83d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -56,9 +56,6 @@ export default {
 
 <style lang="scss">
    div#accompanying-course {
-      h1 {
-         margin: 1.5em 0;
-      }
       div.vue-component {
          h2 {
             margin: 1em 0.7em;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 33439d074..3036efa85 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="accompanyingcourse-index">
+<div class="accompanying_course-index">
     <div class="row justify-content-center">
         <div class="col-md-10 col-xxl">
 
@@ -29,7 +29,7 @@
          </div>
          <ul class="record_actions">
            <li>
-            <button class="btn btn-primary" data-bs-toggle="collapse" href="#withoutHouseholdList">
+            <button class="btn btn-create" data-bs-toggle="collapse" href="#withoutHouseholdList">
               {{ 'Add to household now'|trans }}
             </button>
            </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
index 19f32089e..89046cdc8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
@@ -4,10 +4,17 @@
 
 
 {% block content %}
-  <h1>{{ block('title') }}</h1>
+<div class="accompanying_course_work-create">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
 
-  <div id="accompanying_course_work_create"></div>
+            <h1>{{ block('title') }}</h1>
 
+            <div id="accompanying_course_work_create"></div>
+
+        </div>
+    </div>
+</div>
 {% endblock %}
 
 {% block js %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
index d40881559..5535d20e6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
@@ -4,10 +4,17 @@
 
 
 {% block content %}
-  <h1>{{ block('title') }}</h1>
+<div class="accompanying_course_work-edit">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
 
-  <div id="accompanying_course_work_edit"></div>
+            <h1>{{ block('title') }}</h1>
 
+            <div id="accompanying_course_work_edit"></div>
+
+        </div>
+    </div>
+</div>
 {% endblock %}
 
 {% block js %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index 6b057307e..a5ce7eea4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -4,9 +4,13 @@
 
 
 {% block content %}
+<div class="accompanying_course_work-list">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+
   <h1>{{ block('title') }}</h1>
 
-  <div id="accompanying_course_work_list">
+
     {% for w in works %}
       <div class="item">
         <div class="title">
@@ -104,7 +108,7 @@
     {% else %}
       <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
     {% endfor %}
-   </div>
+
 
   <ul class="record_actions sticky-form-buttons">
     <li>
@@ -115,6 +119,7 @@
     </li>
   </ul>
 
+</div></div></div>
 {% endblock %}
 
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index 4485b080d..7b4ac4a61 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -103,7 +103,11 @@
                 <ul class="record_actions">
                     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
                     <li>
-                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" class="btn btn-show"></a>
+                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
+                           class="btn btn-primary" title="{{ 'See accompanying period'|trans }}">
+                            <i class="fa fa-random"></i>
+                            {{ 'See this period'|trans }}
+                        </a>
                     </li>
                     {#
                     <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
index ea4443b79..13eb7af11 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -3,23 +3,30 @@
 {% block title 'Household accompanying period'|trans %}
 
 {% block content %}
-<h1>{{ block('title') }}</h1>
+<div class="household-members">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
 
-{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+            <h1>{{ block('title') }}</h1>
 
-<div class="form_control">
-    <ul class="record_actions">
-        <li class="cancel">
-            <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
-                {{ 'Household summary'|trans }}
-            </a>
-        </li>
-        {#<li>
-            <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
-              {{ 'Create an accompanying period'|trans }}
-            </a>
-        </li>#}
-    </ul>
+            {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+
+            <div class="form_control">
+                <ul class="record_actions">
+                    <li class="cancel">
+                        <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
+                            {{ 'Household summary'|trans }}
+                        </a>
+                    </li>
+                    {#<li>
+                        <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
+                          {{ 'Create an accompanying period'|trans }}
+                        </a>
+                    </li>#}
+                </ul>
+            </div>
+
+        </div>
+    </div>
 </div>
-
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 257efc26a..af2e79184 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -3,6 +3,10 @@
 {% block title 'Addresses history for household'|trans %}
 
 {% block content %}
+<div class="household-address">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+
 <h1>{{ block('title') }}</h1>
 
 <div class="address-timeline grid">
@@ -66,4 +70,7 @@
     </li>
 </ul>
 
+        </div>
+    </div>
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index 119df6e8e..ab88c81ef 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -80,11 +80,12 @@
                         <ul class="record_actions">
                         <li>
                             <a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="btn btn-show"
-                                title="{{ 'Open person file'|trans }}" /></a>
+                                title="{{ 'Open person file'|trans }}"></a>
                         </li>
                         <li>
-                            <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}" class="btn btn-chill-green" title="{{ 'See accompanying periods'|trans }}"/>
-                            <i class="fa fa-random"></i></a>
+                            <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}"
+                               class="btn btn-primary" title="{{ 'See accompanying periods'|trans }}">
+                                <i class="fa fa-random"></i></a>
                         </li>
                     </ul>
                     </div>
@@ -107,7 +108,7 @@
                         <div class="header">
                             <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}" 
                                 class="btn btn-chill-green" title="{{ 'See accompanying period'|trans }}">
-                                <i class="fa fa-fw fa-random"></i>
+                                <i class="fa fa-random"></i>
                             </a>
                             <span>{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}</span>
                             {% if app.accompanyingPeriod.user is not null %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 664f2440f..96dd17357 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -192,6 +192,7 @@ Last events on accompanying course: Dernières actions de suivi
 Edit & activate accompanying course: Modifier et valider
 See accompanying periods: Voir les périodes d'accompagnement
 See accompanying period: Voir cette période d'accompagnement
+See this period: Voir cette période
 Referrer: Référent
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
 Add to household now: Ajouter à un ménage