diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index d380e319f9..d6235025d0 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -36,6 +36,7 @@ class ProfilerController extends ContainerAware $profiler->disable(); $panel = $this->container->get('request')->query->get('panel', 'request'); + $page = $this->container->get('request')->query->get('page', 'home'); if (!$profile = $profiler->loadProfile($token)) { return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:info.html.twig', array('about' => 'no_token', 'token' => $token)); @@ -50,6 +51,7 @@ class ProfilerController extends ContainerAware 'profile' => $profile, 'collector' => $profile->getCollector($panel), 'panel' => $panel, + 'page' => $page, 'templates' => $this->getTemplates($profiler), )); } diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css index 3b711c49b4..5902f34aa4 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css @@ -450,3 +450,9 @@ td.main, td.menu { #collector_content .routing tr.almost td { background-color: #fa0; } + +.loading { + background: transparent url(../images/profiler/spinner.gif) scroll no-repeat 50% 50%; + height: 30px; + display: none; +} \ No newline at end of file diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif new file mode 100644 index 0000000000..99eb012a9c Binary files /dev/null and b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif differ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/ajax_layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/ajax_layout.html.twig new file mode 100644 index 0000000000..407650745e --- /dev/null +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/ajax_layout.html.twig @@ -0,0 +1 @@ +{% block panel '' %} \ No newline at end of file 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 new file mode 100644 index 0000000000..24f05bae54 --- /dev/null +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig @@ -0,0 +1,72 @@ + \ No newline at end of file diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig index bf63632c12..6c8df7e4e7 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig @@ -27,6 +27,7 @@ {% endif %}