Merge pull request #6732 from akatsoulas/flickering-banner

akatsoulas · web-flow · commit 4fdb9b59e7a8 · 2025-06-27T15:08:57.000+02:00
Do not render an empty banner
diff --git a/kitsune/sumo/jinja2/includes/common_macros.html b/kitsune/sumo/jinja2/includes/common_macros.html
@@ -894,14 +894,17 @@ <h4 class="mzp-c-menu-item-title">{{ _('Inbox') }}</h4>
   {% endcall %}
 #}
 {% macro announcement_bar(id, level, close_memory="", close_type="") -%}
-<div id="announce-{{ id }}" class="mzp-c-notification-bar mzp-t-{{ level }}"
-  {% if close_memory %}data-close-initial="hidden"{% endif %}>
-  <button class="mzp-c-notification-bar-button close-button" data-close-id="announce-{{ id }}" type="button"
-    {% if close_memory %}data-close-memory="{{ close_memory }}" {% endif %}
-    {% if close_type %}data-close-type="{{ close_type }}" {% endif %}>
-  </button>
-  <p>{{ caller() }}</p>
-</div>
+  {% set content = caller() %}
+  {% if content %}
+    <div id="announce-{{ id }}" class="mzp-c-notification-bar mzp-t-{{ level }}"
+      {% if close_memory %}data-close-initial="hidden"{% endif %}>
+      <button class="mzp-c-notification-bar-button close-button" data-close-id="announce-{{ id }}" type="button"
+        {% if close_memory %}data-close-memory="{{ close_memory }}" {% endif %}
+        {% if close_type %}data-close-type="{{ close_type }}" {% endif %}>
+      </button>
+      <p>{{ content }}</p>
+    </div>
+  {% endif %}
 {% endmacro %}
 
 {% macro favicon() %}
