From 2b2a7f0a1def8e487fb28565e131750b36579b75 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Thu, 24 Feb 2011 06:14:08 -0800 Subject: [PATCH] added nowrap style to WDT toolbar so image and text stays together when the toolbar wraps --- .../Resources/views/Collector/db.html.twig | 6 ++++-- .../views/Collector/mongodb.html.twig | 6 ++++-- .../views/Collector/security.html.twig | 18 ++++++++++-------- .../Resources/views/Collector/config.html.twig | 18 ++++++++++++------ .../Resources/views/Collector/logger.html.twig | 6 ++++-- .../Resources/views/Collector/memory.html.twig | 6 ++++-- .../views/Collector/request.html.twig | 6 ++++-- .../Resources/views/Collector/timer.html.twig | 6 ++++-- 8 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.html.twig b/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.html.twig index dfb1ed8fc6..fcfbe436b2 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.html.twig +++ b/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.html.twig @@ -1,8 +1,10 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Database -{{ collector.querycount }} + + Database + {{ collector.querycount }} + {% endblock %} {% block menu %} diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.html.twig b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.html.twig index 588e196b0b..c11ed37362 100644 --- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.html.twig +++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.html.twig @@ -1,8 +1,10 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Mongo -{{ collector.querycount }} + + Mongo + {{ collector.querycount }} + {% endblock %} {% block menu %} diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig index 2d198f7aaf..7b4bc26171 100644 --- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig +++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig @@ -1,14 +1,16 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Security -{% if collector.authenticated %} - {{ collector.user }} -{% elseif collector.enabled %} - anon. -{% else %} - disabled -{% endif %} + + Security + {% if collector.authenticated %} + {{ collector.user }} + {% elseif collector.enabled %} + anon. + {% else %} + disabled + {% endif %} + {% endblock %} {% block menu %} 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 79791eb20c..47bfed1891 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig @@ -1,12 +1,18 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Symfony -{{ collector.symfonyversion }} + + Symfony + {{ collector.symfonyversion }} + -PHP -{{ collector.phpversion }}|xdebug|accel + + PHP + {{ collector.phpversion }}|xdebug|accel + -Environment -{{ collector.appname }}|{{ collector.env }}|{{ collector.debug ? 'debug' : 'no-debug' }}|{% if profiler_url %}{{ collector.token }}{% else %}{{ collector.token }}{% endif %} + + Environment + {{ collector.appname }}|{{ collector.env }}|{{ collector.debug ? 'debug' : 'no-debug' }}|{% if profiler_url %}{{ collector.token }}{% else %}{{ collector.token }}{% 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 480bcc2df9..aa2f81ed6e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig @@ -1,8 +1,10 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Logs -{{ collector.counterrors }} + + Logs + {{ collector.counterrors }} + {% endblock %} {% block menu %} 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 1eba3da885..ecf49c6503 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig @@ -1,6 +1,8 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Memory Usage -{{ '%.0f'|format(collector.memory / 1024) }} KB + + Memory Usage + {{ '%.0f'|format(collector.memory / 1024) }} KB + {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig index f11d4e0154..fea19f2a2b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig @@ -1,8 +1,10 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Request -{% if collector.route %}{{ collector.route }}{% else %}NONE{% endif %}|{{ collector.format }}|{{ collector.statuscode }}|{{ collector.contenttype }} + + Request + {% if collector.route %}{{ collector.route }}{% else %}NONE{% endif %}|{{ collector.format }}|{{ collector.statuscode }}|{{ collector.contenttype }} + {% endblock %} {% block menu %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.html.twig index 35c354942c..1cc98ad580 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/timer.html.twig @@ -1,6 +1,8 @@ {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %} {% block toolbar %} -Timers -{{ '%.0f'|format(collector.time * 1000)}} ms + + Timers + {{ '%.0f'|format(collector.time * 1000)}} ms + {% endblock %}