From 00e3a42a5a8759a1deccc57c34b257a15d98cd25 Mon Sep 17 00:00:00 2001 From: Sebastian Grodzicki Date: Wed, 7 Jan 2015 07:42:10 +0100 Subject: [PATCH] Replaced raster PNG icons with vector SVG icons --- .../DebugBundle/Resources/views/Profiler/dump.html.twig | 4 ++-- .../Resources/views/Collector/security.html.twig | 4 ++-- .../Resources/views/Collector/ajax.html.twig | 2 +- .../Resources/views/Collector/config.html.twig | 8 ++++---- .../Resources/views/Collector/events.html.twig | 2 +- .../Resources/views/Collector/exception.html.twig | 2 +- .../Resources/views/Collector/form.html.twig | 4 ++-- .../Resources/views/Collector/logger.html.twig | 4 ++-- .../Resources/views/Collector/memory.html.twig | 2 +- .../Resources/views/Collector/request.html.twig | 4 ++-- .../Resources/views/Collector/router.html.twig | 2 +- .../Resources/views/Collector/time.html.twig | 4 ++-- .../Resources/views/Profiler/header.html.twig | 2 +- .../Resources/views/Profiler/layout.html.twig | 2 +- .../Resources/views/Profiler/toolbar.css.twig | 4 ++-- .../Resources/views/Profiler/toolbar.html.twig | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) 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 5ba9af9fe7..7e9e0b34f3 100644 --- a/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig +++ b/src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig @@ -5,7 +5,7 @@ {% if dumps_count %} {% set icon %} - dump() + {{ dumps_count }} {% endset %} @@ -41,7 +41,7 @@ {{- "" -}} - dump() + {{- "" -}} dump() 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 14458e63f8..61368928a2 100644 --- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig +++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig @@ -31,7 +31,7 @@ {% endif %} {% endset %} {% set icon %} - Security + {% if collector.user %}
{{ collector.user }}
{% endif %} {% endset %} @@ -40,7 +40,7 @@ {% block menu %} - + Security {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig index 6869d783b9..d557629d18 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig @@ -3,7 +3,7 @@ {% block toolbar %} {% set icon %} - AJAX requests + 0 {% endset %} 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 c37b50d8c8..fcba5d525d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig @@ -4,7 +4,7 @@ {# Symfony Logo #} {% set icon %} - Symfony + {% if collector.applicationname %} {{ collector.applicationname }} {{ collector.applicationversion }} @@ -32,7 +32,7 @@ {# PHP Information #} {% set icon %} - PHP + {% endset %} {% set text %} @@ -57,7 +57,7 @@ {# Environment #} {% set debug_status_class %}sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}{% endset %} {% set icon %} - Environment + {{ token }} {% if 'n/a' != collector.appname or 'n/a' != collector.env %} @@ -104,7 +104,7 @@ {% block menu %} - Configuration + Config {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig index 0607aa8a3b..879e537f13 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig @@ -4,7 +4,7 @@ {% block menu %} - Events + Events {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig index 121a9ee5d6..5175f66107 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig @@ -11,7 +11,7 @@ {% block menu %} - Exception + Exception {% if collector.hasexception %} 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 fda6d599e9..d6f4e06c83 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig @@ -5,7 +5,7 @@ {% block toolbar %} {% if collector.data|length %} {% set icon %} - Forms + {% if collector.data.nb_errors %}{{ collector.data.nb_errors }}{% else %}{{ collector.data.forms|length }}{% endif %} {% endset %} @@ -15,7 +15,7 @@ {% block menu %} - + Forms {% if collector.data.forms|length %} {{ collector.data.forms|length }} 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 4ab569020f..013ac6aa2a 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig @@ -5,7 +5,7 @@ {% block toolbar %} {% if collector.counterrors or collector.countdeprecations or collector.countscreams %} {% set icon %} - Logs + {% if collector.counterrors %} {% set status_color = "red" %} {% elseif collector.countdeprecations %} @@ -40,7 +40,7 @@ {% block menu %} - Logger + Logs {% if collector.counterrors or collector.countdeprecations or collector.countscreams %} {% set error_count = collector.counterrors + collector.countdeprecations + collector.countscreams %} 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 1028f121fb..397b5e8305 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig @@ -3,7 +3,7 @@ {% block toolbar %} {% set icon %} - Memory Usage + {{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB {% endset %} 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 42ff85fae5..2281ada068 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig @@ -19,7 +19,7 @@ {% set request_status_code_color = (400 > collector.statuscode) ? ((200 == collector.statuscode) ? 'green' : 'yellow') : 'red'%} {% set request_route = collector.route ? collector.route : 'NONE' %} {% set icon %} - Request + {{ collector.statuscode }} {{ request_handler }} on {{ request_route }} @@ -49,7 +49,7 @@ {% block menu %} - Request + Request {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig index 782465dc61..b5555e7fd7 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig @@ -5,7 +5,7 @@ {% block menu %} - Routing + Routing {% 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 ff90d27b9a..e1406aefbc 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig @@ -18,7 +18,7 @@ {% block toolbar %} {% set duration = collector.events|length ? '%.0f ms'|format(collector.duration) : 'n/a' %} {% set icon %} - Time + {{ duration }} {% endset %} {% set text %} @@ -32,7 +32,7 @@ {% block menu %} - Timeline + Timeline {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/header.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/header.html.twig index 3ee8ba36b5..e08511183d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/header.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/header.html.twig @@ -1,6 +1,6 @@