Skip to content

Commit 9d64747

Browse files
stofstof
committed
feature #445 Update collector template for the new toolbar design (javiereguiluz)
This PR was squashed before being merged into the 1.6.x-dev branch (closes #445). Discussion ---------- Update collector template for the new toolbar design Symfony is redesigning its toolbar for 2.8+ versions (see symfony/symfony#15160). We need to update Doctrine toolbar panel too. @stof told me to not change the current HTML markup, so that's why I include two different contents depending on the Symfony version. Commits ------- 0a0d67e Update collector template for the new toolbar design
2 parents bb631e2 + 0a0d67e commit 9d64747

File tree

2 files changed

+50
-16
lines changed

2 files changed

+50
-16
lines changed

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

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,55 @@
11
{% extends app.request.isXmlHttpRequest ? 'WebProfilerBundle:Profiler:ajax_layout.html.twig' : 'WebProfilerBundle:Profiler:layout.html.twig' %}
22

33
{% block toolbar %}
4+
{% set profiler_markup_version = profiler_markup_version|default(1) %}
5+
46
{% set icon %}
5-
<img width="20" height="28" alt="Database" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQRJREFUeNpi/P//PwM1ARMDlcGogZQDlpMnT7pxc3NbA9nhQKxOpL5rQLwJiPeBsI6Ozl+YBOOOHTv+AOllQNwtLS39F2owKYZ/gRq8G4i3ggxEToggWzvc3d2Pk+1lNL4fFAs6ODi8JzdS7mMRVyDVoAMHDsANdAPiOCC+jCQvQKqBQB/BDbwBxK5AHA3E/kB8nKJkA8TMQBwLxaBIKQbi70AvTADSBiSadwFXpCikpKQU8PDwkGTaly9fHFigkaKIJid4584dkiMFFI6jkTJII0WVmpHCAixZQEXWYhDeuXMnyLsVlEQKI45qFBQZ8eRECi4DBaAlDqle/8A48ip6gAADANdQY88Uc0oGAAAAAElFTkSuQmCC" />
6-
<span class="sf-toolbar-status{% if 50 < collector.querycount %} sf-toolbar-status-yellow{% endif %}">{{ collector.querycount }}</span>
7-
{% if collector.querycount > 0 %}
8-
<span class="sf-toolbar-info-piece-additional-detail">in {{ '%0.2f'|format(collector.time * 1000) }} ms</span>
9-
{% endif %}
10-
{% if collector.invalidEntityCount > 0 %}
11-
<span class="sf-toolbar-info-piece-additional sf-toolbar-status sf-toolbar-status-red">{{ collector.invalidEntityCount }}</span>
12-
{% endif %}
13-
{% if collector.cacheEnabled %}
14-
<span class="sf-toolbar-info-piece-additional sf-toolbar-status sf-toolbar-status-green" title="Second level cache enabled">2l cache</span>
7+
{% if profiler_markup_version == 1 %}
8+
9+
<img width="20" height="28" alt="Database" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQRJREFUeNpi/P//PwM1ARMDlcGogZQDlpMnT7pxc3NbA9nhQKxOpL5rQLwJiPeBsI6Ozl+YBOOOHTv+AOllQNwtLS39F2owKYZ/gRq8G4i3ggxEToggWzvc3d2Pk+1lNL4fFAs6ODi8JzdS7mMRVyDVoAMHDsANdAPiOCC+jCQvQKqBQB/BDbwBxK5AHA3E/kB8nKJkA8TMQBwLxaBIKQbi70AvTADSBiSadwFXpCikpKQU8PDwkGTaly9fHFigkaKIJid4584dkiMFFI6jkTJII0WVmpHCAixZQEXWYhDeuXMnyLsVlEQKI45qFBQZ8eRECi4DBaAlDqle/8A48ip6gAADANdQY88Uc0oGAAAAAElFTkSuQmCC" />
10+
<span class="sf-toolbar-value sf-toolbar-status {% if collector.querycount > 50 %}sf-toolbar-status-yellow{% endif %}">{{ collector.querycount }}</span>
11+
{% if collector.querycount > 0 %}
12+
<span class="sf-toolbar-info-piece-additional-detail">in {{ '%0.2f'|format(collector.time * 1000) }} ms</span>
13+
{% endif %}
14+
{% if collector.invalidEntityCount > 0 %}
15+
<span class="sf-toolbar-info-piece-additional sf-toolbar-status sf-toolbar-status-red">{{ collector.invalidEntityCount }}</span>
16+
{% endif %}
17+
18+
{% else %}
19+
20+
{% if collector.querycount > 0 or collector.invalidEntityCount > 0 %}
21+
{% set status = collector.invalidEntityCount > 0 ? 'red' : collector.querycount > 50 ? 'yellow' : '' %}
22+
23+
{{ include('@Doctrine/Collector/icon.svg') }}
24+
25+
{% if collector.querycount == 0 and collector.invalidEntityCount > 0 %}
26+
<span class="sf-toolbar-value">{{ collector.invalidEntityCount }}</span>
27+
<span class="sf-toolbar-label">errors</span>
28+
{% else %}
29+
<span class="sf-toolbar-value">{{ collector.querycount }}</span>
30+
<span class="sf-toolbar-info-piece-additional-detail">
31+
<span class="sf-toolbar-label">in</span>
32+
<span class="sf-toolbar-value">{{ '%0.2f'|format(collector.time * 1000) }}</span>
33+
<span class="sf-toolbar-label">ms</span>
34+
</span>
35+
{% endif %}
36+
37+
{% endif %}
1538
{% endif %}
1639
{% endset %}
40+
1741
{% set text %}
1842
<div class="sf-toolbar-info-piece">
19-
<b>DB Queries</b>
20-
<span>{{ collector.querycount }}</span>
43+
<b>Database Queries</b>
44+
<span class="sf-toolbar-status">{{ collector.querycount }}</span>
2145
</div>
2246
<div class="sf-toolbar-info-piece">
2347
<b>Query time</b>
2448
<span>{{ '%0.2f'|format(collector.time * 1000) }} ms</span>
2549
</div>
2650
<div class="sf-toolbar-info-piece">
2751
<b>Invalid entities</b>
28-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.invalidEntityCount > 0 ? 'red' : 'green' }}">{{ collector.invalidEntityCount }}</span>
52+
<span class="sf-toolbar-status {{ collector.invalidEntityCount > 0 ? 'sf-toolbar-status-red' : '' }}">{{ collector.invalidEntityCount }}</span>
2953
</div>
3054
{% if collector.cacheEnabled %}
3155
<div class="sf-toolbar-info-piece">
@@ -34,15 +58,21 @@
3458
</div>
3559
<div class="sf-toolbar-info-piece">
3660
<b>Cache misses</b>
37-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.cacheMissesCount > 0 ? 'yellow' : 'green' }}">{{ collector.cacheMissesCount }}</span>
61+
<span class="sf-toolbar-status {{ collector.cacheMissesCount > 0 ? 'sf-toolbar-status-yellow' : '' }}">{{ collector.cacheMissesCount }}</span>
3862
</div>
3963
<div class="sf-toolbar-info-piece">
4064
<b>Cache puts</b>
41-
<span class="sf-toolbar-status sf-toolbar-status-{{ collector.cachePutsCount > 0 ? 'yellow' : 'green' }}">{{ collector.cachePutsCount }}</span>
65+
<span class="sf-toolbar-status {{ collector.cachePutsCount > 0 ? 'sf-toolbar-status-yellow' : '' }}">{{ collector.cachePutsCount }}</span>
66+
</div>
67+
{% else %}
68+
<div class="sf-toolbar-info-piece">
69+
<b>Second Level Cache</b>
70+
<span class="sf-toolbar-status">disabled</span>
4271
</div>
4372
{% endif %}
4473
{% endset %}
45-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
74+
75+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url, status: status|default('') }) }}
4676
{% endblock %}
4777

4878
{% block menu %}

‎Resources/views/Collector/icon.svg

Lines changed: 4 additions & 0 deletions
Loading

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