More fixes and tweaks

This commit is contained in:
Javier Eguiluz 2015-07-08 12:13:55 +02:00
parent 51a79c92e6
commit ef53850cb3
4 changed files with 31 additions and 24 deletions

View File

@ -146,6 +146,7 @@ class TemplateManager
*/
protected function reorderTemplates($templates)
{
$templates = $this->moveArrayElementToFirstPosition($templates, 'twig');
$templates = $this->moveArrayElementToFirstPosition($templates, 'memory');
$templates = $this->moveArrayElementToFirstPosition($templates, 'time');
$templates = $this->moveArrayElementToFirstPosition($templates, 'request');

View File

@ -33,14 +33,6 @@
{% endset %}
{% set text %}
{% if collector.symfonyversion is defined %}
<div class="sf-toolbar-info-piece">
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
Read Symfony {{ collector.symfonyversion }} Docs
</a>
</div>
{% endif %}
{% if collector.applicationname %}
<div class="sf-toolbar-info-piece">
{{ collector.applicationname }} <b>{{ collector.applicationversion }}</b>
@ -94,6 +86,15 @@
<b>PHP SAPI</b>
<span>{{ collector.sapiName }}</span>
</div>
{% if collector.symfonyversion is defined %}
<div class="sf-toolbar-info-piece">
<b>Resources</b>
<a href="https://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">
Read Symfony {{ collector.symfonyversion }} Docs
</a>
</div>
{% endif %}
{% endset %}
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false, status: block_status }) }}

View File

@ -21,17 +21,19 @@
{% set icon %}
<span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}">{{ collector.statuscode }}</span>
<span class="sf-toolbar-value sf-toolbar-info-piece-additional">{{ request_handler }}</span>
<span class="sf-toolbar-label">@</span>
<span class="sf-toolbar-value sf-toolbar-info-piece-additional">{{ collector.route }}</span>
{% endset %}
{% set text %}
{% spaceless %}
<div class="sf-toolbar-info-piece">
<b>HTTP status</b>
<span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}">{{ collector.statuscode }}</span> {{ collector.statustext }}
<span>{{ collector.statuscode }} {{ collector.statustext }}</span>
</div>
<div class="sf-toolbar-info-piece">
<b>Controller method</b>
{{ request_handler }}
<span>{{ request_handler }}</span>
</div>
<div class="sf-toolbar-info-piece">
<b>Controller file</b>
@ -47,6 +49,7 @@
</div>
{% endspaceless %}
{% endset %}
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }}
{% endblock %}

View File

@ -120,15 +120,19 @@
opacity: .8;
}
.sf-toolbar-block .sf-toolbar-info {
display: table;
}
.sf-toolbar-block .sf-toolbar-info-piece {
display: table-row;
line-height: 1.4;
margin-bottom: 8px;
}
.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
padding: 0px 5px;
border-radius: 0;
padding: 2px 5px;
margin-bottom: 0px;
vertical-align: top;
}
.sf-toolbar-block .sf-toolbar-info-piece:last-child {
@ -145,10 +149,12 @@
.sf-toolbar-block .sf-toolbar-info-piece b {
color: #AAA;
display: inline-block;
display: table-cell;
font-size: 11px;
min-width: 110px;
vertical-align: top;
padding: 4px 8px 4px 4px;
}
.sf-toolbar-block .sf-toolbar-info-piece span {
}
.sf-toolbar-block .sf-toolbar-info-piece span,
.sf-toolbar-block .sf-toolbar-info-piece abbr {
@ -196,7 +202,7 @@
background-color: #759e1a;
}
.sf-toolbar-block .sf-toolbar-status-red {
background-color: rgba(200,0,0, 0.8);
background-color: rgba(200, 0, 0, 0.8);
}
.sf-toolbar-block .sf-toolbar-status-yellow {
background-color: #ffcc00;
@ -211,7 +217,7 @@
color: #FFF;
}
.sf-toolbar-block.sf-toolbar-status-red {
background-color: rgba(200,0,0, 0.8);
background-color: rgba(200, 0, 0, 0.8);
color: #FFF;
}
.sf-toolbar-block.sf-toolbar-status-red svg > g > path {
@ -292,12 +298,8 @@
.sf-toolbar-info-php {}
.sf-toolbar-info-php-ext {}
.sf-toolbar-info-php-ext .sf-toolbar-status {
margin-left: 2px;
}
.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
margin-left: 0;
.sf-toolbar-info-php-ext .sf-toolbar-status + .sf-toolbar-status {
margin-left: 4px;
}
.sf-toolbar-block a .sf-toolbar-info-piece-additional,