diff --git a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
index e7a8245fb3..2ce0899080 100644
--- a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
+++ b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig
@@ -5,17 +5,14 @@
{% if dumps_count %}
{% set icon %}
-
- {{ dumps_count }}
+
+ {{ dumps_count }}
{% endset %}
{% set text %}
-
- dump()
-
{% for dump in collector.getDumps('html') %}
- in
+
{% if dump.file %}
{% set link = dump.file|file_link(dump.line) %}
{% if link %}
@@ -26,14 +23,15 @@
{% else %}
{{ dump.name }}
{% endif %}
- line {{ dump.line }}:
+
+ line {{ dump.line }}
{{ dump.data|raw }}
{% endfor %}
{% endset %}
- {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': true } %}
+ {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { 'link': true }) }}
{% endif %}
{% endblock %}
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 979ef56d31..27515f7522 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -4,8 +4,9 @@
{% block toolbar %}
{% 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') }}
{% if collector.data.nb_errors %}
{{ collector.data.nb_errors }}
@@ -15,7 +16,18 @@
{% endset %}
- {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: collector.data.nb_errors ? 'red' : '' }) }}
+ {% set text %}
+
+ Number of forms
+ {{ collector.data.forms|length }}
+
+
+ Number of errors
+ {{ collector.data.nb_errors }}
+
+ {% endset %}
+
+ {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
{% endif %}
{% endblock %}
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 10858a531b..6344197eff 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -5,31 +5,29 @@
{% block toolbar %}
{% if collector.counterrors or collector.countdeprecations or collector.countscreams %}
{% 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') }}
{{ error_count }}
{% endset %}
+
{% set text %}
- {% if collector.counterrors %}
-
- Errors
- {{ collector.counterrors }}
-
- {% endif %}
- {% if collector.countdeprecations %}
-
- Deprecated Calls
- {{ collector.countdeprecations }}
-
- {% endif %}
- {% if collector.countscreams %}
-
- Silenced Errors
- {{ collector.countscreams }}
-
- {% endif %}
+
+ Errors
+ {{ collector.counterrors|default(0) }}
+
+
+
+ Deprecated Calls
+ {{ collector.countdeprecations|default(0) }}
+
+
+
+ Silenced Errors
+ {{ collector.countscreams|default(0) }}
+
{% endset %}
+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
{% endif %}
{% endblock %}
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 af68792e1b..b101596843 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
@@ -8,6 +8,7 @@
MB
{% endset %}
+
{% set text %}
Peak memory usage
@@ -16,8 +17,9 @@
PHP memory limit
- {{ collector.memoryLimit == -1 ? '∞' : '%.1f'|format(collector.memoryLimit / 1024 / 1024)|escape }} MB
+ {{ collector.memoryLimit == -1 ? '∞' : '%.0f'|format(collector.memoryLimit / 1024 / 1024)|escape }} MB
{% endset %}
+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: status_color }) }}
{% endblock %}
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 4b743f9902..558a155bdb 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -16,18 +16,26 @@
{% endif %}
{% block toolbar %}
- {% set duration = collector.events|length ? '%.0f'|format(collector.duration) : 'n/a' %}
+ {% set total_time = collector.events|length ? '%.0f'|format(collector.duration) : 'n/a' %}
+ {% set initialization_time = collector.events|length ? '%.0f'|format(collector.inittime) : 'n/a' %}
{% set status_color = collector.events|length ? collector.duration > 1000 ? 'yellow' : '' %}
+
{% set icon %}
-
{{ duration }}
+
{{ total_time }}
ms
{% endset %}
+
{% set text %}
Total time
- {{ duration }} ms
+ {{ total_time }} ms
+
+
+ Initialization time
+ {{ initialization_time }} ms
{% endset %}
+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
{% endblock %}
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 20a07327ca..293180757f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
@@ -9,6 +9,7 @@
ms
{% endset %}
+
{% set text %}
Render Time
@@ -27,6 +28,7 @@
{{ collector.macrocount }}
{% endset %}
+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
{% endblock %}
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 c6b9fa3e4d..de56ad35db 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -81,6 +81,7 @@
margin-right: 0px;
white-space: nowrap;
}
+.sf-toolbar-block a,
.sf-toolbar-block a:hover {
text-decoration: none;
}
@@ -371,6 +372,24 @@
100% { color: black; }
}
+.sf-toolbar-block-dump pre.sf-dump {
+ background-color: #222;
+ border-color: #777;
+ border-radius: 0;
+ margin: 6px 0 12px 0;
+ width: 200px;
+}
+.sf-toolbar-block-dump pre.sf-dump:last-child {
+ margin-bottom: 0;
+}
+.sf-toolbar-block-dump .sf-toolbar-info-piece .sf-toolbar-file-line {
+ color: #AAA;
+ margin-left: 4px;
+}
+.sf-toolbar-block-dump .sf-toolbar-info img {
+ display: none;
+}
+
/***** Override the setting when the toolbar is on the top *****/
{% if position == 'top' %}
.sf-minitoolbar {