diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig index 6160f652e..3be1d49cf 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig @@ -6,14 +6,10 @@ {% block content %}
-
-
{# <=== vue component #} {% include 'ChillActivityBundle:Activity:edit.html.twig' %} -
-
{% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig index 34e1e109c..b040f2d7c 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig @@ -22,14 +22,10 @@ {% block personcontent %}
-
-
{# <=== vue component #} {% include 'ChillActivityBundle:Activity:edit.html.twig' %} -
-
{% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig index c554131b5..d6a665cb7 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig @@ -6,14 +6,10 @@ {% block content %}
-
-
{# <=== vue component #} {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %} -
-
{% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig index d39091389..45246c3ad 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig @@ -6,14 +6,10 @@ {% block personcontent %}
-
-
{# <=== vue component #} {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %} -
-
{% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig index 218ed0551..abfff78be 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig @@ -8,12 +8,8 @@ {% block content -%}
-
-
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %} -
-
{% endblock content %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig index c0fb2ea7e..3e4674ebf 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig @@ -8,12 +8,8 @@ {% block personcontent -%}
-
-
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %} -
-
{% endblock personcontent %} 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 e861f1361..abbaf1e14 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig @@ -21,8 +21,6 @@ {% block content %}
-
-

{{ title|trans }}

@@ -42,7 +40,5 @@ {{ 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 3672b6bf8..bb872a3b2 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig @@ -20,12 +20,8 @@ {% block content %}
-
-

{{ 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 d1711f231..2d890bd2b 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig @@ -22,14 +22,10 @@ {% block content %}
-
-
{% for result in results %} {{ result|raw }} {% endfor %} -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 3036efa85..ce0bbd393 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -8,8 +8,6 @@ {% block content %}
-
-
{% if 'DRAFT' == accompanyingCourse.step %}
@@ -358,8 +356,6 @@ {# ==> insert accompanyingCourse vue component #}
-
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig index b12719008..c04be7180 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig @@ -5,8 +5,10 @@ {% endblock %} {% block layout_wvm_content %} -
- {% block content %}{% endblock %} +
+
+ {% block content %}{% endblock %} +
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig index 89046cdc8..b1d4682d8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig @@ -5,15 +5,11 @@ {% block content %}
-
-

{{ block('title') }}

-
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig index 5535d20e6..bb670d9d6 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig @@ -5,15 +5,11 @@ {% block content %}
-
-

{{ block('title') }}

-
-
{% endblock %} 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 a5ce7eea4..0d06516af 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 @@ -5,8 +5,6 @@ {% block content %}
-
-

{{ block('title') }}

@@ -119,7 +117,7 @@ -
+
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig index 07639ae23..5f5a4a888 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig @@ -22,16 +22,12 @@ {% block personcontent %}
-
-
{% block content %}

{{ block('title') }}

{% endblock %} -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig index 714b328eb..6f6a90d81 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig @@ -24,8 +24,6 @@ {% block personcontent %}
-
-

{{ 'Addresses history'|trans }}

@@ -123,7 +121,5 @@ -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig index 785f03f1e..2365c2d03 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig @@ -22,16 +22,12 @@ {% block personcontent %}
-
-
{% block content %}

{{ block('title') }}

{% endblock %} -
-
{% endblock %} 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 13eb7af11..b060087d8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig @@ -4,8 +4,6 @@ {% block content %}
-
-

{{ block('title') }}

@@ -26,7 +24,5 @@
-
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig index af2e79184..d4f9df535 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig @@ -4,8 +4,6 @@ {% block content %}
-
-

{{ block('title') }}

@@ -70,7 +68,5 @@ -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig index 0b134f16d..d83baeb54 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig @@ -5,8 +5,10 @@ {% endblock %} {% block layout_wvm_content %} -
- {% block content %}{% endblock %} +
+
+ {% block content %}{% endblock %} +
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig index 5264b9d2c..41d1cb69d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig @@ -5,14 +5,10 @@ {% block content %}
-
-

{{ block('title') }}

-
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index 3de96c1e8..99f012435 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -4,8 +4,6 @@ {% block content %}
-
-

{{ block('title') }}

@@ -212,8 +210,6 @@ -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig index 3027de464..f7c029902 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig @@ -22,8 +22,6 @@ {% block personcontent %}
-
-

{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}

@@ -140,8 +138,6 @@ {{ form_end(form) }} -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig index c3343aa16..e0e4df125 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig @@ -6,8 +6,6 @@ {% block personcontent %}
-
-

{{ block('title') }}

{{ 'household.Household shared'|trans }}

@@ -177,7 +175,5 @@ {% endif %} -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig index 6d434ee5e..0a2c862b3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig @@ -23,8 +23,10 @@ {% endblock %} {% block layout_wvm_content %} -
- {% block personcontent %}{# block personcontent empty #}{% endblock %} +
+
+ {% block personcontent %}{# block personcontent empty #}{% endblock %} +
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig index 5a1aa94ac..f2981857f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig @@ -37,8 +37,6 @@ This view should receive those arguments: {% block personcontent %}
-
-
{% if person.memo is not empty and chill_person.fields.memo == 'visible' %} @@ -256,6 +254,5 @@ This view should receive those arguments: {% endif %}
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig index b2ede7558..0c257c0ea 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig @@ -8,8 +8,6 @@ {% block personcontent %}
-
-

{{ 'Désigner un dossier doublon'|trans }}

@@ -29,7 +27,5 @@ {{ form_end(form) }} -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig index ba27ac55d..5cef17c13 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig @@ -7,8 +7,6 @@ {% block personcontent %}
-
-

{{ title|default('Person duplicate')|trans }}

@@ -159,7 +157,5 @@ -
-
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig index 1362add7e..a154972c0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig @@ -28,8 +28,6 @@ This view should receive those arguments: {% block personcontent %}
-
-
{{ timeline|raw }} @@ -37,7 +35,5 @@ This view should receive those arguments: {{ chill_pagination(paginator) }} {% endif %} -
-
{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig index 43445f328..67604f015 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig @@ -23,8 +23,6 @@ {% block personcontent %}
-
-

{{ 'Edit task'|trans }}

@@ -57,7 +55,5 @@ {{ form_end(form) }} -
-
{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig index b52643afc..e5c60412a 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig @@ -31,11 +31,7 @@ {% if person is not null %} {% block personcontent %}
-
-
{% include 'ChillTaskBundle:SingleTask:_list.html.twig' %} -
-
{% endblock %} {% else %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig index f1cf607cc..8f6ba2a4b 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig @@ -23,8 +23,6 @@ {% block personcontent %}
-
-

{{ 'New task'|trans }}

@@ -48,7 +46,5 @@ {{ form_end(form) }} -
-
{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig index 6f75a1aae..8cfa1ea33 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig @@ -24,8 +24,6 @@ {% block personcontent %}
-
-

{{ 'Task'|trans }}

@@ -136,8 +134,6 @@ {% endif %} -
-
{% endblock %}