diff --git a/docs/source/development/pagination.rst b/docs/source/development/pagination.rst index 1a2c91ff0..a9df72805 100644 --- a/docs/source/development/pagination.rst +++ b/docs/source/development/pagination.rst @@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function. {% block title 'Item list'|trans %} - {% block personcontent %} + {% block content %} diff --git a/docs/source/development/user-interface/layout-template-usage.rst b/docs/source/development/user-interface/layout-template-usage.rst index 69848c650..1ddbacafd 100644 --- a/docs/source/development/user-interface/layout-template-usage.rst +++ b/docs/source/development/user-interface/layout-template-usage.rst @@ -156,7 +156,7 @@ This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the p It proposes 1 new block : -* personcontent +* content * where to display the information of the person diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig index 9f8172bb4..43c2157fa 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig @@ -5,7 +5,7 @@ {% block title 'Remove activity'|trans %} -{% block personcontent %} +{% block content %} {{ include('@ChillMain/Util/confirmation_template.html.twig', { 'title' : 'Remove activity'|trans, diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig index 82c7403c6..91b3867c1 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig @@ -20,7 +20,7 @@ {% block title 'Update activity'|trans %} -{% block personcontent %} +{% block content %}
{# <=== vue component #} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig index ac4266f8c..0514284a2 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig @@ -30,7 +30,7 @@ {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} {% endblock %} -{% block personcontent %} +{% block content %} {% set person_id = null %} {% if person %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig index 962aee806..d57fc3412 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig @@ -4,7 +4,7 @@ {% block title 'Activity creation' |trans %} -{% block personcontent %} +{% block content %}
{# <=== vue component #} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig index da9b561d0..f616012e4 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig @@ -4,6 +4,6 @@ {% block title 'Activity creation'|trans %} -{% block personcontent %} +{% block content %} {% include 'ChillActivityBundle:Activity:selectType.html.twig' %} {% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig index e593b0131..5776eddb5 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig @@ -18,11 +18,11 @@ {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %} -{% block personcontent -%} +{% block content -%}
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
-{% endblock personcontent %} +{% endblock %} {% block block_post_menu %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig index bf658e505..940389ca1 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig @@ -25,7 +25,7 @@ {% endblock %} {% block layout_wvm_content %} - {% block admin_content %} + {% block admin_content %}

{{ 'Activity configuration' |trans }}

{% endblock %} {% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig index 3f44e432d..c328d2030 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig @@ -6,7 +6,7 @@ {% block layout_wvm_content %} {% block admin_content %} - +

{{ 'Aside activity configuration'|trans }}

{% endblock %} {% endblock %} diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig index 3fd306c2d..3e12173fc 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig +++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig @@ -25,7 +25,7 @@ {% endblock %} {% block layout_wvm_content %} - {% block admin_content %} + {% block admin_content %}

{{ 'CustomFields configuration' |trans }}

{% endblock %} {% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php index 8d59384d8..fe888f587 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php @@ -24,22 +24,15 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt { /** * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person") - * - * @var Person */ - private $person; + private Person $person; public function getCenter() { return $this->getPerson()->getCenter(); } - /** - * Get person. - * - * @return \Chill\MainBundle\Entity\Person - */ - public function getPerson() + public function getPerson(): Person { return $this->person; } diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig index eecfb1751..03be4e6b9 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig @@ -25,7 +25,7 @@ {% endblock %} {% block layout_wvm_content %} - {% block admin_content %} + {% block admin_content %}

{{ 'Documents configuration' |trans }}

{% endblock %} {% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig index 7533f1120..2f555cf72 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig @@ -20,7 +20,7 @@ {% set activeRouteKey = '' %} {% block title %}{{ 'Editing document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %} -{% block personcontent %} +{% block content %}

{{ 'Edit Document' | trans }}

{{ form_errors(form) }} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig index b3d2baab6..2faed6644 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig @@ -29,7 +29,7 @@ {{ encore_entry_script_tags('mod_async_upload') }} {% endblock %} -{% block personcontent %} +{% block content %}

{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig index ad4fcfc81..7b0c1b7b2 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig @@ -22,7 +22,7 @@ {{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }} {% endblock %} -{% block personcontent %} +{% block content %}

{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}

{{ form_errors(form) }} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig index 723757425..4e0b806f1 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig @@ -27,7 +27,7 @@ {{ encore_entry_script_tags('mod_async_upload') }} {% endblock %} -{% block personcontent %} +{% block content %}

{{ 'Document %title%' | trans({ '%title%': document.title }) }}

{{ mm.mimeIcon(document.object.type) }} diff --git a/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig index 160b488eb..827f4610e 100644 --- a/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig +++ b/src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig @@ -25,7 +25,7 @@ {% endblock %} {% block layout_wvm_content %} - {% block admin_content %} + {% block admin_content %}

{{ 'Events configuration' |trans }}

{% endblock %} {% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig index e9f9a0270..53e97c3c4 100644 --- a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig +++ b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig @@ -21,7 +21,7 @@ {% block title %}{{ 'Events participation' |trans }}{% endblock title %} -{% block personcontent %} +{% block content %}

{{ 'Events participation' |trans }}

diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig index 67b491ef4..2137cf54f 100644 --- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig +++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig @@ -5,7 +5,7 @@ {% block title 'Remove family membership'|trans %} -{% block personcontent %} +{% block content %} {{ include('ChillMainBundle:Util:confirmation_template.html.twig', { diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig index 31f106b92..b084e293a 100644 --- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig +++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig @@ -4,7 +4,7 @@ {% set title = 'Edit family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %} {% block title title %} -{% block personcontent %} +{% block content %}

{{ title }}

{{ form_start(form) }} diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig index d50be4b27..2e339c0d1 100644 --- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig +++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig @@ -88,7 +88,7 @@ {% import _self as m %} -{% block personcontent %} +{% block content %}

{{ title }}

{% if familyMembers|length == 0 %} diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig index 5a035a79c..fef2b0051 100644 --- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig +++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig @@ -4,7 +4,7 @@ {% set title = 'New family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %} {% block title title %} -{% block personcontent %} +{% block content %}

{{ title }}

{{ form_start(form) }} diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig index e6e6b12f4..1c60b491c 100644 --- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig +++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig @@ -6,7 +6,7 @@ {% block title title %} -{% block personcontent %} +{% block content %}

{{ title }}

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss index 459386ffd..d1b42f416 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/chill_variables.scss @@ -11,5 +11,5 @@ $chill-household-context: #929d69; $social-issue-color: #4bafe8; $social-action-color: $orange; $activity-color: yellowgreen; -$budget-resource-color: #5ba1c1; +$budget-resource-color: #608b89; $budget-charge-color: #e03851; diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig index bf487b089..0107bba4e 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig @@ -8,7 +8,7 @@ {% endblock %} {% block content %} - {% block admin_content %} + {% block admin_content %}

{{ 'Welcome to the admin section !'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig index dfb5139d3..55883069f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig @@ -25,7 +25,7 @@ {% endblock %} {% block layout_wvm_content %} - {% block admin_content %} + {% block admin_content %}

{{ 'Permissions management of your chill installation' |trans }}

{% endblock %} {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig index 1fb97c0b6..1edf075e1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig @@ -18,7 +18,7 @@ {% block title page_title %} -{% block personcontent %} +{% block content %}

{{ page_title }}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig index eb2cbe0cb..f30bfc45a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig @@ -4,7 +4,7 @@ {% block title %}{{ 'Accompanying period list for person'|trans }}{% endblock title %} -{% block personcontent %} +{% block content %}

{{ 'Accompanying period list'|trans }}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig index b75dcee5d..397e4fd9e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig @@ -4,7 +4,7 @@ {% block title 'Re-Open a period'|trans %} -{% block personcontent %} +{% block content %}

{{ 'Re-Open a period'|trans }}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig index 75994729c..e51e0180b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig @@ -20,7 +20,7 @@ {% block title 'Edit an address'|trans %} -{% block personcontent %} +{% block content %}
{% block content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig index 622a8a348..d47d9a8e2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'Addresses history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %} -{% block personcontent %} +{% block content %}

{{ 'Addresses history'|trans }}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig index 91c384103..7790b67ec 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'New address'|trans }}{% endblock %} -{% block personcontent %} +{% block content %}
{% block content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig index 51eae1c29..75390a8e3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig @@ -3,7 +3,7 @@ {% set person = entity.person %} {% set activeRouteKey = '' %} -{% block personcontent %} +{% block content %} {% embed '@ChillMain/CRUD/_delete_content.html.twig' %} {% endembed %} {% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig index 2ea43a3ff..49157533d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig @@ -7,7 +7,7 @@ {% include('@ChillMain/CRUD/_edit_title.html.twig') %} {% endblock title %} -{% block personcontent %} +{% block content %} {% embed '@ChillMain/CRUD/_edit_content.html.twig' %} {% endembed %} {% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig index 9356c0e7a..f3be478f5 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig @@ -4,7 +4,7 @@ {% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %} -{% block personcontent %} +{% block content %} {% embed '@ChillPerson/CRUD/_index.html.twig' %} {% block add_new %}
  • diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig index fbb9f5492..2c5ca4f2a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig @@ -7,7 +7,7 @@ {% embed('@ChillPerson/CRUD/_new_title.html.twig') %}{% endembed %} {% endblock %} -{% block personcontent %} +{% block content %} {% embed '@ChillPerson/CRUD/_new_content.html.twig' %} {% block crud_content_header %}

    {{ ('crud.'~crud_name~'.title_new')|trans({'%person%': person|chill_entity_render_string }) }}

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig index 762d5e4b0..c0a250993 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig @@ -7,7 +7,7 @@ {% include('@ChillPerson/CRUD/_view_title.html.twig') %} {% endblock %} -{% block personcontent %} +{% block content %} {% embed '@ChillPerson/CRUD/_view_content.html.twig' %} {% block crud_content_header %}

    {{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%person%': person|chill_entity_render_string }) }}

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig index dc71d9981..6ffbe8430 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'Update details for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %} -{% block personcontent %} +{% block content %}

    {{ block('title') }}

    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 ed3b3020b..1ff91de15 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig @@ -84,7 +84,7 @@
    {% endmacro %} -{% block personcontent %} +{% block content %}

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

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig index f04f9d702..6dcdf9dde 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig @@ -25,7 +25,7 @@ {% block layout_wvm_content %}
    - {% block personcontent %}{# block personcontent empty #}{% endblock %} + {% block content %}{# block content 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 9bdc3a479..c0cb56055 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig @@ -32,7 +32,7 @@ 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 %} +{% block content %}
    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 0c257c0ea..8769ae6da 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig @@ -6,7 +6,7 @@ ' ' ~ person.lastName }}{% endblock %} -{% block personcontent %} +{% block content %}

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

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig index 5cef17c13..e81d27448 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig @@ -5,7 +5,7 @@ {% block title %}{{ 'Person duplicate'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~ ' ' ~ person.lastName }}{% endblock %} -{% block personcontent %} +{% block content %}

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

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig index 57acaa634..a068ee5b2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig @@ -5,7 +5,7 @@ {% block title 'Remove resource'|trans %} -{% block personcontent %} +{% block content %} {{ include('@ChillMain/Util/confirmation_template.html.twig', { 'title' : 'Remove resource'|trans, diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig index 652c00ff0..cbd461c9a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig @@ -14,7 +14,7 @@ {% block title %}{{ 'edit resource'|trans|capitalize }}{% endblock %} -{% block personcontent %} +{% block content %}

    {{ 'edit resource'|trans }}

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig index 1d480614f..f01d62df2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig @@ -14,7 +14,7 @@ {{ encore_entry_link_tags('mod_pickentity_type') }} {% endblock %} -{% block personcontent %} +{% block content %}

    {{ 'List of resources'|trans }}

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig index 3171af58d..28ffbdfa3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig @@ -4,7 +4,7 @@ {% block title %}{{ 'Delete residential address'|trans }}{% endblock %} -{% block personcontent %} +{% block content %}

    {{ block('title') }}

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig index b84bd2543..8b3bee29f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig @@ -4,7 +4,7 @@ {% block title 'Edit a residential address'|trans %} -{% block personcontent %} +{% block content %}
    {% block content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig index 69e12f36d..4968cb05a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig @@ -4,7 +4,7 @@ {% block title %}{{ 'Residential addresses history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %} -{% block personcontent %} +{% block content %}

    {{ 'Residential addresses history'|trans }}

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig index dd4b1cbe0..8625d3051 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig @@ -4,7 +4,7 @@ {% block title %}{{ 'New residential address'|trans }}{% endblock %} -{% block personcontent %} +{% block content %}
    {% block content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig index a154972c0..0cd7f9f03 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig @@ -26,7 +26,7 @@ This view should receive those arguments: {% block title %}{{ 'Timeline for %name%'|trans({'%name%': person }) }}{% endblock %} -{% block personcontent %} +{% block content %}
    {{ timeline|raw }} diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig index 8282ec74a..ec205c2fb 100644 --- a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig +++ b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'Report edit' |trans }}{% endblock title %} -{% block personcontent %} +{% block content %} {{ form_start(edit_form) }} {{ form_row(edit_form.user) }} diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig index 6f0e07948..a012f8fe7 100644 --- a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig +++ b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'Report list' |trans }}{% endblock title %} -{% block personcontent %} +{% block content %}

    {{ 'Report list'|trans }}

    diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig index 5edc39414..aa232d341 100644 --- a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig +++ b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'Add a report'|trans }}{% endblock title %} -{% block personcontent %} +{% block content %} {{ form_start(form) }} {{ form_row(form.user) }} diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig index 34fefc443..d78fcd51b 100644 --- a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig +++ b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'Add a report'|trans() }}{% endblock title %} -{% block personcontent %} +{% block content %} {{ form_start(form) }} {{ form_widget(form.cFGroup) }} diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig index f2490964d..2b5ec498b 100644 --- a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig +++ b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig @@ -20,7 +20,7 @@ {% block title %}{{ 'Report view' |trans() }}{% endblock title %} -{% block personcontent %} +{% block content %}

    {{ 'Report view : %name%' | trans({ '%name%' : entity.cFGroup.getName|localize_translatable_string } ) }}

    diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig index 3b194e244..61e7c38aa 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig @@ -5,7 +5,7 @@ {% block title 'Remove task'|trans %} -{% block personcontent %} +{% block content %} {{ include('@ChillMain/Util/confirmation_template.html.twig', { diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig index 6188bd859..3ce9a3490 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig @@ -23,7 +23,7 @@ {{ 'Edit task'|trans }} {% endblock %} -{% block personcontent %} +{% block content %} {% include '@ChillTask/SingleTask/_edit.html.twig' %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig index ee236b644..0763dd8f3 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig @@ -4,7 +4,7 @@ {% block title 'Tasks for {{ name }}'|trans({ '{{ name }}' : person|chill_entity_render_string }) %} -{% block personcontent %} +{% block content %}

    {{ block('title') }}

    diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig index 226956aec..1d2967ce1 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig @@ -24,7 +24,7 @@ {% endblock %} -{% block personcontent %} +{% block content %} {% include '@ChillTask/SingleTask/_new.html.twig' %} {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig index 3ac97f0f3..39a024713 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig @@ -25,7 +25,7 @@ {% endblock %} -{% block personcontent %} +{% block content %} {% include '@ChillTask/SingleTask/_show.html.twig' %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig index 05009a2f0..d91a9007a 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig @@ -5,7 +5,7 @@ {% block title 'Remove task'|trans %} -{% block personcontent %} +{% block content %} {% include '@ChillTask/SingleTask/_transition.html.twig' %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig index 3cd2a1971..02ab79664 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig @@ -29,7 +29,7 @@ {% block filtertasks %} {% if person is not null %} - {% block personcontent %} + {% block content %}
    {% include '@ChillTask/SingleTask/Person/list.html.twig' %}