8000 Removed the check for verbose and adjusted the style when the toolbar… · ostrolucky/symfony@37ad8a6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 37ad8a6

Browse files
shiroyukishiroyuki
committed
Removed the check for verbose and adjusted the style when the toolbar is on the top of the page.
1 parent 67b0532 commit 37ad8a6

File tree

2 files changed

+45
-40
lines changed

2 files changed

+45
-40
lines changed

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

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,47 +24,43 @@
2424
{% endset %}
2525
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false, 'text': collector.symfonyversion } %}
2626

27-
{% if verbose %}
28-
{% set icon %}
29-
<span>
30-
<img width="26" height="28" alt="PHP" src="data:image/png;base64,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"/>
31-
</span>
32-
{% endset %}
33-
{% set text %}
34-
{% spaceless %}
35-
<div class="sf-toolbar-info-piece sf-toolbar-info-php">
36-
<b>PHP</b>
37-
<span>{{ collector.phpversion }}</span>
38-
</div>
39-
<div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
40-
<b>PHP Extensions</b>
41-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
42-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
43-
</div>
44-
{% endspaceless %}
45-
{% endset %}
46-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
47-
{% endif %}
27+
{% set icon %}
28+
<span>
29+
<img width="26" height="28" alt="PHP" src="data:image/png;base64,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"/>
30+
</span>
31+
{% endset %}
32+
{% set text %}
33+
{% spaceless %}
34+
<div class="sf-toolbar-info-piece sf-toolbar-info-php">
35+
<b>PHP</b>
36+
<span>{{ collector.phpversion }}</span>
37+
</div>
38+
<div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
39+
<b>PHP Extensions</b>
40+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
41+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
42+
</div>
43+
{% endspaceless %}
44+
{% endset %}
45+
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
4846

4947
{% set icon %}
5048
<img width="21" height="28" alt="Environment" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAMAAAC5xgRsAAAAZlBMVEX///////////////////////////////////////////////////////////////////////////////////////////+ZmZmZmZlISEhJSUmdnZ1HR0fR0dFZWVlpaWlfX18/Pz+puygPAAAAIXRSTlMACwwlJygpLzIzNjs8QEtMUmd6e32AucDBw8fIydTm6u5l8MjvAAAAo0lEQVR42r2P2Q6CMBBFL6XsZRGRfZv//0nbDBNEE19MnJeTc5ILKf58ahiUwzy/AJpIWwREwQnEXRdbGCLjrO+djWRvVMiJcigxB7viGogxDdJpSmHEmCVPS7YczJvgUu+CS30IvtbNYZMvsGVo2mVpG/kbm4auiCpdcC3YPCAhSpAdUzaAn6qPKZtUT6ZSzb4bi2hdo9MQ1nX4ASjfV+/4/Z40pyCHrNTbIgAAAABJRU5ErkJggg=="/>
5149
{% endset %}
5250
{% set text %}
5351
{% spaceless %}
54-
{% if verbose %}
55-
<div class="sf-toolbar-info-piece">
56-
<b>Name</b>
57-
<span>{{ collector.appname }}</span>
58-
</div>
59-
<div class="sf-toolbar-info-piece">
60-
<b>Environment</b>
61-
<span>{{ collector.env }}</span>
62-
</div>
63-
<div class="sf-toolbar-info-piece">
64-
<b>Debug</b>
65-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}">{{ collector.debug ? 'en' : 'dis' }}abled</span>
66-
</div>
67-
{% endif %}
52+
<div class="sf-toolbar-info-piece">
53+
<b>Name</b>
54+
<span>{{ collector.appname }}</span>
55+
</div>
56+
<div class="sf-toolbar-info-piece">
57+
<b>Environment</b>
58+
<span>{{ collector.env }}</span>
59+
</div>
60+
<div class="sf-toolbar-info-piece">
61+
<b>Debug</b>
62+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}">{{ collector.debug ? 'en' : 'dis' }}abled</span>
63+
</div>
6864
<div class="sf-toolbar-info-piece">
6965
<b>Token</b>
7066
<span>

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@
44
.sf-toolbarreset {
55
position: fixed;
66
background-color: #f7f7f7;
7+
78
{% if position == 'bottom' %}
89
background-image: -moz-linear-gradient(-90deg, #e4e4e4, #ffffff);
910
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e4e4e4), to(#ffffff));
1011
bottom: 0;
12+
border-top: 1px solid #bbb;
1113
{% else %} {# top #}
1214
background-image: -moz-linear-gradient(-90deg, #ffffff, #e4e4e4);
1315
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#e4e4e4));
1416
top: 0;
17+
border-bottom: 1px solid #bbb;
1518
{% endif %}
19+
1620
left: 0;
1721
right: 0;
1822
height: 38px;
1923
margin: 0;
2024
padding: 0 40px 0 0;
2125
z-index: 6000000;
22-
border-top: 1px solid #bbb;
2326
font: 11px Verdana, Arial, sans-serif;
2427
text-align: left;
2528
color: #2f2f2f;
@@ -77,10 +80,17 @@
7780
.sf-toolbar-block .sf-toolbar-info {
7881
display: none;
7982
position: absolute;
80-
bottom: 38px;
8183
background-color: #fff;
8284
border: 1px solid #bbb;
83-
border-bottom: 1px solid #fff;
85+
86+
{% if position == 'bottom' %}
87+
bottom: 38px;
88+
border-bottom: 1px solid #fff;
89+
{% else %}
90+
top: 38px;
91+
border-top: 1px solid #fff;
92+
{% endif %}
93+
8494
padding: 5px 8px;
8595
margin-left: -1px;
8696 7558
}
@@ -151,8 +161,7 @@
151161
'collector': profile.getcollector(name),
152162
'profiler_url': profiler_url,
153163
'token': profile.token,
154-
'name': name,
155-
'verbose': verbose
164+
'name': name
156165
})
157166
}}
158167
{% endfor %}

0 commit comments

Comments
 (0)
0