From 597637eceaff6f1605fc952e2053b2e833c373dc Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Fri, 31 Jul 2015 13:11:01 +0200
Subject: [PATCH] Tweaks and bug fixes

---
 .../Resources/views/Collector/ajax.html.twig             | 2 +-
 .../Resources/views/Collector/config.html.twig           | 7 +++++--
 .../Resources/views/Collector/form.html.twig             | 2 +-
 .../Resources/views/Collector/logger.html.twig           | 4 ++--
 .../Resources/views/Collector/memory.html.twig           | 2 +-
 .../Resources/views/Collector/time.html.twig             | 2 +-
 .../Resources/views/Collector/translation.html.twig      | 8 ++++----
 .../Resources/views/Collector/twig.html.twig             | 2 +-
 .../Resources/views/Icon/{ajax.svg.twig => ajax.svg}     | 0
 .../Resources/views/Icon/{close.svg.twig => close.svg}   | 0
 .../Resources/views/Icon/{form.svg.twig => form.svg}     | 0
 .../Resources/views/Icon/{logger.svg.twig => logger.svg} | 0
 .../Resources/views/Icon/{memory.svg.twig => memory.svg} | 0
 .../views/Icon/{symfony.svg.twig => symfony.svg}         | 0
 .../Resources/views/Icon/{time.svg.twig => time.svg}     | 0
 .../views/Icon/{translation.svg.twig => translation.svg} | 0
 .../Resources/views/Icon/{twig.html.twig => twig.svg}    | 0
 .../Resources/views/Profiler/base_js.html.twig           | 3 +--
 .../Resources/views/Profiler/toolbar.css.twig            | 9 ---------
 .../Resources/views/Profiler/toolbar.html.twig           | 4 ++--
 20 files changed, 19 insertions(+), 26 deletions(-)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{ajax.svg.twig => ajax.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{close.svg.twig => close.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{form.svg.twig => form.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{logger.svg.twig => logger.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{memory.svg.twig => memory.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{symfony.svg.twig => symfony.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{time.svg.twig => time.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{translation.svg.twig => translation.svg} (100%)
 rename src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/{twig.html.twig => twig.svg} (100%)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig
index fd9ee91c56..fe73b662bd 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig
@@ -2,7 +2,7 @@
 
 {% block toolbar %}
     {% set icon %}
-        {{ include('@WebProfiler/Icon/ajax.svg.twig') }}
+        {{ include('@WebProfiler/Icon/ajax.svg') }}
         <span class="sf-toolbar-value sf-toolbar-ajax-requests">0</span>
     {% endset %}
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
index 4b66f4589a..7379beaae8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -21,7 +21,7 @@
     {% set icon %}
         {% if collector.symfonyState is defined %}
             <span class="sf-toolbar-label">
-                {{ include('@WebProfiler/Icon/symfony.svg.twig') }}
+                {{ include('@WebProfiler/Icon/symfony.svg') }}
             </span>
             <span class="sf-toolbar-value">{{ collector.symfonyversion }}</span>
         {% elseif collector.applicationname %}
@@ -71,7 +71,10 @@
 
         <div class="sf-toolbar-info-piece sf-toolbar-info-php">
             <b>PHP version</b>
-            <span>{{ collector.phpversion }}</span>
+            <span>
+                {{ collector.phpversion }}
+                &nbsp; <a href="{{ path('_profiler_phpinfo') }}">View phpinfo()</a>
+            </span>
         </div>
 
         <div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 27515f7522..f226e644af 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -6,7 +6,7 @@
     {% if collector.data.nb_errors > 0 or collector.data.forms|length %}
         {% set status_color = collector.data.nb_errors ? 'red' : '' %}
         {% set icon %}
-            {{ include('@WebProfiler/Icon/form.svg.twig') }}
+            {{ include('@WebProfiler/Icon/form.svg') }}
             <span class="sf-toolbar-value">
                 {% if collector.data.nb_errors %}
                     {{ collector.data.nb_errors }}
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 6344197eff..5053657e2b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -7,7 +7,7 @@
         {% set icon %}
             {% set status_color = collector.counterrors ? 'red' : collector.countdeprecations ? 'yellow' : '' %}
             {% set error_count = collector.counterrors + collector.countdeprecations + collector.countscreams %}
-            {{ include('@WebProfiler/Icon/logger.svg.twig') }}
+            {{ include('@WebProfiler/Icon/logger.svg') }}
             <span class="sf-toolbar-value">{{ error_count }}</span>
         {% endset %}
 
@@ -80,7 +80,7 @@
         </tr>
     </table>
 
-{% if collector.logs %}
+    {% if collector.logs %}
         <table>
             <tr>
                 <th>#</th>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
index 5dd2269747..702b4df365 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
@@ -3,7 +3,7 @@
 {% block toolbar %}
     {% set icon %}
         {% set status_color = (collector.memory / 1024 / 1024) > 50 ? 'yellow' : '' %}
-        {{ include('@WebProfiler/Icon/memory.svg.twig') }}
+        {{ include('@WebProfiler/Icon/memory.svg') }}
         <span class="sf-toolbar-value">{{ '%.1f'|format(collector.memory / 1024 / 1024) }}</span>
         <span class="sf-toolbar-label">MB</span>
     {% endset %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index 7d341a09d3..39f8f62abd 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -21,7 +21,7 @@
     {% set status_color = collector.events|length and collector.duration > 1000 ? 'yellow' : '' %}
 
     {% set icon %}
-        {{ include('@WebProfiler/Icon/time.svg.twig') }}
+        {{ include('@WebProfiler/Icon/time.svg') }}
         <span class="sf-toolbar-value">{{ total_time }}</span>
         <span class="sf-toolbar-label">ms</span>
     {% endset %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
index 7eefbde73c..3d75c46768 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
@@ -5,7 +5,7 @@
 {% block toolbar %}
     {% if collector.messages|length %}
         {% set icon %}
-            {{ include('@WebProfiler/Icon/translation.svg.twig') }}
+            {{ include('@WebProfiler/Icon/translation.svg') }}
             {% set status_color = collector.countMissings ? 'red' : collector.countFallbacks ? 'yellow' : '' %}
             {% set error_count = collector.countMissings + collector.countFallbacks %}
             <span class="sf-toolbar-value">{{ error_count ?: collector.countdefines }}</span>
@@ -15,20 +15,20 @@
             <div class="sf-toolbar-info-piece">
                 <b>Missing messages</b>
                 <span class="sf-toolbar-status sf-toolbar-status-{{ collector.countMissings ? 'red' }}">
-                    {{ collector.countMissings|default(0) }}
+                    {{ collector.countMissings }}
                 </span>
             </div>
 
             <div class="sf-toolbar-info-piece">
                 <b>Fallback messages</b>
                 <span class="sf-toolbar-status sf-toolbar-status-{{ collector.countFallbacks ? 'yellow' }}">
-                    {{ collector.countFallbacks|default(0) }}
+                    {{ collector.countFallbacks }}
                 </span>
             </div>
 
             <div class="sf-toolbar-info-piece">
                 <b>Defined messages</b>
-                <span class="sf-toolbar-status">{{ collector.countdefines|default(0) }}</span>
+                <span class="sf-toolbar-status">{{ collector.countdefines }}</span>
             </div>
         {% endset %}
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
index 4f758a1d12..95713b93db 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
@@ -3,7 +3,7 @@
 {% block toolbar %}
     {% set time = collector.templatecount ? '%0.0f'|format(collector.time) : 'n/a' %}
     {% set icon %}
-        {{ include('@WebProfiler/Icon/twig.html.twig') }}
+        {{ include('@WebProfiler/Icon/twig.svg') }}
         <span class="sf-toolbar-value">{{ time }}</span>
         <span class="sf-toolbar-label">ms</span>
     {% endset %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/ajax.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/close.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/symfony.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/translation.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.svg
similarity index 100%
rename from src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.html.twig
rename to src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.svg
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index 6c8826dabe..2b1eeff3c0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -86,6 +86,7 @@
                     return;
                 }
 
+                var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax');
                 var tbodies = document.querySelectorAll('.sf-toolbar-ajax-request-list');
                 var state = 'ok';
                 if (tbodies.length) {
@@ -169,7 +170,6 @@
                             infoSpan.textContent = text;
                         }
                     } else {
-                        var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax');
                         ajaxToolbarPanel.style.display = 'none';
                     }
                 }
@@ -179,7 +179,6 @@
                 var className = 'sf-toolbar-ajax-requests sf-toolbar-value';
                 requestCounter[0].className = className;
 
-                var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax');
                 if (state == 'error') {
                     Sfjs.addClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
                 } else {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index 1cd7fd541b..5b2e4f6666 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -85,10 +85,6 @@
     color: #AAA;
     font-size: 12px;
 }
-/* TODO: remove it when Twig uses SVG icons */
-.sf-toolbar-block-twig img {
-    opacity: .8;
-}
 
 .sf-toolbar-block .sf-toolbar-info {
     border-collapse: collapse;
@@ -316,11 +312,6 @@
     50% { background: #444; }
     100% { background: #222; }
 }
-@-o-keyframes sf-blink {
-    0% { background: #222; }
-    50% { background: #444; }
-    100% { background: #222; }
-}
 @keyframes sf-blink {
     0% { background: #222; }
     50% { background: #444; }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
index e141a0df11..e4fea4b00b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
@@ -15,7 +15,7 @@
 
             Sfjs.setPreference('toolbar/displayState', 'block');
         ">
-            {{ include('@WebProfiler/Icon/symfony.svg.twig') }}
+            {{ include('@WebProfiler/Icon/symfony.svg') }}
         </a>
     </div>
     <style>
@@ -44,7 +44,7 @@
             document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'block';
             Sfjs.setPreference('toolbar/displayState', 'none');
         ">
-            {{ include('@WebProfiler/Icon/close.svg.twig') }}
+            {{ include('@WebProfiler/Icon/close.svg') }}
         </a>
     {% endif %}
 </div>