From 0f6ad3670a09f02cd88c8993917bde3f2fd57825 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 8 Jul 2021 10:56:47 +0200
Subject: [PATCH] add flashbag twig display condition + improve class
 consistency (main_search)

---
 .../Resources/views/layout.html.twig          | 54 +++++++++----------
 .../views/layoutWithVerticalMenu.html.twig    |  8 +--
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 2f80036a3..b06d7db90 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -49,33 +49,33 @@
         <div class="container-xxl">
             <div class="row justify-content-center">
                 
-            {# Flash messages ! #}
-            {% for flashMessage in app.session.flashbag.get('success') %}
-                <div class="col-8 alert alert-success flash_message">
-                    <span>
-                        {{ flashMessage|raw }}
-                    </span>
-                </div>
-            {% endfor %}
-
-            {% for flashMessage in app.session.flashbag.get('error') %}
-                <div class="col-8 alert alert-danger flash_message">
-                    <span>
-                        {{ flashMessage|raw }}
-                    </span>
-                </div>
-            {% endfor %}
-
-            {% for flashMessage in app.session.flashbag.get('notice') %}
-                <div class="col-8 alert alert-warning flash_message">
-                    <span>
-                        {{ flashMessage|raw }}
-                    </span>
-                </div>
-            {% endfor %}
-
-            {% block content %}
+                {# Flash messages ! #}
+                {% if app.session.flashbag.all()|length > 0 %}
                 <div class="col-8 mt-5 flash_message">
+                
+                    {% for flashMessage in app.session.flashbag.get('success') %}
+                        <div class="col-8 alert alert-success flash_message">
+                            <span>{{ flashMessage|raw }}</span>
+                        </div>
+                    {% endfor %}
+
+                    {% for flashMessage in app.session.flashbag.get('error') %}
+                        <div class="col-8 alert alert-danger flash_message">
+                            <span>{{ flashMessage|raw }}</span>
+                        </div>
+                    {% endfor %}
+
+                    {% for flashMessage in app.session.flashbag.get('notice') %}
+                        <div class="col-8 alert alert-warning flash_message">
+                            <span>{{ flashMessage|raw }}</span>
+                        </div>
+                    {% endfor %}
+                        
+                </div>
+                {% endif %}
+
+                {% block content %}
+                <div class="col-8 mt-5 main_search">
                     <h2>{{ 'Search'|trans }}</h2>
 
                     <form action="{{ path('chill_main_search') }}" method="get">
@@ -89,7 +89,7 @@
                 </div>
 
                 {{  chill_widget('homepage', {} ) }}
-            {% endblock %}
+                {% endblock %}
             </div>
         </div>
     {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
index b078fcf6f..21a56b027 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
@@ -29,8 +29,9 @@
             <div class="col-md-9">
                 
                 {# Flash messages ! #}
-                <div class="mt-5">
-                    <div class="row justify-content-center">
+                {% if app.session.flashbag.all()|length > 0 %}
+                <div class="row justify-content-center mt-5">
+                    
                     {% for flashMessage in app.session.flashbag.get('success') %}
                         <div class="col-8 alert alert-success flash_message">
                             <span>{{ flashMessage|raw }}</span>
@@ -48,8 +49,9 @@
                             <span>{{ flashMessage|raw }}</span>
                         </div>
                     {% endfor %}
-                    </div>
+                    
                 </div>
+                {% endif %}
 
                 {% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
                 {% endblock  %}