change block personcontent to content more consistent with other templates and less need for if-statements

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 %}
 
    <table>
 

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
 

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,

src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig

@@ -20,7 +20,7 @@
 
 {% block title  'Update activity'|trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="activity-edit">
 
     <div id="activity"></div> {# <=== vue component #}

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 %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig

@@ -4,7 +4,7 @@
 
 {% block title 'Activity creation' |trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="activity-new">
 
     <div id="activity"></div> {# <=== vue component #}

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 %}

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 -%}
 <div class="activity-show">
     {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 </div>
-{% endblock personcontent %}
+{% endblock %}
 
 {% block block_post_menu %}
     <div class="post-menu pt-4">

src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Activity configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig

@@ -6,7 +6,7 @@
 
 {% block layout_wvm_content %}
 	{% block admin_content %}
-		<!-- block personcontent empty -->
+		<!-- block content empty -->
 		<h1>{{ 'Aside activity configuration'|trans }}</h1>
 	{% endblock %}
 {% endblock  %}

src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'CustomFields configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}

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();
     }
 
-    /**
+    public function getPerson(): Person
-     * Get person.
-     *
-     * @return \Chill\MainBundle\Entity\Person
-     */
-    public function getPerson()
     {
         return $this->person;
     }

src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Documents configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}

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 %}
     <h1>{{ 'Edit Document' | trans }}</h1>
 
     {{ form_errors(form) }}

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 %}
 
 <div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>

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 %}
 	<h1>{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
 
 	{{ form_errors(form) }}

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 %}
     <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
 
     {{ mm.mimeIcon(document.object.type) }}

src/Bundle/ChillEventBundle/Resources/views/Admin/layout.html.twig

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Events configuration' |trans }}</h1>
     {% endblock %}
 {% endblock  %}

src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig

@@ -21,7 +21,7 @@
 
 {% block title %}{{ 'Events participation' |trans }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
 <h2>{{ 'Events participation' |trans }}</h2>
 
 <table class="table table-striped table-bordered mt-3 events">

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',
     {

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 %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}

src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig

@@ -88,7 +88,7 @@
 
 {% import _self as m %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 {% if familyMembers|length == 0 %}

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 %}
 <h1>{{ title }}</h1>
 
 {{ form_start(form) }}

src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig

@@ -6,7 +6,7 @@
 
 {% block title title %}
 
-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>
 
 <dl class="chill_view_data">

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;

src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <div class="container-fluid">
             <div class="col-10 push-1">
                 <h2>{{ 'Welcome to the admin section !'|trans }}</h2>

src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
         <h1>{{ 'Permissions management of your chill installation' |trans }}</h1>
     {% endblock %}
 {% endblock  %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig

@@ -18,7 +18,7 @@
 {% block title page_title  %}
 
 
-{% block personcontent %}
+{% block content %}
     
 <h1>{{ page_title }}</h1>
 

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 %}
 <div class="person-accompanyingperiods">
 
     <h1>{{ 'Accompanying period list'|trans }}</h1>

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 %}
     
     <h1>{{ 'Re-Open a period'|trans }}</h1>
     

src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig

@@ -20,7 +20,7 @@
 
 {% block title 'Edit an address'|trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-edit">
 
     {% block content %}

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 %}
 <div class="person-address">
 
     <h1>{{ 'Addresses history'|trans }}</h1>

src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig

@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'New address'|trans }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-new">
 
     {% block content %}

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 %}

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 %}

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 %}
             <li>

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 %}
         <h1>{{ ('crud.'~crud_name~'.title_new')|trans({'%person%': person|chill_entity_render_string }) }}</h1>

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 %}
         <h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%person%': person|chill_entity_render_string }) }}</h1>

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 %}
 <div class="person-edit">
 
     <h1>{{ block('title') }}</h1>

src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig

@@ -84,7 +84,7 @@
     </div>
 {% endmacro %}
 
-{% block personcontent %}
+{% block content %}
 <div class="person-household">
     <h1>{{ 'household.Household history'|trans }}</h1>
 

src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig

@@ -25,7 +25,7 @@
 {% block layout_wvm_content %}
     <div class="row justify-content-center">
         <div class="col-md-10 col-xxl">
-            {% block personcontent %}{# block personcontent empty #}{% endblock %}
+            {% block content %}{# block content empty #}{% endblock %}
         </div>
     </div>
 {% endblock %}

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 %}
 <div class="person-view">
 
     <div class="row">

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig

@@ -6,7 +6,7 @@
 ' ' ~ person.lastName }}{% endblock %}
 
 
-{% block personcontent %}
+{% block content %}
 <div class="person-duplicate">
             
             <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>

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 %}
 <div class="person-duplicate">
                         
             <h1>{{ title|default('Person duplicate')|trans }}</h1>

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,

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig

@@ -14,7 +14,7 @@
 
 {% block title %}{{ 'edit resource'|trans|capitalize }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
 <h1 style="margin-bottom: 2rem;">{{ 'edit resource'|trans }}</h1>
 

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 %}
 
 <h1>{{ 'List of resources'|trans }}</h1>
 

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/delete.html.twig

@@ -4,7 +4,7 @@
 
 {% block title %}{{ 'Delete residential address'|trans }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-new">
 
     <h1>{{ block('title') }}</h1>

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig

@@ -4,7 +4,7 @@
 
 {% block title 'Edit a residential address'|trans %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-edit">
 
     {% block content %}

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 %}
 <div class="person-address">
 
     <h1>{{ 'Residential addresses history'|trans }}</h1>

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig

@@ -4,7 +4,7 @@
 
 {% block title %}{{ 'New residential address'|trans }}{% endblock %}
 
-{% block personcontent %}
+{% block content %}
 <div class="address-new">
 
     {% block content %}

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 %}
 <div class="timeline">
             
             {{ timeline|raw }}

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) }}

src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig

@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Report list' |trans }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
     
     <h1>{{ 'Report list'|trans }}</h1>
     

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) }}

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) }}

src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig

@@ -20,7 +20,7 @@
 
 {% block title %}{{ 'Report view' |trans() }}{% endblock title %}
 
-{% block personcontent %}
+{% block content %}
     
     <h1>{{ 'Report view : %name%' | trans({ '%name%' : entity.cFGroup.getName|localize_translatable_string } ) }}</h1>
 

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',
     {

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' %}
 

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 %}
     <div class="col-md-10 col-xxl">
 
         <h1>{{ block('title') }}</h1>

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 %}

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' %}
 

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' %}
 

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig

@@ -29,7 +29,7 @@
 
 {% block filtertasks %}
 	{% if person is not null %}
-		{% block personcontent %}
+		{% block content %}
 			<div class="tasks">
 				{% include '@ChillTask/SingleTask/Person/list.html.twig' %}