10000 [WebProfilerBundle] changed all includes to use the new Twig's notation · s7ntech/symfony@c656322 · GitHub
[go: up one dir, main page]
Skip to content

Commit c656322

Browse files
fabpotfabpot
committed
[WebProfilerBundle] changed all includes to use the new Twig's notation
1 parent dbcd171 commit c656322

15 files changed

+40
-40
lines changed

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

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

33
{% block toolbar %}
44
{# Symfony Logo #}
@@ -16,7 +16,7 @@
1616
<a href="http://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">Documentation</a>
1717
</div>
1818
{% endset %}
19-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
19+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false } %}
2020

2121
{# PHP Information #}
2222
{% set icon %}
@@ -37,7 +37,7 @@
3737
</div>
3838
{% endspaceless %}
3939
{% endset %}
40-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
40+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false } %}
4141

4242
{# Environment #}
4343
{% set debug_status_class %}sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}{% endset %}
@@ -75,7 +75,7 @@
7575
</div>
7676
{% endspaceless %}
7777
{% endset %}
78-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
78+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
7979
{% endblock %}
8080

8181
{% block menu %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% from _self import display_listener %}
44

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block head %}
44
<link rel="stylesheet" href="{{ asset('bundles/framework/css/exception.css') }}" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
44
{% if collector.counterrors %}
@@ -12,7 +12,7 @@
1212
<span class="sf-toolbar-status sf-toolbar-status-yellow">{{ collector.counterrors }}</span>
1313
</div>
1414
{% endset %}
15-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
15+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
1616
{% endif %}
1717
{% endblock %}
1818

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
44
{% set icon %}
@@ -13,5 +13,5 @@
1313
<span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB</span>
1414
</div>
1515
{% endset %}
16-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
16+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false } %}
1717
{% endblock %}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
44
{% set request_handler %}
@@ -40,7 +40,7 @@
4040
</div>
4141
{% endspaceless %}
4242
{% endset %}
43-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
43+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
4444
{% endblock %}
4545

4646
{% block menu %}
@@ -54,7 +54,7 @@
5454
<h2>Request GET Parameters</h2>
5555

5656
{% if collector.requestquery.all|length %}
57-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestquery } only %}
57+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': collector.requestquery } only %}
5858
{% else %}
5959
<p>
6060
<em>No GET parameters</em>
@@ -64,7 +64,7 @@
6464
<h2>Request POST Parameters</h2>
6565

6666
{% if collector.requestrequest.all|length %}
67-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestrequest } only %}
67+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': collector.requestrequest } only %}
6868
{% else %}
6969
<p>
7070
<em>No POST parameters</em>
@@ -74,7 +74,7 @@
7474
<h2>Request Attributes</h2>
7575

7676
{% if collector.requestattributes.all|length %}
77-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestattributes } only %}
77+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': collector.requestattributes } only %}
7878
{% else %}
7979
<p>
8080
<em>No attributes</em>
@@ -84,7 +84,7 @@
8484
<h2>Request Cookies</h2>
8585

8686
{% if collector.requestcookies.all|length %}
87-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestcookies } only %}
87+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': collector.requestcookies } only %}
8888
{% else %}
8989
<p>
9090
<em>No cookies</em>
@@ -93,7 +93,7 @@
9393

9494
<h2>Request Headers</h2>
9595

96-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestheaders } only %}
96+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': collector.requestheaders } only %}
9797

9898
<h2>Request Content</h2>
9999

@@ -107,16 +107,16 @@
107107

108108
<h2>Request Server Parameters</h2>
109109

110-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestserver } only %}
110+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': collector.requestserver } only %}
111111

112112
<h2>Response Headers</h2>
113113

114-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.responseheaders } only %}
114+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': collector.responseheaders } only %}
115115

116116
<h2>Session Metadata</h2>
117117

118118
{% if collector.sessionmetadata|length %}
119-
{% include 'WebProfilerBundle:Profiler:table.html.twig' with { 'data': collector.sessionmetadata } only %}
119+
{% include '@WebProfiler/Profiler/table.html.twig' with { 'data': collector.sessionmetadata } only %}
120120
{% else %}
121121
<p>
122122
<em>No session metadata</em>
@@ -126,7 +126,7 @@
126126
<h2>Session Attributes</h2>
127127

128128
{% if collector.sessionattributes|length %}
129-
{% include 'WebProfilerBundle:Profiler:table.html.twig' with { 'data': collector.sessionattributes } only %}
129+
{% include '@WebProfiler/Profiler/table.html.twig' with { 'data': collector.sessionattributes } only %}
130130
{% else %}
131131
<p>
132132
<em>No session attributes</em>
@@ -136,7 +136,7 @@
136136
<h2>Flashes</h2>
137137

138138
{% if collector.flashes|length %}
139-
{% include 'WebProfilerBundle:Profiler:table.html.twig' with { 'data': collector.flashes } only %}
139+
{% include '@WebProfilerBundle/Profiler/table.html.twig' with { 'data': collector.flashes } only %}
140140
{% else %}
141141
<p>
142142
<em>No flashes</em>
@@ -146,15 +146,15 @@
146146
{% if profile.parent %}
147147
<h2><a href="{{ path('_profiler', { 'token': profile.parent.token }) }}">Parent request: {{ profile.parent.token }}</a></h2>
148148

149-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': profile.parent.getcollector('request').requestattributes } only %}
149+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': profile.parent.getcollector('request').requestattributes } only %}
150150
{% endif %}
151151

152152
{% if profile.children|length %}
153153
<h2>Sub requests</h2>
154154

155155
{% for child in profile.children %}
156156
<h3><a href="{{ path('_profiler', { 'token': child.token }) }}">{{ child.token }}</a></h3>
157-
{% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': child.getcollector('request').requestattributes } only %}
157+
{% include '@WebProfiler/Profiler/bag.html.twig' with { 'bag': child.getcollector('request').requestattributes } only %}
158158
{% endfor %}
159159
{% endif %}
160160

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
44
{% endblock %}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% if colors is not defined %}
44
{% set colors = {
@@ -25,7 +25,7 @@
2525
<span>{{ total_time }}</span>
2626
</div>
2727
{% endset %}
28-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
28+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
2929
{% endblock %}
3030

3131
{% block menu %}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<title>{% block title 'Profiler' %}</title>
77
<link rel="icon" type="image/x-icon" sizes="16x16" href="data:image/ico;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAADIvMQAyLzEIMi8xSzEuMKoyLzHkMi8x/TIvMf0yLzHlMi8xrDIvMU4yLzEJMi8xAAAAAAAAAAAAAAAAADIvMQAyLzEYMS4wkTMwMu45Njj/MS4w/zEuMP8yLzH/Mi8x/zIvMf8yLzHvMi8xlDIvMRkyLzEAAAAAADIvMQAyLzEXMS4wrTk2OPyVk5T7kI6P/nl3ef8+Oz3/MS4w/zIvMf8yLzH/Mi8x/zIvMf4yLzGxMi8xGjIvMQAyLzEGMi8xkDEuMP4/PD79wcDA+oB+gP6Ni4z/paOk/zk2OP8xLjD/Mi8x/zIvMf8yLzH/Mi8x/zIvMZQyLzEIMi8xSTIvMewyLzH/MS4w/z06PP81MjT+TktN/93c3f97eXv/MC0v/zIvMf8yLzH/Mi8x/zIvMf8yLzHuMi8xTzIvMaUyLzH/Mi8x/0lHSf9kYmP/XFpb/zs4Ov/DwsL+ycjI/zs4Ov8xLjD/Mi8x/zIvMf8yLzH/Mi8x/zIvMawyLzHfMC0v/1tYWv+opqf/YV5g/8bFxf96eHn+m5qb/u7u7v9WVFX/MC0v/zIvMf8yLzH/Mi8x/zIvMf8yLzHkMi8x+jAtL/9iYGH/mZiZ/2dlZv/p6On/oJ+g/np4ev/6+vr/dXN1/y0qLP8xLjD/Mi8x/zIvMf8yLzH/Mi8x/DIvMfoyLzH/MzAy/0A+QP7JyMj85eXl/1tYWv9XVVf/8fDx/6qpqv9ZV1j/Q0BC/zIvMf8yLzH/Mi8x/zIvMfwyLzHeMi8x/zEuMP8/PD762dnZ9JWTlP81MjT/ZmRm/+Dg4P/DwsP/YV5g/6Wkpf9BPkD/MS4w/zIvMf8yLzHjMi8xozIvMf8yLzH/Mi8x/nZ0dv2amJn4dXN0+V5bXf+Pjo//0tLS/0hFR/9vbG7/Ozg6/zEuMP8yLzH/Mi8xqTIvMUcyLzHrMi8x/zIvMf8xLjD/Ozg6/Do3OfwwLS//REFD/728vP9nZWb/TktN/4mIif05Nzn/Mi8x7jMwMkwyLzEGMi8xjDIvMf4yLzH/Mi8x/zIvMf8yLzH/Mi8x/zAtL/9XVFb/goGC+Hx6e+6qqanwOzg6/DMwMpJDQEIIMi8xADIvMRUyLzGrMi8x/jIvMf8yLzH/Mi8x/zIvMf8yLzH/MS4w/zg2N/xBPkD3OTY4/DIvMa8yLzEYMi8xAAAAAAAyLzEAMi8xGDIvMY0yLzHqMi8x/zIvMf8yLzH/Mi8x/zIvMf8yLzH/MS4w7DEuMJEyLzEaMi8xAAAAAAAAAAAAAAAAADIvMQAyLzEGMi8xQzIvMZ4yLzHdMi8x+jIvMfoyLzHeMi8xoDIvMUUyLzEGMi8xAAAAAAAAAAAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAA==" />
88
{% block head %}
9-
{% include 'WebProfilerBundle:Profiler:profiler_style.html.twig' %}
9+
{% include '@WebProfiler/Profiler/profiler_style.html.twig' %}
1010
{% endblock %}
11-
{% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': 'top', 'floatable': false } %}
11+
{% include '@WebProfiler/Profiler/toolbar_style.html.twig' with { 'position': 'top', 'floatable': false } %}
1212
</head>
1313
<body>
1414
{% block body '' %}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% extends 'WebProfilerBundle:Profiler:base.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/base.html.twig' %}
22

33
{% block body %}
44
<div id="content">
5-
{% include 'WebProfilerBundle:Profiler:header.html.twig' only %}
5+
{% include '@WebProfiler/Profiler/header.html.twig' only %}
66

77
<div id="main">
88
<div class="clear_fix">
@@ -35,7 +35,7 @@
3535
</div>
3636
<div id="navigation">
3737
{% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': '' } %}
38-
{% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': '' } only %}
38+
{% include '@WebProfiler/Profiler/admin.html.twig' with { 'token': '' } only %}
3939
</div>
4040
</div>
4141
</div>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{% extends 'WebProfilerBundle:Profiler:base.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/base.html.twig' %}
22

33
{% block body %}
44

55
{% render 'WebProfilerBundle:Profiler:toolbar' with { 'token': token, 'position': 'normal' } %}
66

77
<div id="content">
8-
{% include 'WebProfilerBundle:Profiler:header.html.twig' only %}
8+
{% include '@WebProfiler/Profiler/header.html.twig' only %}
99

1010
<div id="main">
1111

@@ -28,7 +28,7 @@
2828
{% endif %}
2929

3030
<div id="collector_content">
31-
{% include 'WebProfilerBundle:Profiler:base_js.html.twig' %}
31+
{% include '@WebProfiler/Profiler/base_js.html.twig' %}
3232
{% block panel '' %}
3333
</div>
3434
</div>
@@ -54,7 +54,7 @@
5454
</ul>
5555
{% endif %}
5656
{% render 'WebProfilerBundle:Profiler:searchBar' %}
57-
{% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': token } only %}
57+
{% include '@WebProfiler/Profiler/admin.html.twig' with { 'token': token } only %}
5858
</div>
5959
</div>
6060
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block panel %}
44
<h2>Search Results</h2>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- START of Symfony2 Web Debug Toolbar -->
22
{% if 'normal' != position %}
3-
{% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': position, 'floatable': true } %}
3+
{% include '@WebProfiler/Profiler/toolbar_style.html.twig' with { 'position': position, 'floatable': true } %}
44
<div id="sfMiniToolbar_{{ token }}" class="sf-minitoolbar">
55
<a href="javascript:void(0);" title="Show Symfony toolbar" onclick="
66
var elem = this.parentNode;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="sfwdt{{ token }}" class="sf-toolbar" style="display: none"></div>
2-
{% include 'WebProfilerBundle:Profiler:base_js.html.twig' %}
2+
{% include '@WebProfiler/Profiler/base_js.html.twig' %}
33
<script type="text/javascript">/*<![CDATA[*/
44
(function () {
55
{% if 'top' == position %}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<li>
1313
<strong>Route parameters:&nbsp;</strong>
1414
{% if request.routeParams|length %}
15-
{% include 'WebProfilerBundle:Profiler:table.html.twig' with { 'data': request.routeParams, 'class': 'inline' } only %}
15+
{% include '@WebProfiler/Profiler/table.html.twig' with { 'data': request.routeParams, 'class': 'inline' } only %}
1616
{% else %}
1717
<em>No parameters</em>
1818
{% endif %}

0 commit comments

Comments
 (0)
0