8000 merged branch shiroyuki/master (PR #3850) · ostrolucky/symfony@38cabda · GitHub
[go: up one dir, main page]
Skip to content

Commit 38cabda

Browse files
fabpotfabpot
committed
merged branch shiroyuki/master (PR symfony#3850)
Commits ------- 75c7d3a Fixed the link to the method with onclick event. ecbabec renamed 'Request handler' to 'Controller' and 'Route ID' to 'Route name'. 3c5ede4 Add a new query to display all information. f6a866b Merged CSS for the toolbar in both embedded mode (on each page) and profiler. 306533b Updated the responsive design in addition to the scenario with authenticated users and exception notification. 4a3312b Updated the toolbar with the responsive design (normal-to-large scenario). 1eec2a2 Updated the toolbar with the responsive design (normal-to-small scenario). 03c8213 Refactored the CSS code for the toolbar out of the template. 37843b3 Updated with PHP logo (only the text). d5e0ccc Made the toolbar to show the version, memory usage, the state of security (both a abbreviation and an associate description) and number of DB requests and request time. 37ad8a6 Removed the check for verbose and adjusted the style when the toolbar is on the top of the page. 67b0532 Redesigned the WDT. Discussion ---------- Re-design the debugging toolbar The toolbar is very useful and containing lots of information. However, as there are too much information, it is very distracting and the toolbar area somehow ends up taking too much space and then becomes something like a panel. The main purpose of this pull request is to hide any information and show only whenever the user wants to see, except the status code and response time. This is based on [the pull request symfony#3833](symfony#3833) with the feedbacks and for 2.1 (master). The testing app is available at http://home.shiroyuki.com. --------------------------------------------------------------------------- by stof at 2012-04-10T06:24:36Z @shiroyuki your testing app denies the access because of the restriction in app_dev.php --------------------------------------------------------------------------- by shiroyuki at 2012-04-10T06:27:27Z @stof: I'm sorry. It should be working now. --------------------------------------------------------------------------- by stof at 2012-04-10T06:45:39Z Moving the toolbar to the top of the page means it will hide some content of the page. You should keep it at the bottom --------------------------------------------------------------------------- by shiroyuki at 2012-04-10T06:48:28Z Just a moment ago, I changed the position of the toolbar via `config_dev` so I could check when WDT is on the top. I just reverted the config file. :D --------------------------------------------------------------------------- by fabpot at 2012-04-10T06:55:16Z Some comments: * I would have kept the number of database request as this number is probably the one everybody should have a look at on every page. * I would have used the original PHP logo (in black and white) instead of a non-standard one But overall, this is a very nice improvement. --------------------------------------------------------------------------- by stloyd at 2012-04-10T06:55:43Z There is an issue with "bubbling" at Firefox 11 (at least), when you hover `<a>` element, the hover event seems to be "launched" twice. --------------------------------------------------------------------------- by fabpot at 2012-04-10T06:56:13Z As the verbose mode has been removed from the template, it should also be removed from the configuration (I can do that after merging if you don't know how to do that). --------------------------------------------------------------------------- by shiroyuki at 2012-04-10T07:05:31Z @stloyd I noticed that too. As I couldn't find the same issue on Webkit-based browsers and all effects on this toolbar heavily relies on CSS, it could have been a glitch on Firefox. @fabpot I'll see what I can do with the number of DB request and the logo. --------------------------------------------------------------------------- by asm89 at 2012-04-10T07:26:28Z Will there be options to somehow keep the debug toolbar 'expanded' or something? I guess the folding of the sf and php information makes sense, but I personally look at the request/time/memory/security and query parts of the toolbar a lot. As my browser window is big enough to show all information at once, this would be a huge step backwards imo. --------------------------------------------------------------------------- by XWB at 2012-04-10T07:28:38Z Agreed with @asm89, I also want the option to show all the information on my screen. --------------------------------------------------------------------------- by fabpot at 2012-04-10T08:28:00Z I tend to agree too with @asm89. What about reusing the `verbose` option for that. This was already its purpose anyway. --------------------------------------------------------------------------- by shiroyuki at 2012-04-10T14:56:45Z How about using media query? --------------------------------------------------------------------------- by shiroyuki at 2012-04-11T02:20:32Z Please note that the latest commit still doesn't have the new logo for PHP. As DoctrineBundle now has its own repository, the change to show the number of DB requests is already done via DoctrineBundle's [PR 57](doctrine/DoctrineBundle#57). --------------------------------------------------------------------------- by guilhermeblanco at 2012-04-11T02:50:47Z @fabpot @shiroyuki as soon as this patch is merged I will do the same on DoctrineBundle. All you need to do is look at me over our desks' separator. =D --------------------------------------------------------------------------- by shiroyuki at 2012-04-11T03:17:41Z The last commit has the updated PHP logo. Unfortunately as @stloyd and @guilhermeblanco pointed out, the flicking on the toolbar when the mouse is over might have been due to the CSS issue on Firefox. --------------------------------------------------------------------------- by Tobion at 2012-04-11T04:46:36Z Nice work shiroyuki. I always had the feeling the toolbar can be improved. Good that you got this one going. I would remove the verbose option (rarely nobody changes it) and use media queries to accomplish a responsive design that shows as much information as possible. And only shows the most important facts when there is not enough space. E.g. the symfony version could be removed if it doesn't fit on the screen because it's mostly static from request to request. --------------------------------------------------------------------------- by Tobion at 2012-04-11T04:48:45Z Another idea: Add a panel "PHP Info" to the profiler that shows the output of `phpinfo()`. This panel is linked from the PHP logo in the WDT which currently has no link on it. --------------------------------------------------------------------------- by shiroyuki at 2012-04-11T15:47:51Z @Tobion: It would be an overkill if `phpinfo()` was visible in the toolbar. Additionally, the toolbar doesn't fit to show that amount of information. Plus, the information released by `phpinfo()` is also static and easily obtained by a simple PHP script. I don't think that WDT should be showing this information. Please note that the media query is not yet implement. The followings are still unknown to me: * should we support the toolbar for mobile device? * what is the minimum screen size? --------------------------------------------------------------------------- by Tobion at 2012-04-11T15:52:43Z @shiroyuki you misunderstood me. phpinfo() should be a new panel in the PROFILER, not the WDT. It is reachable from the WDT by clicking on the PHP logo. But that can be implemented in a seperate PR. It's just an idea and before I would implement it, I'd like to receive feedback if it would be accepted at all. --------------------------------------------------------------------------- by fabpot at 2012-04-11T16:38:44Z Displaying `phpinfo()` data is not in the scope of this PR. --------------------------------------------------------------------------- by Tobion at 2012-04-11T16:48:50Z @fabpot yeah. But would you accept such a PR or do you think it's not useful? --------------------------------------------------------------------------- by fabpot at 2012-04-11T16:57:49Z @Tobion The web profiler is mainly about information for the current request; so I'm not sure it would be useful to have such a tab in the profiler. --------------------------------------------------------------------------- by vicb at 2012-04-11T17:06:15Z @fabpot @Tobion what about adding it in the config panel ? Not sure if it is very useful but I have seen to many `phpinfo.php` in the web root folder. (It could be an expandable panel loaded via ajax like what is used for the Doctrine explain panel). --------------------------------------------------------------------------- by shiroyuki at 2012-04-12T03:11:40Z @tobian @vicb: what kind of information are you looking from `phpinfo()`? --------------------------------------------------------------------------- by Felds at 2012-04-12T03:30:02Z The equivalent for `phpinfo()` was extremely convenient and helped a lot in Symfony 1. It's out of scope but an optional panel could be nice. Ini flags are of great help when debugging on a hurry. :+1: for that! --------------------------------------------------------------------------- by Tobion at 2012-04-12T03:37:52Z @shiroyuki I don't understand your question. Everything of it should be displayed. But don't worry about phpinfo(), I'll work on that in a seperate PR. You can focus on the responsive design. ;) --------------------------------------------------------------------------- by vicb at 2012-04-12T06:54:35Z @shiroyuki I am not looking for anything specific. Just saying I have seen many times customer code using a publicly accessible file to return the info and it would help to get ride of this file. --------------------------------------------------------------------------- by sstok at 2012-04-12T07:59:18Z ``` should we support the toolbar for mobile device? ``` Good question, I don't think so because the screen-size is to small to show anything useful. Maybe a small icon to display the information as overlay, including the token so you can refer to that on a bigger screen?. --------------------------------------------------------------------------- by johnnypeck at 2012-04-13T06:45:43Z If your interested in a useful but not so intrusive way of providing the toolbar on mobile devices perhaps take a look at what the guys at Twitter have done with the topbar navigation converting to a semi-accordion style menu on mobile in Bootstrap. I can see the usefulness. Checkout the responsive.less which makes it easy enough to include/exclude depending on screen size. I found it quite useful in a recent project. Regarding adding a tab for phpinfo, sure it would be useful BUT if the reasoning is that some people leave a publicly available phpinfo script therefore just include it then I would not include it. There are many more useful requirements of the toolbar rather than to insulate intro to web issues. That's like saying don't include the toolbar because someone may build an application that makes the toolbar available publicly (which will happen). I've seen too many projects in my years having no clue of versioning tools that must have been built on the server, live, with filenames like indexv1.php, indexv2.php, indexTryAgain.php, db credentials in the clear, and just hoping to find a point where it works enough. And yes, I've found those scripts were publicly available and still around years after they were created; security holes and all! I'm preaching to the choir here. You'll never stop stupid. All we can do is educate by any means we have and share our knowledge with one another. Aside from that devils advocate reasoning, I would include the phpinfo tab, it does make sense in those random "did I/they compile that in" circumstances. ;-) Sorry for the rant. +1 for mobile sorta+1 for phpinfo +10 for better educating on how to include anything you need so phpinfo could be a "my first foray into adding a tool to my toolbar for Symfony" tutorial in the cookbook. Again, sorry for the long winded rant. Cheers everyone. Goodnight. --------------------------------------------------------------------------- by shiroyuki at 2012-04-13T23:33:21Z @stof I think we can remove the CSS.
2 parents 43011ac + e42ff10 commit 38cabda

File tree

10 files changed

+386
-114
lines changed

10 files changed

+386
-114
lines changed

‎Resources/public/css/toolbar.css

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Resources/views/Collector/config.html.twig

Lines changed: 57 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,73 @@
11
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
22

33
{% block toolbar %}
4+
{# Symfony Logo #}
45
{% set icon %}
5-
<a href="http://symfony.com/"><img width="26" height="28" alt="Symfony" style="border-width: 0; margin: 0 5px 0 10px; vertical-align: middle;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAcCAMAAABIzV/hAAACZFBMVEUwLjL///////////////////////////////////////////////////////////////////+Eg4b///+Ni46Xlpj///////////+op6n///////////////////////////////////////////////////////////9ZWFv///////9qaWz///////+mpaf///////////////9ZWFv///////////////9PTVH///91dHb////////////////////g4OD///9NTE+Ih4r///////+Ni47///////92dHeRkJLk5OTLy8xlY2b///////+cm53///////+5ubr////o6Oj////////U1NT///9DQURsa22rq6ysq61hX2L///+LioxTUVVBP0NEQkZpZ2rGxsf///9ram3////s7O2SkZNfXmFxcHKmpae4uLnKysuXlpiop6l3dXiIh4pYVlmrq6ycm52trK7Nzc48Oj5dW158e36dnJ49Oz/Pz9BiYGPAv8BDQUTQz9BVU1aioaNHRUnBwcJXVVk6ODxJR0t3dnmko6U8Oj6lpKY9Oz+0tLXDwsRQTlF7en1QTlHi4eJhX2LFxcZTUVViYGNwb3J+fX83NTlFQ0dUUlW4t7icm524uLk8Oj5YVlmPjpBLSU2enZ9aWVw/PkFBP0NdW153dnk0MjZQTlE1MzdQT1JdXF9ram15eHqGhYdDQkV5eHo2NThEQkZRUFNFQ0dta244NjpGREhTUVU5NztUUlVhX2JubG9HRUlVU1ZiYGM7OTxIRkk7OT1IR0o8Oj4wLjI9Oz8YdG13AAAAynRSTlMAAAEDBAUGCgsMDQ4QEhMUGRobGx0gISIkJiYnKCktLi8wMjM0NTk6Ozw+P0NFSEpLTE5PUFBTWlteXmBiZGVmaWxtcHBxc3R0dnl5fX+BgoOGi46Pj5CRmZqanZ6eoKeoq6ytsLCwsrO0tbe5urq8vL+/wsTFx8jJycvLy8vM0NHR0tLU1NfX2NnZ2trc3N3d3eHh4uLl5ebm5ubn5+fo6urt7e3u7vDx8/Pz9PT19fX19fX29vf39/j4+fn5+vr6+vv7+/z8/f3+yR5EtwAAAbVJREFUeNpl0mVXVFEYhuF3zhkOFqMjYmCi2MUYYKGIYiJ2YCd2t4IBFqgoKjZ2jg3igI2KyO2f8sTMngGvj/te71r7wyMuk4jofZccAihcMzJKXDYnuYcVotyeYKiktV5LA0faaE7S4s7TyMsBupnMcoH/vO6gmanJaiLV1Py+Xwn5zc0fjCbSi2LI2QdkGdLyFBG+rHwMzz4BD7wyGEfFk8pfsD2TkGmyFNvFHfDj55v02VD6DcteOYylatY8oG7boA2QV4vlklzB8tU3/DIwo+dWv58guY5tRcLMtwSGdi1DkTvAn9Jqsgbu4kafRBqlV4sDFCWuIjdhMsp7yQU49rB28/QPLOu2DuWqLMfmfw6M716GskdGVRMSGDKRsEzpvZ+Qs0lFKDd94s2oArh2F7K3oNQt6ChGr5x6+Dx3J7d2E3Ygqam4PCkngRNnngYIO5cWq4lLb5t+vJ6GiifFR1nbMNqP3fSOCN8PZnQynEW5W/nmHy0PXv79eHpRSjsjtEOtWZcRc9YXlNx7VFKwceGYHjG6s0Ob3iK+X3LqlKnjkvt39rjD6w3W6BhvrCdaVw//ADrWicJIvtkmAAAAAElFTkSuQmCC"/></a>
6+
<a href="http://symfony.com/">
7+
<img width="26" height="28" alt="Symfony" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAcCAMAAABIzV/hAAACZFBMVEUwLjL///////////////////////////////////////////////////////////////////+Eg4b///+Ni46Xlpj///////////+op6n///////////////////////////////////////////////////////////9ZWFv///////9qaWz///////+mpaf///////////////9ZWFv///////////////9PTVH///91dHb////////////////////g4OD///9NTE+Ih4r///////+Ni47///////92dHeRkJLk5OTLy8xlY2b///////+cm53///////+5ubr////o6Oj////////U1NT///9DQURsa22rq6ysq61hX2L///+LioxTUVVBP0NEQkZpZ2rGxsf///9ram3////s7O2SkZNfXmFxcHKmpae4uLnKysuXlpiop6l3dXiIh4pYVlmrq6ycm52trK7Nzc48Oj5dW158e36dnJ49Oz/Pz9BiYGPAv8BDQUTQz9BVU1aioaNHRUnBwcJXVVk6ODxJR0t3dnmko6U8Oj6lpKY9Oz+0tLXDwsRQTlF7en1QTlHi4eJhX2LFxcZTUVViYGNwb3J+fX83NTlFQ0dUUlW4t7icm524uLk8Oj5YVlmPjpBLSU2enZ9aWVw/PkFBP0NdW153dnk0MjZQTlE1MzdQT1JdXF9ram15eHqGhYdDQkV5eHo2NThEQkZRUFNFQ0dta244NjpGREhTUVU5NztUUlVhX2JubG9HRUlVU1ZiYGM7OTxIRkk7OT1IR0o8Oj4wLjI9Oz8YdG13AAAAynRSTlMAAAEDBAUGCgsMDQ4QEhMUGRobGx0gISIkJiYnKCktLi8wMjM0NTk6Ozw+P0NFSEpLTE5PUFBTWlteXmBiZGVmaWxtcHBxc3R0dnl5fX+BgoOGi46Pj5CRmZqanZ6eoKeoq6ytsLCwsrO0tbe5urq8vL+/wsTFx8jJycvLy8vM0NHR0tLU1NfX2NnZ2trc3N3d3eHh4uLl5ebm5ubn5+fo6urt7e3u7vDx8/Pz9PT19fX19fX29vf39/j4+fn5+vr6+vv7+/z8/f3+yR5EtwAAAbVJREFUeNpl0mVXVFEYhuF3zhkOFqMjYmCi2MUYYKGIYiJ2YCd2t4IBFqgoKjZ2jg3igI2KyO2f8sTMngGvj/te71r7wyMuk4jofZccAihcMzJKXDYnuYcVotyeYKiktV5LA0faaE7S4s7TyMsBupnMcoH/vO6gmanJaiLV1Py+Xwn5zc0fjCbSi2LI2QdkGdLyFBG+rHwMzz4BD7wyGEfFk8pfsD2TkGmyFNvFHfDj55v02VD6DcteOYylatY8oG7boA2QV4vlklzB8tU3/DIwo+dWv58guY5tRcLMtwSGdi1DkTvAn9Jqsgbu4kafRBqlV4sDFCWuIjdhMsp7yQU49rB28/QPLOu2DuWqLMfmfw6M716GskdGVRMSGDKRsEzpvZ+Qs0lFKDd94s2oArh2F7K3oNQt6ChGr5x6+Dx3J7d2E3Ygqam4PCkngRNnngYIO5cWq4lLb5t+vJ6GiifFR1nbMNqP3fSOCN8PZnQynEW5W/nmHy0PXv79eHpRSjsjtEOtWZcRc9YXlNx7VFKwceGYHjG6s0Ob3iK+X3LqlKnjkvt39rjD6w3W6BhvrCdaVw//ADrWicJIvtkmAAAAAElFTkSuQmCC"/>
8+
<span>{{ collector.symfonyversion }}</span>
9+
</a>
610
{% endset %}
7-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false, 'text': collector.symfonyversion } %}
11+
{% set text %}
12+
Symfony <b>{{ collector.symfonyversion }}</b>
13+
{% endset %}
14+
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
815

9-
{% if verbose %}
10-
{% set text %}
11-
{% spaceless %}
12-
<span>PHP {{ collector.phpversion }}</span>
13-
<span style="margin: 0; padding: 0; color: #979696;">|</span>
14-
<span style="color: {{ collector.hasxdebug ? '#759e1a' : '#a33' }}">xdebug</span>
15-
<span style="margin: 0; padding: 0; color: #979696">|</span>
16-
<span style="color: {{ collector.hasaccelerator ? '#759e1a' : '#a33' }}">accel</span>
17-
{% endspaceless %}
18-
{% endset %}
19-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false, 'icon': '' } %}
20-
{% endif %}
16+
{# PHP Information #}
17+
{% set icon %}
18+
<span>
19+
<img width="26" height="28" alt="PHP" src="data:image/png;base64,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"/>
20+
</span>
21+
{% endset %}
22+
{% set text %}
23+
{% spaceless %}
24+
<div class="sf-toolbar-info-piece sf-toolbar-info-php">
25+
<b>PHP</b>
26+
<span>{{ collector.phpversion }}</span>
27+
</div>
28+
<div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
29+
<b>PHP Extensions</b>
30+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
31+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
32+
</div>
33+
{% endspaceless %}
34+
{% endset %}
35+
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
2136

37+
{# Environment #}
38+
{% set debug_status_class %}sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}{% endset %}
2239
{% set icon %}
23-
<img width="21" height="28" alt="Environment" style="border-width: 0; vertical-align: middle; margin-right: 5px;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAMAAAC5xgRsAAAAZlBMVEX///////////////////////////////////////////////////////////////////////////////////////////+ZmZmZmZlISEhJSUmdnZ1HR0fR0dFZWVlpaWlfX18/Pz+puygPAAAAIXRSTlMACwwlJygpLzIzNjs8QEtMUmd6e32AucDBw8fIydTm6u5l8MjvAAAAo0lEQVR42r2P2Q6CMBBFL6XsZRGRfZv//0nbDBNEE19MnJeTc5ILKf58ahiUwzy/AJpIWwREwQnEXRdbGCLjrO+djWRvVMiJcigxB7viGogxDdJpSmHEmCVPS7YczJvgUu+CS30IvtbNYZMvsGVo2mVpG/kbm4auiCpdcC3YPCAhSpAdUzaAn6qPKZtUT6ZSzb4bi2hdo9MQ1nX4ASjfV+/4/Z40pyCHrNTbIgAAAABJRU5ErkJggg=="/>
40+
<img width="21" height="28" alt="Environment" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAMAAAC5xgRsAAAAZlBMVEX///////////////////////////////////////////////////////////////////////////////////////////+ZmZmZmZlISEhJSUmdnZ1HR0fR0dFZWVlpaWlfX18/Pz+puygPAAAAIXRSTlMACwwlJygpLzIzNjs8QEtMUmd6e32AucDBw8fIydTm6u5l8MjvAAAAo0lEQVR42r2P2Q6CMBBFL6XsZRGRfZv//0nbDBNEE19MnJeTc5ILKf58ahiUwzy/AJpIWwREwQnEXRdbGCLjrO+djWRvVMiJcigxB7viGogxDdJpSmHEmCVPS7YczJvgUu+CS30IvtbNYZMvsGVo2mVpG/kbm4auiCpdcC3YPCAhSpAdUzaAn6qPKZtUT6ZSzb4bi2hdo9MQ1nX4ASjfV+/4/Z40pyCHrNTbIgAAAABJRU5ErkJggg=="/>
41+
<span class="sf-toolbar-info-piece-additional-detail {{ debug_status_class }}"> </span>
42+
<span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ token }}</span>
43+
<span class="sf-toolbar-info-piece-additional-detail">
44+
<span class="sf-toolbar-info-with-delimiter">{{ collector.appname }}</span><span>{{ collector.env }}</span>
45+
</span>
2446
{% endset %}
2547
{% set text %}
2648
{% spaceless %}
27-
{% if verbose %}
49+
<div class="sf-toolbar-info-piece">
50+
<b>Name</b>
2851
<span>{{ collector.appname }}</span>
29-
<span style="margin: 0; padding: 0; color: #979696;">|</span>
52+
</div>
53+
<div class="sf-toolbar-info-piece">
54+
<b>Environment</b>
3055
<span>{{ collector.env }}</span>
31-
<span style="margin: 0; padding: 0; color: #979696;">|</span>
32-
<span>{{ collector.debug ? 'debug' : 'no-debug' }}</span>
33-
<span style="margin: 0; padding: 0; color: #979696;">|</span>
34-
{% endif %}
35-
<span>
36-
{% if profiler_url %}
37-
<a style="color: #2f2f2f" href="{{ profiler_url }}">{{ collector.token }}</a>
38-
{% else %}
39-
{{ collector.token }}
40-
{% endif %}
41-
</span>
56+
</div>
57+
<div class="sf-toolbar-info-piece">
58+
<b>Debug</b>
59+
<span class="{{ debug_status_class }}">{{ collector.debug ? 'en' : 'dis' }}abled</span>
60+
</div>
61+
<div class="sf-toolbar-info-piece">
62+
<b>Token</b>
63+
<span>
64+
{% if profiler_url %}
65+
<a style="color: #2f2f2f" href="{{ profiler_url }}">{{ collector.token }}</a>
66+
{% else %}
67+
{{ collector.token }}
68+
{% endif %}
69+
</span>
70+
</div>
4271
{% endspaceless %}
4372
{% endset %}
4473
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}

‎Resources/views/Collector/logger.html.twig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
{% block toolbar %}
44
{% if collector.counterrors %}
55
{% set icon %}
6-
<img width="15" height="28" alt="Logs" style="border-width: 0; vertical-align: middle; margin-right: 5px;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAcCAYAAABoMT8aAAAA4klEQVQ4y2P4//8/AyWYYXgYwOPp6Xnc3t7+P7EYpB6k7+zZs2ADNEjRjIwDAgKWgAywIUfz8+fPVzg7O/8AGeCATQEQnAfi/SAah/wcV1dXvAYUgORANA75ehcXl+/4DHAABRIe+ZrhbgAhTHsDiEgHBA0glA6GfSDiw5mZma+A+sphBlhVVFQ88vHx+Xfu3Ll7QP5haOjjwtuAuGHv3r3NIMNABqh8+/atsaur666vr+9XUlwSHx//AGQANxCbAnEWyGQicRMQ9wBxIQM0qjiBWAFqkB00/glhayBWHwb1AgB38EJsUtxtWwAAAABJRU5ErkJggg=="/>
6+
<img width="15" height="28" alt="Logs" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAcCAYAAABoMT8aAAAA4klEQVQ4y2P4//8/AyWYYXgYwOPp6Xnc3t7+P7EYpB6k7+zZs2ADNEjRjIwDAgKWgAywIUfz8+fPVzg7O/8AGeCATQEQnAfi/SAah/wcV1dXvAYUgORANA75ehcXl+/4DHAABRIe+ZrhbgAhTHsDiEgHBA0glA6GfSDiw5mZma+A+sphBlhVVFQ88vHx+Xfu3Ll7QP5haOjjwtuAuGHv3r3NIMNABqh8+/atsaur666vr+9XUlwSHx//AGQANxCbAnEWyGQicRMQ9wBxIQM0qjiBWAFqkB00/glhayBWHwb1AgB38EJsUtxtWwAAAABJRU5ErkJggg=="/>
7+
<span class="sf-toolbar-status sf-toolbar-status-yellow">{{ collector.counterrors }}</span>
78
{% endset %}
89
{% set text %}
9-
<span>{{ collector.counterrors }}</span>
10+
<div class="sf-toolbar-info-piece">
11+
<b>Exception</b>
12+
<span class="sf-toolbar-status sf-toolbar-status-yellow">{{ collector.counterrors }}</span>
13+
</div>
1014
{% endset %}
1115
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
1216
{% endif %}

‎Resources/views/Collector/memory.html.twig

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22

33
{% block toolbar %}
44
{% set icon %}
5-
<img width="13" height="28" alt="Memory Usage" style="vertical-align: middle; margin-right: 5px;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAcBAMAAABITyhxAAAAJ1BMVEXNzc3///////////////////////8/Pz////////////+NjY0/Pz9lMO+OAAAADHRSTlMAABAgMDhAWXCvv9e8JUuyAAAAQ0lEQVQI12MQBAMBBmLpMwoMDAw6BxjOOABpHyCdAKRzsNDp5eXl1KBh5oHBAYY9YHoDQ+cqIFjZwGCaBgSpBrjcCwCZgkUHKKvX+wAAAABJRU5ErkJggg=="/>
5+
<span>
6+
<img width="13" height="28" alt="Memory Usage" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAcBAMAAABITyhxAAAAJ1BMVEXNzc3///////////////////////8/Pz////////////+NjY0/Pz9lMO+OAAAADHRSTlMAABAgMDhAWXCvv9e8JUuyAAAAQ0lEQVQI12MQBAMBBmLpMwoMDAw6BxjOOABpHyCdAKRzsNDp5eXl1KBh5oHBAYY9YHoDQ+cqIFjZwGCaBgSpBrjcCwCZgkUHKKvX+wAAAABJRU5ErkJggg=="/>
7+
<span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB</span>
8+
</span>
69
{% endset %}
710
{% set text %}
8-
{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB
11+
<div class="sf-toolbar-info-piece">
12+
<b>Memory usage</b>
13+
<span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB</span>
14+
</div>
915
{% endset %}
1016
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
< 36B3 /code>
1117
{% endblock %}

0 commit comments

Comments
 (0)
0