Household summary: improve Address display when there is no address

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -16,32 +16,29 @@
 
     {% set address = household.currentAddress %}
 
+    <div class="row household-resume">
+        <div class="item-bloc col-5 col-address">
+            <h2>{{ 'Address'|trans }}</h2>
+
             {% if address is empty %}
                 <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
             {% else %}
-        <div class="row household-resume">
-
-            <div class="item-bloc col-5 col-address">
-
-                <h2>{{ 'Address'|trans }}</h2>
-
                 {{ address|chill_entity_render_box({'multiline': true}) }}
+            {% endif %}
 
             <ul class="list-inline text-right mt-2">
                 <li class="list-inline-item">
                     {# include vue_address component #}
                     {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                         targetEntity: { name: 'household', id: household.id },
-                            backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+                        backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
+                        forceRedirect: true,
                         mode: 'new',
                         buttonSize: 'btn-sm',
                         buttonText: 'Move household',
                         modalTitle: 'Move household',
                         buttonDisplayText: false,
                     } %}
-                        {#
-                            openPanesInModal: false
-                        #}
                 </li>
                 <li class="list-inline-item">
                     <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
@@ -50,8 +47,8 @@
                     </a>
                 </li>
             </ul>
-
         </div>
+        {% if address is not empty %}
             <div class="item-bloc col-7 col-comment">
                 {% if form is null %}
 
@@ -106,10 +103,9 @@
                     {{ form_end(form) }}
 
                 {% endif %}
-
-            </div>
             </div>
         {% endif %}
+    </div>
 
     <h2 class="my-5">{{ 'household.Household members'|trans }}</h2>