Skip to content

Commit 64b8f38

Browse files
javiereguiluzjaviereguiluz
committed
A new batch of updates
1 parent 4eee931 commit 64b8f38

File tree

11 files changed

+57
-59
lines changed

11 files changed

+57
-59
lines changed

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

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
4-
5-
{# Symfony Information #}
64
{% if 'unknown' == collector.symfonyState %}
75
{% set block_status = '' %}
86
{% set symfony_version_status = 'Unable to retrieve information about the Symfony version.' %}
@@ -21,83 +19,84 @@
2119
{% endif %}
2220

2321
{% set icon %}
24-
{% if collector.applicationname %}
25-
<span class="sf-toolbar-label">{{ collector.applicationname }}</span>
26-
<span class="sf-toolbar-value">{{ collector.applicationversion }}</span>
27-
{% elseif collector.symfonyState is defined %}
22+
{% if collector.symfonyState is defined %}
2823
<a href="https://symfony.com/" title="{{ symfony_version_status }}">
29-
<span class="sf-toolbar-label">symfony</span>
24+
<span class="sf-toolbar-label">
25+
{{ include('@WebProfiler/Icon/symfony.svg.twig') }}
26+
</span>
3027
<span class="sf-toolbar-value">{{ collector.symfonyversion }}</span>
3128
</a>
29+
{% elseif collector.applicationname %}
30+
<span class="sf-toolbar-label">{{ collector.applicationname }}</span>
31+
<span class="sf-toolbar-value">{{ collector.applicationversion }}</span>
3232
{% endif %}
3333
{% endset %}
34+
3435
{% set text %}
36+
{% if collector.symfonyversion is defined %}
37+
<div class="sf-toolbar-info-piece">
38+
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
39+
Read Symfony {{ collector.symfonyversion }} Docs
40+
</a>
41+
</div>
42+
{% endif %}
43+
3544
{% if collector.applicationname %}
3645
<div class="sf-toolbar-info-piece">
3746
{{ collector.applicationname }} <b>{{ collector.applicationversion }}</b>
3847
</div>
3948
{% endif %}
49+
4050
<div class="sf-toolbar-info-piece">
41-
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
42-
Read Symfony {{ collector.symfonyversion }} Docs
43-
</a>
51+
<b>Profiler token</b>
52+
<span>
53+
{% if profiler_url %}
54+
<a href="{{ profiler_url }}">{{ collector.token }}</a>
55+
{% else %}
56+
{{ collector.token }}
57+
{% endif %}
58+
</span>
4459
</div>
60+
4561
{% if 'n/a' != collector.appname %}
4662
<div class="sf-toolbar-info-piece">
4763
<b>Kernel name</b>
4864
<span>{{ collector.appname }}</span>
4965
</div>
5066
{% endif %}
67+
5168
{% if 'n/a' != collector.env %}
5269
<div class="sf-toolbar-info-piece">
5370
<b>Environment</b>
5471
<span>{{ collector.env }}</span>
5572
</div>
5673
{% endif %}
74+
5775
{% if 'n/a' != collector.debug %}
5876
<div class="sf-toolbar-info-piece">
5977
<b>Debug</b>
60-
<span class="{{ debug_status_class }}">{{ collector.debug ? 'en' : 'dis' }}abled</span>
78+
<span class="{{ debug_status_class }}">{{ collector.debug ? 'enabled' : 'disabled' }}</span>
6179
</div>
6280
{% endif %}
81+
82+
<div class="sf-toolbar-info-piece sf-toolbar-info-php">
83+
<b>PHP version</b>
84+
<span>{{ collector.phpversion }}</span>
85+
</div>
86+
87+
<div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
88+
<b>PHP Extensions</b>
89+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
90+
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
91+
</div>
92+
6393
<div class="sf-toolbar-info-piece">
64-
<b>Profiler token</b>
65-
<span>
66-
{% if profiler_url %}
67-
<a href="{{ profiler_url }}">{{ collector.token }}</a>
68-
{% else %}
69-
{{ collector.token }}
70-
{% endif %}
71-
</span>
94+
<b>PHP SAPI</b>
95+
<span>{{ collector.sapiName }}</span>
7296
</div>
7397
{% endset %}
74-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false, 'block_name': 'config-symfony', 'block_status': block_status } %}
7598

76-
{# PHP Information #}
77-
{% set icon %}
78-
<a href="{{ path('_profiler_phpinfo') }}">
79-
<span class="sf-toolbar-label">php</span>
80-
<span class="sf-toolbar-value">{{ collector.phpversion }}</span>
81-
</a>
82-
{% endset %}
83-
{% set text %}
84-
{% spaceless %}
85-
<div class="sf-toolbar-info-piece sf-toolbar-info-php">
86-
<b>PHP</b>
87-
<span>{{ collector.phpversion }}</span>
88-
</div>
89-
<div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
90-
<b>PHP Extensions</b>
91-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
92-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
93-
</div>
94-
<div class="sf-toolbar-info-piece">
95-
<b>PHP SAPI</b>
96-
<span>{{ collector.sapiName }}</span>
97-
</div>
98-
{% endspaceless %}
99-
{% endset %}
100-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false, 'block_name': 'config-php' } %}
99+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: block_status }) }}
101100
{% endblock %}
102101

103102
{% block menu %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</span>
1616
{% endset %}
1717

18-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': collector.data.nb_errors ? 'red' : '' } %}
18+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: collector.data.nb_errors ? 'red' : '' }) }}
1919
{% endif %}
2020
{% endblock %}
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</div>
3131
{% endif %}
3232
{% endset %}
33-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': status_color } %}
33+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
3434
{% endif %}
3535
{% endblock %}
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
<span>{{ collector.memoryLimit == -1 ? '&infin;' : '%.1f'|format(collector.memoryLimit / 1024 / 1024)|escape }} MB</span>
2020
</div>
2121
{% endset %}
22-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false, 'block_status': status_color } %}
22+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: status_color }) }}
2323
{% endblock %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</div>
4848
{% endspaceless %}
4949
{% endset %}
50-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
50+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
5151
{% endblock %}
5252

5353
{% block menu %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<span>{{ duration }} ms</span>
2929
</div>
3030
{% endset %}
31-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': status_color } %}
31+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
3232
{% endblock %}
3333

3434
{% block menu %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</div>
3232
{% endif %}
3333
{% endset %}
34-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url, 'block_status': status_color } %}
34+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status_color }) }}
3535
{% endif %}
3636
{% endblock %}
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<span>{{ collector.macrocount }}</span>
2828
</div>
2929
{% endset %}
30-
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
30+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
3131
{% endblock %}
3232

3333
{% block menu %}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@
8484
.sf-toolbar-block a:hover {
8585
text-decoration: none;
8686
}
87-
.sf-toolbar-block-config-symfony,
88-
.sf-toolbar-block-config-php {
87+
.sf-toolbar-block-config {
8988
float: right;
9089
margin-left: 0;
9190
margin-right: 0;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
1616
Sfjs.setPreference('toolbar/displayState', 'block');
1717
">
18-
<svg width="26" height="28" xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 26 28" enable-background="new 0 0 26 28" xml:space="preserve"><path fill="#FFFFFF" d="M13 0C5.8 0 0 5.8 0 13c0 7.2 5.8 13 13 13c7.2 0 13-5.8 13-13C26 5.8 20.2 0 13 0z M20 7.5 c-0.6 0-1-0.3-1-0.9c0-0.2 0-0.4 0.2-0.6c0.1-0.3 0.2-0.3 0.2-0.4c0-0.3-0.5-0.4-0.7-0.4c-2 0.1-2.5 2.7-2.9 4.8l-0.2 1.1 c1.1 0.2 1.9 0 2.4-0.3c0.6-0.4-0.2-0.8-0.1-1.3C18 9.2 18.4 9 18.7 8.9c0.5 0 0.8 0.5 0.8 1c0 0.8-1.1 2-3.3 1.9 c-0.3 0-0.5 0-0.7-0.1L15 14.1c-0.4 1.7-0.9 4.1-2.6 6.2c-1.5 1.8-3.1 2.1-3.8 2.1c-1.3 0-2.1-0.6-2.2-1.6c0-0.9 0.8-1.4 1.3-1.4 c0.7 0 1.2 0.5 1.2 1.1c0 0.5-0.2 0.6-0.4 0.7c-0.1 0.1-0.3 0.2-0.3 0.4c0 0.1 0.1 0.3 0.4 0.3c0.5 0 0.9-0.3 1.2-0.5 c1.3-1 1.7-2.9 2.4-6.2l0.1-0.8c0.2-1.1 0.5-2.3 0.8-3.5c-0.9-0.7-1.4-1.5-2.6-1.8c-0.8-0.2-1.3 0-1.7 0.4C8.4 10 8.6 10.7 9 11.1 l0.7 0.7c0.8 0.9 1.3 1.7 1.1 2.7c-0.3 1.6-2.1 2.8-4.3 2.1c-1.9-0.6-2.2-1.9-2-2.7c0.2-0.6 0.7-0.8 1.2-0.6 c0.5 0.2 0.7 0.8 0.6 1.3c0 0.1 0 0.1-0.1 0.3C6 15 5.9 15.2 5.9 15.3c-0.1 0.4 0.4 0.7 0.8 0.8c0.8 0.3 1.7-0.2 1.9-0.9 c0.2-0.6-0.2-1.1-0.4-1.2l-0.8-0.9c-0.4-0.4-1.2-1.5-0.8-2.8c0.2-0.5 0.5-1 0.9-1.4c1-0.7 2-0.8 3-0.6c1.3 0.4 1.9 1.2 2.8 1.9 c0.5-1.3 1.1-2.6 2-3.8c0.9-1 2-1.7 3.3-1.8C20 4.8 21 5.4 21 6.3C21 6.7 20.8 7.5 20 7.5z"/></svg>
18+
{{ include('@WebProfiler/Icon/symfony.svg.twig') }}
1919
</a>
2020
</div>
2121
<style>
22-
{% include '@WebProfiler/Profiler/toolbar.css.twig' with { 'position': position, 'floatable': true } %}
22+
{{ include('@WebProfiler/Profiler/toolbar.css.twig', { 'position': position, 'floatable': true }) }}
2323
</style>
2424
<div id="sfToolbarClearer-{{ token }}" style="clear: both; height: 38px;"></div>
2525
{% endif %}
@@ -43,7 +43,7 @@
4343
document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'block';
4444
Sfjs.setPreference('toolbar/displayState', 'none');
4545
">
46-
<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="#AAA" d="M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z" /></svg>
46+
{{ include('@WebProfiler/Icon/close.svg.twig') }}
4747
</a>
4848
{% endif %}
4949
</div>

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