From 5fdc650dfe928fb7ccc65226da336a7d5c13dfff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Haso=C5=88?= <martin.hason@gmail.com>
Date: Wed, 7 Jan 2015 16:59:26 +0100
Subject: [PATCH] [WebProfilerBundle] Improved page for logs

---
 .../Bridge/Monolog/Handler/DebugHandler.php   |  1 +
 .../views/Collector/logger.html.twig          | 26 +++++++++++++------
 .../views/Profiler/profiler.css.twig          |  8 +++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php b/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php
index c959a5a94fcb..f1046c96a6ad 100644
--- a/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php
@@ -35,6 +35,7 @@ public function getLogs()
                 'priority' => $record['level'],
                 'priorityName' => $record['level_name'],
                 'context' => $record['context'],
+                'channel' => isset($record['channel']) ? $record['channel'] : '',
             );
         }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index 32a63b4b4ca5..b27d783ded3c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -87,20 +87,30 @@
     </table>
 
     {% if collector.logs %}
-        <ul class="alt">
+        <table>
+            <tr>
+                <th>#</th>
+                <th>Priority</th>
+                <th>Channel</th>
+                <th>Message and context</th>
+            </tr>
+
             {% set log_loop_index = 0 %}
             {% for log in collector.logs %}
                 {% set is_deprecation = log.context.level is defined and log.context.type is defined and (constant('E_DEPRECATED') == log.context.type or constant('E_USER_DEPRECATED') == log.context.type) %}
                 {% if priority == '-100' ? is_deprecation : log.priority >= priority %}
                     {% set log_loop_index = log_loop_index + 1 %}
-                    <li class="{{ cycle(['odd', 'even'], log_loop_index) }}{% if log.context.scream is defined %} scream{% elseif log.priority >= 400 %} error{% elseif log.priority >= 300 or is_deprecation %} warning{% endif %}">
-                        {{ logger.display_message(loop.index, log, is_deprecation) }}
-                    </li>
+                    <tr class="{{ cycle(['odd', 'even'], log_loop_index) }}{% if log.context.scream is defined %} scream{% elseif log.priority >= 400 %} error{% elseif log.priority >= 300 or is_deprecation %} warning{% endif %}">
+                        <td>{{ log_loop_index }}</td>
+                        <td>{{ is_deprecation ? 'DEPRECATION' : log.priorityName }}</td>
+                        <td>{{ log.channel is defined ? log.channel }}</td>
+                        <td>{{ logger.display_message(loop.index, log, is_deprecation) }}</td>
+                    </tr>
                 {% endif %}
             {% else %}
-                <li><em>No logs available for this priority.</em></li>
+                <tr><td colspan="4"><em>No logs available for {{ priority }} priority.</em></td></tr>
             {% endfor %}
-        </ul>
+        </table>
     {% else %}
         <p>
             <em>No logs available.</em>
@@ -114,7 +124,7 @@
         {% set stack = log.context.stack|default([]) %}
         {% set id = 'sf-call-stack-' ~ log_index %}
 
-        DEPRECATED - {{ log.message }}
+        {{ log.message }}
 
         {% if stack %}
             <a href="#" onclick="Sfjs.toggle('{{ id }}', document.getElementById('{{ id }}-on'), document.getElementById('{{ id }}-off')); return false;">
@@ -144,7 +154,7 @@
             {% endif %}
         {% endfor %}
     {% else %}
-        {{ log.priorityName }} - {{ log.message }}
+        {{ log.message }}
         {% if log.context is defined and log.context is not empty %}
             <br />
             <small>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 4972a0f75bf8..4d84a6931cce 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -179,7 +179,7 @@ pre, code {
     width: 250px;
     margin-left: -100%;
 }
-#collector-content table td {
+table td {
     background-color: white;
 }
 h1 {
@@ -273,15 +273,15 @@ ul.alt li {
 ul.alt li.even {
     background: #f1f7e2;
 }
-ul.alt li.error {
+ul.alt li.error, tr.error td {
     background-color: #f66;
     margin-bottom: 1px;
 }
-ul.alt li.warning {
+ul.alt li.warning, tr.warning td {
     background-color: #ffcc00;
     margin-bottom: 1px;
 }
-ul.alt li.scream, ul.alt li.scream strong {
+ul.alt li.scream, ul.alt li.scream strong, tr.scream td, tr.scream strong {
     color: gray;
 }
 ul.sf-call-stack li {