Skip to content
This repository was archived by the owner on Feb 16, 2021. It is now read-only.

Commit 9e87a88

Browse files
committed
Merge pull request #13 from sumocoders/remove-assetic
Don't use assetic to parse assets.
2 parents 5ae9d96 + f522090 commit 9e87a88

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

Resources/views/Bootstrap/autocomplete.html.twig

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@
1414
{% endblock %}
1515

1616
{% block head_javascripts %}
17+
{{ parent() }}
1718

18-
{% javascripts
19-
'assets/js/frameworkexamplebundle.autocomplete.js'
20-
output='js/autocomplete.js'
21-
%}
22-
<script src="{{ asset_url }}"></script>
23-
{% endjavascripts %}
24-
25-
{{ parent() }}
19+
<script type="text/javascript" src="{{ asset('/assets/js/frameworkexamplebundle.autocomplete.js') }}"></script>
2620
{% endblock %}

Resources/views/Tutorial/statistics.html.twig

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,22 @@
3131
<div class="row">
3232
<div class="col-md-6 col-md-offset-3">
3333
<canvas class="chart" id="polar-area-chart"></canvas>
34-
</div>
35-
</div>
36-
37-
<h3>Pie & Doughnut charts</h3>
38-
<div class="row">
39-
<div class="col-md-6">
40-
<canvas class="chart" id="pie-chart"></canvas>
34+
</div>
4135
</div>
42-
<div class="col-md-6">
43-
<canvas class="chart" id="doughnut-chart"></canvas>
36+
37+
<h3>Pie & Doughnut charts</h3>
38+
<div class="row">
39+
<div class="col-md-6">
40+
<canvas class="chart" id="pie-chart"></canvas>
41+
</div>
42+
<div class="col-md-6">
43+
<canvas class="chart" id="doughnut-chart"></canvas>
44+
</div>
4445
</div>
45-
</div>
4646
{% endblock %}
4747

4848
{% block head_javascripts %}
4949
{{ parent() }}
5050

51-
{% javascripts
52-
'assets/js/frameworkexamplebundle.charts.js'
53-
output='js/charts.js'
54-
%}
55-
<script src="{{ asset_url }}"></script>
56-
{% endjavascripts %}
51+
<script type="text/javascript" src="{{ asset('/assets/js/frameworkexamplebundle.charts.js') }}"></script>
5752
{% endblock %}

0 commit comments

Comments
 (0)