Skip to content

Commit d4b9522

Browse files
wouterjwouterj
committed
Add a way to group toolbar info pieces
1 parent 323d61c commit d4b9522

File tree

3 files changed

+94
-70
lines changed

3 files changed

+94
-70
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig

Lines changed: 59 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -31,73 +31,79 @@
3131
{% endset %}
3232

3333
{% set text %}
34-
{% if collector.applicationname %}
34+
<div class="sf-toolbar-info-group">
35+
{% if collector.applicationname %}
36+
<div class="sf-toolbar-info-piece">
37+
{{ collector.applicationname }} <b>{{ collector.applicationversion }}</b>
38+
</div>
39+
{% endif %}
40+
3541
<div class="sf-toolbar-info-piece">
36-
{{ collector.applicationname }} <b>{{ collector.applicationversion }}</b>
42+
<b>Profiler token</b>
43+
<span>
44+
{% if profiler_url %}
45+
<a href="{{ profiler_url }}">{{ collector.token }}</a>
46+
{% else %}
47+
{{ collector.token }}
48+
{% endif %}
49+
</span>
3750
</div>
38-
{% endif %}
3951

40-
<div class="sf-toolbar-info-piece">
41-
<b>Profiler token</b>
42-
<span>
43-
{% if profiler_url %}
44-
<a href="{{ profiler_url }}">{{ collector.token }}</a>
45-
{% else %}
46-
{{ collector.token }}
47-
{% endif %}
48-
</span>
52+
{% if 'n/a' != collector.appname %}
53+
<div class="sf-toolbar-info-piece">
54+
<b>Kernel name</b>
55+
<span>{{ collector.appname }}</span>
56+
</div>
57+
{% endif %}
58+
59+
{% if 'n/a' != collector.env %}
60+
<div class="sf-toolbar-info-piece">
61+
<b>Environment</b>
62+
<span>{{ collector.env }}</span>
63+
</div>
64+
{% endif %}
65+
66+
{% if 'n/a' != collector.debug %}
67+
<div class="sf-toolbar-info-piece">
68+
<b>Debug</b>
69+
<span class="{{ debug_status_class }}">{{ collector.debug ? 'enabled' : 'disabled' }}</span>
70+
</div>
71+
{% endif %}
4972
</div>
5073

51-
{% if 'n/a' != collector.appname %}
52-
<div class="sf-toolbar-info-piece">
53-
<b>Kernel name</b>
54-
<span>{{ collector.appname }}</span>
74+
<div class="sf-toolbar-info-group">
75+
<div class="sf-toolbar-info-piece sf-toolbar-info-php">
76+
<b>PHP version</b>
77+
<span>
78+
{{ collector.phpversion }}
79+
&nbsp; <a href="{{ path('_profiler_phpinfo') }}">View phpinfo()</a>
80+
</span>
5581
</div>
56-
{% endif %}
5782

58-
{% if 'n/a' != collector.env %}
59-
<div class="sf-toolbar-info-piece">
60-
<b>Environment</b>
61-
<span>{{ collector.env }}</span>
83+
<div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
84+
<b>PHP Extensions</b>
85+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
86+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
6287
</div>
63-
{% endif %}
6488

65-
{% if 'n/a' != collector.debug %}
6689
<div class="sf-toolbar-info-piece">
67-
<b>Debug</b>
68-
<span class="{{ debug_status_class }}">{{ collector.debug ? 'enabled' : 'disabled' }}</span>
90+
<b>PHP SAPI</b>
91+
<span>{{ collector.sapiName }}</span>
6992
</div>
70-
{% endif %}
71-
72-
<div class="sf-toolbar-info-piece sf-toolbar-info-php">
73-
<b>PHP version</b>
74-
<span>
75-
{{ collector.phpversion }}
76-
&nbsp; <a href="{{ path('_profiler_phpinfo') }}">View phpinfo()</a>
77-
</span>
78-
</div>
79-
80-
<div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
81-
<b>PHP Extensions</b>
82-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
83-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
8493
</div>
8594

86-
<div class="sf-toolbar-info-piece">
87-
<b>PHP SAPI</b>
88-
<span>{{ collector.sapiName }}</span>
95+
<div class="sf-toolbar-info-group">
96+
{% if collector.symfonyversion is defined %}
97+
<div class="sf-toolbar-info-piece">
98+
<b>Resources</b>
99+
<span>
100+
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
101+
Read Symfony {{ collector.symfonyversion }} Docs
102+
</a>
103+
</span>
104+
</div>
105+
{% endif %}
89106
</div>
90-
91-
{% if collector.symfonyversion is defined %}
92-
<div class="sf-toolbar-info-piece">
93-
<b>Resources</b>
94-
<span>
95-
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
96-
Read Symfony {{ collector.symfonyversion }} Docs
97-
</a>
98-
</span>
99-
</div>
100-
{% endif %}
101107
{% endset %}
102108

103109
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: block_status, additional_classes: 'sf-toolbar-block-right' }) }}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,35 @@
3232

3333
{% set text %}
3434
{% spaceless %}
35-
<div class="sf-toolbar-info-piece">
36-
<b>HTTP status</b>
37-
<span>{{ collector.statuscode }} {{ collector.statustext }}</span>
38-
</div>
39-
<div class="sf-toolbar-info-piece">
40-
<b>Controller</b>
41-
<span>{{ request_handler }}</span>
35+
<div class="sf-toolbar-info-group">
36+
<div class="sf-toolbar-info-piece">
37+
<b>HTTP status</b>
38+
<span>{{ collector.statuscode }} {{ collector.statustext }}</span>
39+
</div>
4240
</div>
43-
{% if collector.controller.class is defined %}
41+
42+
<div class="sf-toolbar-info-group">
4443
<div class="sf-toolbar-info-piece">
45-
<b>Controller class</b>
46-
<span>{{ collector.controller.class }}</span>
44+
<b>Controller</b>
45+
<span>{{ request_handler }}</span>
46+
</div>
47+
{% if collector.controller.class is defined %}
48+
<div class="sf-toolbar-info-piece">
49+
<b>Controller class</b>
50+
<span>{{ collector.controller.class }}</span>
51+
</div>
52+
{% endif %}
53+
<div class="sf-toolbar-info-piece">
54+
<b>Route name</b>
55+
<span>{{ collector.route|default('NONE') }}</span>
4756
</div>
48-
{% endif %}
49-
<div class="sf-toolbar-info-piece">
50-
<b>Route name</b>
51-
<span>{{ collector.route|default('NONE') }}</span>
5257
</div>
53-
<div class="sf-toolbar-info-piece">
54-
<b>Has session</b>
55-
<span>{% if collector.sessionmetadata|length %}yes{% else %}no{% endif %}</span>
58+
59+
<div class="sf-toolbar-info-group">
60+
<div class="sf-toolbar-info-piece">
61+
<b>Has session</b>
62+
<span>{% if collector.sessionmetadata|length %}yes{% else %}no{% endif %}</span>
63+
</div>
5664
</div>
5765
{% endspaceless %}
5866
{% endset %}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,16 @@
104104
.sf-toolbar-block .sf-toolbar-info-piece-additional-detail {
105105
display: none;
106106
}
107+
.sf-toolbar-block .sf-toolbar-info-group {
108+
margin-bottom: 4px;
109+
padding-bottom: 2px;
110+
border-bottom: 1px solid #333333;
111+
}
112+
.sf-toolbar-block .sf-toolbar-info-group:last-child {
113+
margin-bottom: 0;
114+
padding-bottom: 0;
115+
border-bottom: none;
116+
}
107117

108118
.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
109119
padding: 2px 5px;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy