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 fb5b8b7dadaff..d2616f2bf0630 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -37,7 +37,7 @@
{% endblock %}
-{% block head %}
+{% block stylesheets %}
{{ parent() }}
{% endblock %}
-{% block panel %}
-
Forms
-
- {% if collector.data.forms|length %}
-
-
-
- {% for formName, formData in collector.data.forms %}
- {{ _self.form_tree_details(formName, formData, collector.data.forms_by_hash, loop.first) }}
- {% endfor %}
-
- {% else %}
-
-
No forms were submitted for this request.
-
- {% endif %}
+{% block javascripts %}
+ {{ parent() }}
+{% endblock %}
- e.stopPropagation();
+{% block panel %}
+ Forms
- return false;
- });
- };
+ {% if collector.data.forms|length %}
+
- tabTarget.initTabs(document.querySelectorAll('.tree .tree-inner'));
- toggler.initButtons(document.querySelectorAll('.toggle-button'));
-
+
+ {% for formName, formData in collector.data.forms %}
+ {{ _self.form_tree_details(formName, formData, collector.data.forms_by_hash, loop.first) }}
+ {% endfor %}
+
+ {% else %}
+
+
No forms were submitted for this request.
+
+ {% endif %}
{% endblock %}
{% macro form_tree_entry(name, data, is_root) %}
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 c2fc5dd323ee2..8055016e04259 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -1,6 +1,6 @@
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
-{% block head %}
+{% block stylesheets %}
{{ parent() }}
{% endblock %}
+{% block javascripts %}
+
+{% endblock %}
+
{% block toolbar %}
{% if collector.counterrors or collector.countdeprecations or collector.countwarnings %}
{% set icon %}
@@ -405,8 +490,6 @@
There are no log messages.
-
-
{% endif %}
{% set compilerLogTotal = collector.compilerLogs|reduce((total, logs) => total + logs|length, 0) %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
index 11b5ae07f53b1..386438b8256ff 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -1,6 +1,6 @@
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
-{% block head %}
+{% block stylesheets %}
{{ parent() }}
{% endblock %}
+{% block javascripts %}
+ {{ parent() }}
+
+
+{% endblock %}
+
{% block toolbar %}
{% set events = collector.events %}
@@ -262,8 +292,6 @@
{{ _self.render_email_details(collector, transport, event.message, event.isQueued, show_transport_name) }}
{% endfor %}
-
-
{% else %}
{% set event = (collector.events.events(transport)|first) %}
{{ _self.render_email_details(collector, transport, event.message, event.isQueued, show_transport_name) }}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
index c037c07ec94bc..00b3dba37a0da 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
@@ -12,9 +12,14 @@
{% block head %}
-
+ {% block stylesheets %}
+
+ {% endblock %}
+
+ {% block javascripts %}
+ {% endblock %}
{% endblock %}
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 4b4a114045483..e501ebe58bc5d 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
@@ -1,958 +1,212 @@
{# This file is partially duplicated in src/Symfony/Component/ErrorHandler/Resources/assets/js/exception.js.
If you make any change in this file, verify the same change is needed in the other file. #}
-
+ if (undefined !== userTimezoneName) {
+ const existingTitle = timeElement.getAttribute('title');
+ const newTitle = null === existingTitle
+ ? `Date/times shown in your timezone: ${userTimezoneName}`
+ : existingTitle + ` (date/times shown in your timezone: ${userTimezoneName})`;
+ timeElement.setAttribute('title', newTitle);
+ }
+ });
+ }
+ }
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
index e0f31ba307abc..9d06ed835ad91 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -9,13 +9,673 @@
}) }}
-{{ include('@WebProfiler/Profiler/base_js.html.twig') }}
-
-