merged branch jalliot/profiler-logs (PR symfony#4902)

fabpot · fabpot · commit 5fb72144da34 · 2012-07-14T00:00:47.000+02:00
Commits ------- 77b4349 [WebProfiler] Improved logger panel Discussion ---------- [WebProfiler] Improved logger panel Bug fix: no Feature addition: yes Backwards compatibility break: no Symfony2 tests pass: yes * Add missing priority levels from filter * Display priority level in front of each log entry * Add a yellow background for warnings and use the red one for errors and above (previously only errors) * Display `No logs available for this priority.` when filter is too restrictive
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
@@ -309,6 +309,11 @@ ul.alt li.error {
     margin-bottom: 1px;
 }
 
+ul.alt li.warning {
+    background-color: #ffcc00;
+    margin-bottom: 1px;
+}
+
 td.main, td.menu {
     text-align: left;
     margin: 0;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -41,7 +41,7 @@
                     <input type="hidden" name="panel" value="logger" />
                     <label for="priority">Priority</label>
                     <select id="priority" name="priority" onchange="document.getElementById('priority-form').submit(); ">
-                        {% for value, text in { 100: 'DEBUG', 200: 'INFO', 300: 'WARNING', 400: 'ERROR', 500: 'CRITICAL', 550: 'ALERT' } %}
+                        {% for value, text in { 100: 'DEBUG', 200: 'INFO', 250: 'NOTICE', 300: 'WARNING', 400: 'ERROR', 500: 'CRITICAL', 550: 'ALERT', 600: 'EMERGENCY' } %}
                         <option value="{{ value }}"{{ value == priority ? ' selected' : '' }}>{{ text }}</option>
                         {% endfor %}
                     </select>
@@ -56,15 +56,17 @@
     {% if collector.logs %}
         <ul class="alt">
             {% for log in collector.logs if log.priority >= priority %}
-                <li class="{{ cycle(['odd', 'even'], loop.index) }}{% if 'ERR' == log.priorityName or 'ERROR' == log.priorityName %} error{% endif %}">
-                    {{ log.message }}
+                <li class="{{ cycle(['odd', 'even'], loop.index) }}{% if log.priority >= 400 %} error{% elseif log.priority >= 300 %} warning{% endif %}">
+                    {{ log.priorityName }} - {{ log.message }}
                     {% if log.context is defined and log.context is not empty %}
                         <br />
                         <small>
                             <strong>Context</strong>: {{ log.context|yaml_encode }}
                         </small>
                     {% endif %}
                 </li>
+            {% else %}
+                <li><em>No logs available for this priority.</em></li>
             {% endfor %}
         </ul>
     {% else %}
