From 92a041c07447f19611b610e327835ed7ae85ff32 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Mon, 26 Mar 2018 16:17:25 +0200
Subject: [PATCH] Updated the Messenger profiler panel

---
 .../Resources/config/messenger.xml            |  2 +-
 .../views/Collector/messages.html.twig        | 60 -------------------
 .../views/Collector/messenger.html.twig       | 60 +++++++++++++++++++
 .../Resources/views/Icon/messages.svg         | 10 ----
 .../Resources/views/Icon/messenger.svg        |  1 +
 5 files changed, 62 insertions(+), 71 deletions(-)
 delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messages.html.twig
 create mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
 delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messages.svg
 create mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messenger.svg

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
index 79e9a3980b5e..49bbcfff6804 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
@@ -53,7 +53,7 @@
         </service>
 
         <service id="data_collector.messenger" class="Symfony\Bundle\FrameworkBundle\DataCollector\MessengerDataCollector">
-            <tag name="data_collector" template="@WebProfiler/Collector/messages.html.twig" id="messages" priority="100" />
+            <tag name="data_collector" template="@WebProfiler/Collector/messenger.html.twig" id="messenger" priority="100" />
             <tag name="message_bus_middleware" />
         </service>
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messages.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messages.html.twig
deleted file mode 100644
index f6be519f1737..000000000000
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messages.html.twig
+++ /dev/null
@@ -1,60 +0,0 @@
-{% extends '@WebProfiler/Profiler/layout.html.twig' %}
-
-{% import _self as helper %}
-
-{% block menu %}
-<span class="label">
-    <span class="icon">{{ include('@WebProfiler/Icon/messages.svg') }}</span>
-    <strong>Messages</strong>
-
-    {% if collector.messages|length > 0 %}
-        <span class="count">
-            <span>{{ collector.messages|length }}</span>
-        </span>
-    {% endif %}
-</span>
-{% endblock %}
-
-{% block panel %}
-    <h2>Messages</h2>
-
-    {% if collector.messages is empty %}
-    <p>No messages</p>
-    {% else %}
-    <table>
-        <thead>
-        <tr>
-            <th>Message</th>
-            <th>Result</th>
-        </tr>
-        </thead>
-        <tbody>
-        {% for message in collector.messages %}
-        <tr>
-            <td>{{ message.message.type }}</td>
-            <td>
-                {% if message.result.type is defined %}
-                    {{ message.result.type }}
-                {% endif %}
-
-                {% if message.exception.type is defined %}
-                    {{ message.exception.type }}
-                {% endif %}
-            </td>
-        </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-    {% endif %}
-{% endblock %}
-
-{% block toolbar %}
-    {% set color_code = 'normal' %}
-    {% set message_count = 0 %}
-    {% set icon %}
-        {{ include('@WebProfiler/Icon/messages.svg') }}
-        <span class="sf-toolbar-value">{{ message_count }}</span>
-    {% endset %}
-
-    {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: 'messages', status: color_code }) }}
-{% endblock %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
new file mode 100644
index 000000000000..e16f5913e6cc
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
@@ -0,0 +1,60 @@
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
+
+{% import _self as helper %}
+
+{% block toolbar %}
+    {% if collector.messages|length > 0 %}
+        {% set icon %}
+            {{ include('@WebProfiler/Icon/messenger.svg') }}
+            <span class="sf-toolbar-value">{{ collector.messages|length }}</span>
+        {% endset %}
+
+        {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: 'messenger' }) }}
+    {% endif %}
+{% endblock %}
+
+{% block menu %}
+<span class="label">
+    <span class="icon">{{ include('@WebProfiler/Icon/messenger.svg') }}</span>
+    <strong>Messages</strong>
+
+    <span class="count">
+        <span>{{ collector.messages|length }}</span>
+    </span>
+</span>
+{% endblock %}
+
+{% block panel %}
+    <h2>Messages</h2>
+
+    {% if collector.messages is empty %}
+        <div class="empty">
+            <p>No messages have been collected.</p>
+        </div>
+    {% else %}
+        <table>
+            <thead>
+            <tr>
+                <th>Message</th>
+                <th>Result</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for message in collector.messages %}
+            <tr>
+                <td>{{ message.message.type }}</td>
+                <td>
+                    {% if message.result.type is defined %}
+                        {{ message.result.type }}
+                    {% endif %}
+
+                    {% if message.exception.type is defined %}
+                        {{ message.exception.type }}
+                    {% endif %}
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+{% endblock %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messages.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messages.svg
deleted file mode 100644
index 2fd49b55fe6d..000000000000
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messages.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="24" height="24" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Symfony-Icon" fill="#AAAAAA" fill-rule="nonzero">
-            <g id="messages" transform="translate(1.000000, 4.000000)">
-                <polygon id="Shape" points="7 2.56157635 15.8538682 2.56157635 15.8538682 10.9293924 17.4441261 10.9293924 18.6475645 13 19.8510029 10.9293924 22 10.9293924 22 0 7 0"></polygon>
-                <path d="M3.18051576,16 L4.53309456,13.7181965 L15,13.7181965 L15,3 L0,3 L0,13.7181965 L1.82793696,13.7181965 L3.18051576,16 Z M2.75071633,6.14009662 L9.11174785,6.14009662 L9.11174785,6.64251208 L2.75071633,6.64251208 L2.75071633,6.14009662 Z M2.75071633,8.27536232 L12.5071633,8.27536232 L12.5071633,8.77777778 L2.75071633,8.77777778 L2.75071633,8.27536232 Z M2.75071633,10.410628 L12.5071633,10.410628 L12.5071633,10.9130435 L2.75071633,10.9130435 L2.75071633,10.410628 Z" id="Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messenger.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messenger.svg
new file mode 100644
index 000000000000..601797add105
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/messenger.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="24" height="24" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"><path fill="#aaa" d="M16 9a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-4a2 2 0 0 0-2 2h-3V4a1 1 0 0 0-1-1H8a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2h3v6H8a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2h3v9a1 1 0 0 0 2 0v-5h3a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-4a2 2 0 0 0-2 2h-3V9zm2.52-2.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1 0-1zm0 1.63h3a.5.5 0 0 1 .5.5.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5.5.5 0 0 1 .5-.52zm-13-2.82h-3a.5.5 0 0 1-.5-.5.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5.5.5 0 0 1-.54.48zm0-1.62h-3a.5.5 0 0 1-.5-.5.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5.5.5 0 0 1-.54.48zm0 9.62h-3a.5.5 0 0 1-.5-.5.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5.5.5 0 0 1-.54.48zm0-1.62h-3a.5.5 0 0 1-.5-.5.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5.5.5 0 0 1-.54.48zm13 2.81h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1 0-1zm0 1.63h3a.5.5 0 0 1 .5.5.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5.5.5 0 0 1 .5-.52z"/></svg>