From ea734e2a9e813d2b7d9dea2613d8c9da5a0787b5 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 20 Jul 2021 15:46:20 +0200 Subject: [PATCH 01/16] fix menu context class --- src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig index 7eb95ef04..23dda065e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig @@ -15,9 +15,9 @@ * along with this program. If not, see . #} -
+
{% for menu in menus %} - {{ menu.label|upper }} From afd4ac27ea6146067014f92e4aac1da2aa71596b Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 20 Jul 2021 16:22:16 +0200 Subject: [PATCH 02/16] search page, content position --- .../views/Search/advanced_search.html.twig | 48 ++++++++++--------- .../Resources/views/Search/error.html.twig | 8 +++- .../Resources/views/Search/list.html.twig | 10 ++-- .../public/vuejs/AccompanyingCourse/App.vue | 22 ++++----- .../views/AccompanyingCourse/index.html.twig | 13 +++-- .../views/Person/list_with_period.html.twig | 5 +- .../translations/messages.fr.yml | 2 +- 7 files changed, 62 insertions(+), 46 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig index bfcdf9b7d..e861f1361 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig @@ -18,29 +18,31 @@ {% block title title|trans %} - -{% block content %} - -
- -

{{ title|trans }}

- - {{ form_start(form) }} - - {% for f in form %} - {% if f.vars.name != 'submit' %} - {{ form_row(f) }} - {% endif %} - {% endfor %} -
    -
  • - {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }} -
    • -
- - {{ form_end(form) }} - +{% block content %} +
+
+
+ +

{{ title|trans }}

+ + {{ form_start(form) }} + + {% for f in form %} + {% if f.vars.name != 'submit' %} + {{ form_row(f) }} + {% endif %} + {% endfor %} + +
    +
  • + {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }} +
    • +
+ + {{ form_end(form) }} + +
- +
{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig index f536fa8cd..3672b6bf8 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig @@ -19,7 +19,13 @@ {% set _search_pattern = pattern %} {% block content %} +
+
+
-

{{ message }}

+

{{ message }}

+
+
+
{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig index 0e3a76a5d..d1711f231 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig @@ -21,13 +21,15 @@ {% block title %}{{ 'Search %pattern%'|trans({ '%pattern%' : pattern }) }}{% endblock title %} {% block content %} +
+
+
-
-
{% for result in results %} {{ result|raw }} {% endfor %} +
- -{% endblock %} \ No newline at end of file +
+{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index b0e72b0b5..8eda199fc 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -1,13 +1,13 @@ @@ -36,11 +36,11 @@ import Confirm from './components/Confirm.vue'; export default { name: 'App', - components: { + components: { Banner, StickyNav, OriginDemand, - PersonsAssociated, + PersonsAssociated, Requestor, SocialIssue, Referrer, @@ -78,12 +78,12 @@ export default { } padding: 0em 0em; margin: 1em 0; - border: 1px dotted #718596ab; + border: 1px dotted #718596ab; border-radius: 5px; border-left: 1px dotted #718596ab; border-right: 1px dotted #718596ab; - dd { - margin-left: 1em; + dd { + margin-left: 1em; } & > div { margin: 1em 3em 0; @@ -91,6 +91,6 @@ export default { table { } } - + } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index c15869b1d..099b2c27b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -7,6 +7,9 @@ {% endblock %} {% block content %} +
+
+
{% if 'DRAFT' == accompanyingCourse.step %}
@@ -62,6 +65,7 @@ {% endif %}

{{ 'Associated peoples'|trans }}

+
{% for p in accompanyingCourse.participations %} {% if p.enddate is null %} @@ -334,7 +338,7 @@
{% else %} -

{{ 'accompanying_course_work.Any work'|trans }}

+

{{ 'accompanying_course_work.Any work'|trans }}

{% endfor %}
- {% block contentActivity %} {% set person = null %} {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse', 'context': 'accompanyingCourse'} %} @@ -354,6 +357,10 @@ {# ==> insert accompanyingCourse vue component #}
+ +
+
+
{% 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 192f69d7a..119df6e8e 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 @@ -79,9 +79,8 @@
+
{% endblock %} {% block js %} From d81f5bafe36163e8d25ec7e6d06e2bffd5f5c19f Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 22 Jul 2021 13:19:25 +0200 Subject: [PATCH 07/16] 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 {