8000 Made the toolbar to show the version, memory usage, the state of secu… · ostrolucky/symfony@d5e0ccc · GitHub
[go: up one dir, main page]
Skip to content

Commit d5e0ccc

Browse files
shiroyukishiroyuki
committed
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.
1 parent 37ad8a6 commit d5e0ccc

File tree

6 files changed

+72
-27
lines changed

6 files changed

+72
-27
lines changed

‎src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,24 @@
22

33
{% block toolbar %}
44
{% set icon %}
5-
<img width="24" height="28" alt="Security" style="border-width: 0; vertical-align: middle; margin-right: 5px;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAAC70lEQVR42u2V3UtTYRzHu+mFwCwK+gO6CEryPlg7yiYx50vDqUwjFIZDSYUk2ZTmCysHvg9ZVggOQZiRScsR4VwXTjEwdKZWk8o6gd5UOt0mbev7g/PAkLONIOkiBx+25/v89vuc85zn2Q5Fo9F95UDwnwhS5HK5TyqVRv8m1JN6k+AiC+fn54cwbgFNIrTQ/J9IqDcJJDGBHsgDgYBSq9W6ysvLPf39/SSUUU7zsQ1yc3MjmN90OBzfRkZG1umzQqGIxPSTkIBjgdDkaGNjoza2kcFgUCE/QvMsq6io2PV6vQu1tbV8Xl7etkql2qqvr/+MbDE/Pz8s9OP2Cjhwwmw29+4R3Kec1WZnZ4fn5uamc3Jyttra2qbH8ero6JgdHh5+CvFHq9X6JZHgzODgoCVW0NPTY0N+ltU2Nzdv4GqXsYSrPp+vDw80aLFYxru6uhyQ/rDb7a8TCVJDodB1jUazTVlxcXGQ5/mbyE+z2u7u7veY38BVT3Z2djopm5qa6isrK/tQWVn5qb29fSGR4DC4PDAwMEsZHuArjGnyGKutq6v7ajQaF6urq9/MzMz0QuSemJiwQDwGkR0POhhXgILjNTU1TaWlpTxlOp1uyWQyaUjMajMzM8Nut/tJQUHBOpZppbCwkM/KytrBznuL9xDVxBMo8KXHYnu6qKjIivmrbIy67x6Px4Yd58W672ApfzY0NCyNjo7OZmRkiAv8fr+O47iwmABXtoXaG3uykF6vX7bZbF6cgZWqqiqezYkKcNtmjO+CF2AyhufgjsvlMiU7vXEF+4C4ALf9CwdrlVAqlcFkTdRqdQSHLUDgBEeSCrArAsiGwENs0XfJBE6ncxm1D8Aj/B6tigkkJSUlmxSwLYhMDeRsyyUCd+lHrWxtbe2aTCbbZTn1ZD92F0Cr8GBfgnsgDZwDt8EzMBmHMXBLqD0PDMAh9Gql3iRIESQSIAXp4CRIBZeEjIvDFZAm1J4C6UK9ROiZcvCn/+8FvwHtDdJEaRY+oQAAAABJRU5ErkJggg==" />
5+
<img width="24" height="28" alt="Security" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAAC70lEQVR42u2V3UtTYRzHu+mFwCwK+gO6CEryPlg7yiYx50vDqUwjFIZDSYUk2ZTmCysHvg9ZVggOQZiRScsR4VwXTjEwdKZWk8o6gd5UOt0mbev7g/PAkLONIOkiBx+25/v89vuc85zn2Q5Fo9F95UDwnwhS5HK5TyqVRv8m1JN6k+AiC+fn54cwbgFNIrTQ/J9IqDcJJDGBHsgDgYBSq9W6ysvLPf39/SSUUU7zsQ1yc3MjmN90OBzfRkZG1umzQqGIxPSTkIBjgdDkaGNjoza2kcFgUCE/QvMsq6io2PV6vQu1tbV8Xl7etkql2qqvr/+MbDE/Pz8s9OP2Cjhwwmw29+4R3Kec1WZnZ4fn5uamc3Jyttra2qbH8ero6JgdHh5+CvFHq9X6JZHgzODgoCVW0NPTY0N+ltU2Nzdv4GqXsYSrPp+vDw80aLFYxru6uhyQ/rDb7a8TCVJDodB1jUazTVlxcXGQ5/mbyE+z2u7u7veY38BVT3Z2djopm5qa6isrK/tQWVn5qb29fSGR4DC4PDAwMEsZHuArjGnyGKutq6v7ajQaF6urq9/MzMz0QuSemJiwQDwGkR0POhhXgILjNTU1TaWlpTxlOp1uyWQyaUjMajMzM8Nut/tJQUHBOpZppbCwkM/KytrBznuL9xDVxBMo8KXHYnu6qKjIivmrbIy67x6Px4Yd58W672ApfzY0NCyNjo7OZmRkiAv8fr+O47iwmABXtoXaG3uykF6vX7bZbF6cgZWqqiqezYkKcNtmjO+CF2AyhufgjsvlMiU7vXEF+4C4ALf9CwdrlVAqlcFkTdRqdQSHLUDgBEeSCrArAsiGwENs0XfJBE6ncxm1D8Aj/B6tigkkJSUlmxSwLYhMDeRsyyUCd+lHrWxtbe2aTCbbZTn1ZD92F0Cr8GBfgnsgDZwDt8EzMBmHMXBLqD0PDMAh9Gql3iRIESQSIAXp4CRIBZeEjIvDFZAm1J4C6UK9ROiZcvCn/+8FvwHtDdJEaRY+oQAAAABJRU5ErkJggg==" />
6+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.enabled and collector.user ? 'green' : 'red' }}">
7+
{% if collector.user %}
8+
{{ collector.user }}
9+
{% elseif collector.enabled %}
10+
?
11+
{% else %}
12+
X
13+
{% endif %}
14+
</span>
615
{% endset %}
716
{% set text %}
817
{% if collector.user %}
9-
{{ collector.user }} {% if not collector.authenticated %}<em>(not auth.)</em>{% endif %}
18+
You are logged in as {{ collector.user }}{% if not collector.authenticated %} <em>(not yet authenticated)</em>{% endif %}.
1019
{% elseif collector.enabled %}
11-
not authenticated
20+
You are not authenticated.
1221
{% else %}
13-
disabled
22+
The security is disabled.
1423
{% endif %}
1524
{% endset %}
1625
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/toolbar.css

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ build: 56
7373
background-color: #fff;
7474
border: 1px solid #bbb;
7575
border-top: 1px solid #fff;
76-
padding: 5px 8px;
76+
padding: 10px 8px;
7777
margin-left: -1px;
7878
}
7979

@@ -87,6 +87,13 @@ build: 56
8787
background-color: #333;
8888
padding: 3px 6px;
8989
border-radius: 3px;
90+
margin-bottom: 2px;
91+
vertical-align: middle;
92+
}
93+
94+
.sf-toolbar-block .sf-toolbar-icon .sf-toolbar-status {
95+
border-radius: 12px;
96+
border-bottom-left-radius: 0px;
9097
}
9198

9299
.sf-toolbar-block .sf-toolbar-status-green {
@@ -119,7 +126,18 @@ build: 56
119126
.sf-toolbar-block .sf-toolbar-icon img + span {
120127
margin-left: 5px;
121128
}
122-
129+
130+
.sf-toolbar-info-php {}
131+
.sf-toolbar-info-php-ext {}
132+
133+
.sf-toolbar-info-php-ext .sf-toolbar-status {
134+
margin-left: 2px;
135+
}
136+
137+
.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
138+
margin-left: 0;
139+
}
140+
123141
.sf-toolbarreset:hover {
124142
box-shadow: rgba(0, 0, 0, 0.3) 0 0 50px;
125143
}

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,13 @@
22

33
{% block toolbar %}
44
{% set icon %}
5-
<style type="text/css">
6-
.sf-toolbar-info-php {
7-
}
8-
9-
.sf-toolbar-info-php-ext {
10-
}
11-
12-
.sf-toolbar-info-php-ext .sf-toolbar-status {
13-
margin-left: 2px;
14-
}
15-
16-
.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
17-
margin-left: 0;
18-
}
19-
</style>
20-
215
<a href="http://symfony.com/">
226
<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"/>
23-
</a>
7+
<span>{{ collector.symfonyversion }}</span>
8+
</a>
249
{% endset %}
25-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false, 'text': collector.symfonyversion } %}
10+
{% set text %}{% endset %}
11+
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
2612

2713
{% set icon %}
2814
<span>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{% set icon %}
55
<span>
66
<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>
78
</span>
89
{% endset %}
910
{% set text %}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
<img width="16" height="28" alt="Time" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAcCAYAAABoMT8aAAABqUlEQVR42t2Vv0sCYRyHX9OmEhsMx/YKGlwLQ69DTEUSBJEQEy5J3FRc/BsuiFqEIIcQIRo6ysUhoaBBWhoaGoJwiMJLglRKrs8bXgienmkQdPDAwX2f57j3fhFJkkbiPwTK5bIiFoul3kmPud8MqKMewDXpwuGww+12n9hsNhFnlijYf/Z4PDmO45Yxo+10ZFGTyWRMEItU6AdCx7lczkgd6n7J2Wx2xm63P6jJMk6n80YQBBN1aUDv9XqvlAbbm2LE7/cLODRB0un0VveAeoDC8/waCQQC18MGQqHQOcEKvw8bcLlcL6TfYnVtCrGRAlartUUYhmn1jKg/E3USjUYfhw3E4/F7ks/nz4YNFIvFQ/ogbUYikdefyqlU6gnuOg2YK5XKvs/n+xhUDgaDTVEUt+HO04ABOBA5isViDTU5kUi81Wq1AzhWMEkDGmAEq2C3UCjcYXGauDvfEsuyUjKZbJRKpVvM8IABU9SVX+cxYABmwIE9cFqtVi9xtgvsC2AHbIAFoKey0gdlHEyDObAEWLACFsEsMALdIJ80+dK0bTS95v7+v/AJnis0eO906QwAAAAASUVORK5CYII="/>
1919
<span>{{ '%.0f'|format(collector.totaltime) }} ms</span>
2020
{% endset %}
21-
{% set text %}{% endset %}
21+
{% set text %}
22+
<div class="sf-toolbar-info-piece">
23+
<b>Total time</b>
24+
<span>{{ '%.0f'|format(collector.totaltime) }} ms</span>
25+
</div>
26+
{% endset %}
2227
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
2328
{% endblock %}
2429

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

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
border-right: 1px solid #cdcdcd;
4848
padding: 0;
4949
float: left;
50+
cursor: default;
5051
}
5152
5253
.sf-toolbar-block span {
@@ -91,7 +92,7 @@
9192
border-top: 1px solid #fff;
9293
{% endif %}
9394
94-
padding: 5px 8px;
95+
padding: 10px 8px;
9596
margin-left: -1px;
9697
}
9798
@@ -105,6 +106,13 @@
105106
background-color: #333;
106107
padding: 3px 6px;
107108
border-radius: 3px;
109+
margin-bottom: 2px;
110+
vertical-align: middle;
111+
}
112+
113+
.sf-toolbar-block .sf-toolbar-icon .sf-toolbar-status {
114+
border-radius: 12px;
115+
border-bottom-left-radius: 0px;
108116
}
109117
110118
.sf-toolbar-block .sf-toolbar-status-green {
@@ -127,6 +135,13 @@
127135
padding: 5px 8px;
128136
min-width: 20px;
129137
text-align: center;
138+
vertical-align: middle;
139+
}
140+
141+
.sf-toolbar-block .sf-toolbar-icon > a,
142+
.sf-toolbar-block .sf-toolbar-icon > a:link
143+
.sf-toolbar-block .sf-toolbar-icon > a:hover {
144+
color: black !important;
130145
}
131146
132147
.sf-toolbar-block .sf-toolbar-icon img {
@@ -138,6 +153,17 @@
138153
margin-left: 5px;
139154
}
140155
156+
.sf-toolbar-info-php {}
157+
.sf-toolbar-info-php-ext {}
158+
159+
.sf-toolbar-info-php-ext .sf-toolbar-status {
160+
margin-left: 2px;
161+
}
162+
163+
.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
164+
margin-left: 0;
165+
}
166+
141167
.sf-toolbarreset:hover {
142168
box-shadow: rgba(0, 0, 0, 0.3) 0 0 50px;
143169
}
@@ -149,7 +175,7 @@
149175
.sf-toolbar-block:hover .sf-toolbar-icon {
150176
background-color: #fff;
151177
}
152-
.sf-toolbar-block:hover .sf-toolbar-icon + .sf-toolbar-info {
178+
.sf-toolbar-block:hover .sf-toolbar-info {
153179
display: block;
154180
}
155181
</style>

0 commit comments

Comments
 (0)
0