From 2de494f60bef82490a192bf81d10156269ac980e Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Tue, 21 Mar 2017 11:01:33 +0100 Subject: [PATCH] [WebProfilerBundle] Drop dead code --- .../Controller/ProfilerController.php | 2 +- .../views/Profiler/toolbar.html.twig | 64 +++++++++---------- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index 4e6f15bd01ee5..67767b0a78d7f 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -43,7 +43,7 @@ class ProfilerController * @param array $templates The templates * @param string $toolbarPosition The toolbar position (top, bottom, normal, or null -- use the configuration) */ - public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, \Twig_Environment $twig, array $templates, $toolbarPosition = 'normal') + public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, \Twig_Environment $twig, array $templates, $toolbarPosition = 'bottom') { $this->generator = $generator; $this->profiler = $profiler; 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 99ee7172ed291..b2b77f65fa062 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig @@ -1,28 +1,26 @@ -{% if 'normal' != position %} -
- + - {{ include('@WebProfiler/Icon/symfony.svg') }} - -
- -
-{% endif %} + Sfjs.setPreference('toolbar/displayState', 'block'); + "> + {{ include('@WebProfiler/Icon/symfony.svg') }} + + + +
{% for name, template in templates %} @@ -39,16 +37,14 @@ {% endif %} {% endfor %} - {% if 'normal' != position %} - - {{ include('@WebProfiler/Icon/close.svg') }} - - {% endif %} + + {{ include('@WebProfiler/Icon/close.svg') }} +