Skip to content

Commit c0e8a9a

Browse files
wouterjwouterj
committed
Fixed code examples in cookbook/assetic
1 parent bc95ecc commit c0e8a9a

File tree

4 files changed

+44
-65
lines changed

4 files changed

+44
-65
lines changed

‎cookbook/assetic/apply_to_option.rst

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,16 @@ templates:
5555

5656
.. code-block:: html+jinja
5757

58-
{% javascripts '@AcmeFooBundle/Resources/public/js/example.coffee'
59-
filter='coffee'
60-
%}
61-
<script src="{{ asset_url }}" type="text/javascript"></script>
58+
{% javascripts '@AcmeFooBundle/Resources/public/js/example.coffee' filter='coffee' %}
59+
<script src="{{ asset_url }}" type="text/javascript"></script>
6260
{% endjavascripts %}
6361

6462
.. code-block:: html+php
6563

6664
<?php foreach ($view['assetic']->javascripts(
6765
array('@AcmeFooBundle/Resources/public/js/example.coffee'),
6866
array('coffee')) as $url): ?>
69-
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
67+
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
7068
<?php endforeach; ?>
7169

7270
This is all that's needed to compile this CoffeeScript file and server it
@@ -83,9 +81,8 @@ You can also combine multiple CoffeeScript files into a single output file:
8381

8482
{% javascripts '@AcmeFooBundle/Resources/public/js/example.coffee'
8583
'@AcmeFooBundle/Resources/public/js/another.coffee'
86-
filter='coffee'
87-
%}
88-
<script src="{{ asset_url }}" type="text/javascript"></script>
84+
filter='coffee' %}
85+
<script src="{{ asset_url }}" type="text/javascript"></script>
8986
{% endjavascripts %}
9087

9188
.. code-block:: html+php
@@ -94,7 +91,7 @@ You can also combine multiple CoffeeScript files into a single output file:
9491
array('@AcmeFooBundle/Resources/public/js/example.coffee',
9592
'@AcmeFooBundle/Resources/public/js/another.coffee'),
9693
array('coffee')) as $url): ?>
97-
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
94+
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
9895
<?php endforeach; ?>
9996

10097
Both the files will now be served up as a single file compiled into regular
@@ -164,9 +161,8 @@ being run through the CoffeeScript filter):
164161

165162
{% javascripts '@AcmeFooBundle/Resources/public/js/example.coffee'
166163
'@AcmeFooBundle/Resources/public/js/another.coffee'
167-
'@AcmeFooBundle/Resources/public/js/regular.js'
168-
%}
169-
<script src="{{ asset_url }}" type="text/javascript"></script>
164+
'@AcmeFooBundle/Resources/public/js/regular.js' %}
165+
<script src="{{ asset_url }}" type="text/javascript"></script>
170166
{% endjavascripts %}
171167

172168
.. code-block:: html+php
@@ -176,5 +172,5 @@ being run through the CoffeeScript filter):
176172
'@AcmeFooBundle/Resources/public/js/another.coffee',
177173
'@AcmeFooBundle/Resources/public/js/regular.js'),
178174
as $url): ?>
179-
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
175+
<script src="<?php echo $view->escape($url) ?>" type="text/javascript"></script>
180176
<?php endforeach; ?>

‎cookbook/assetic/asset_management.rst

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ directly:
2121

2222
.. code-block:: php
2323
24-
<script src="<?php echo $view['assets']->getUrl('js/script.js') ?>"
25-
type="text/javascript" />
24+
<script src="<?php echo $view['assets']->getUrl('js/script.js') ?>" type="text/javascript" />
2625
2726
But *with* Assetic, you can manipulate these assets however you want (or
2827
load them from anywhere) before serving them. These means you can:
@@ -45,17 +44,15 @@ drawn from various sources such as from within a bundle:
4544
4645
.. code-block:: html+jinja
4746
48-
{% javascripts
49-
'@AcmeFooBundle/Resources/public/js/*'
50-
%}
51-
<script type="text/javascript" src="{{ asset_url }}"></script>
47+
{% javascripts '@AcmeFooBundle/Resources/public/js/*' %}
48+
<script type="text/javascript" src="{{ asset_url }}"></script>
5249
{% endjavascripts %}
5350
5451
.. code-block:: html+php
5552

5653
<?php foreach ($view['assetic']->javascripts(
5754
array('@AcmeFooBundle/Resources/public/js/*')) as $url): ?>
58-
<script type="text/javascript" src="<?php echo $view->escape($url) ?>"></script>
55+
<script type="text/javascript" src="<?php echo $view->escape($url) ?>"></script>
5956
<?php endforeach; ?>
6057
6158
.. tip::
@@ -67,17 +64,16 @@ drawn from various sources such as from within a bundle:
6764

6865
.. code-block:: html+jinja
6966

70-
{% stylesheets
71-
'@AcmeFooBundle/Resources/public/css/*'
72-
%}
73-
<link rel="stylesheet" href="{{ asset_url }}" />
67+
{% stylesheets '@AcmeFooBundle/Resources/public/css/*' %}
68+
<link rel="stylesheet" href="{{ asset_url }}" />
7469
{% endstylesheets %}
7570
7671
.. code-block:: html+php
7772

7873
<?php foreach ($view['assetic']->stylesheets(
79-
array('@AcmeFooBundle/Resources/public/css/*')) as $url): ?>
80-
<link rel="stylesheet" href="<?php echo $view->escape($url) ?>" />
74+
array('@AcmeFooBundle/Resources/public/css/*')
75+
) as $url): ?>
76+
<link rel="stylesheet" href="<?php echo $view->escape($url) ?>" />
8177
<?php endforeach; ?>
8278
8379
In this example, all of the files in the ``Resources/public/js/`` directory
@@ -113,9 +109,8 @@ them as a single file:
113109
{% javascripts
114110
'@AcmeFooBundle/Resources/public/js/*'
115111
'@AcmeBarBundle/Resources/public/js/form.js'
116-
'@AcmeBarBundle/Resources/public/js/calendar.js'
117-
%}
118-
<script src="{{ asset_url }}"></script>
112+
'@AcmeBarBundle/Resources/public/js/calendar.js' %}
113+
<script src="{{ asset_url }}"></script>
119114
{% endjavascripts %}
120115
121116
.. code-block:: html+php
@@ -124,7 +119,7 @@ them as a single file:
124119
array('@AcmeFooBundle/Resources/public/js/*',
125120
'@AcmeBarBundle/Resources/public/js/form.js',
126121
'@AcmeBarBundle/Resources/public/js/calendar.js')) as $url): ?>
127-
<script src="<?php echo $view->escape($url) ?>"></script>
122+
<script src="<?php echo $view->escape($url) ?>"></script>
128123
<?php endforeach; ?>
129124
130125
In the `dev` environment, each file is still served individually, so that
@@ -147,17 +142,16 @@ combine third party assets, such as jQuery, with your own into a single file:
147142

148143
{% javascripts
149144
'@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js'
150-
'@AcmeFooBundle/Resources/public/js/*'
151-
%}
152-
<script src="{{ asset_url }}"></script>
145+
'@AcmeFooBundle/Resources/public/js/*' %}
146+
<script src="{{ asset_url }}"></script>
153147
{% endjavascripts %}
154148
155149
.. code-block:: html+php
156150

157151
<?php foreach ($view['assetic']->javascripts(
158152
array('@AcmeFooBundle/Resources/public/js/thirdparty/jquery.js',
159153
'@AcmeFooBundle/Resources/public/js/*')) as $url): ?>
160-
<script src="<?php echo $view->escape($url) ?>"></script>
154+
<script src="<?php echo $view->escape($url) ?>"></script>
161155
<?php endforeach; ?>
162156
163157
Filters
@@ -221,19 +215,16 @@ into your template:
221215

222216
.. code-block:: html+jinja
223217

224-
{% javascripts
225-
'@AcmeFooBundle/Resources/public/js/*'
226-
filter='yui_js'
227-
%}
228-
<script src="{{ asset_url }}"></script>
218+
{% javascripts '@AcmeFooBundle/Resources/public/js/*' filter='yui_js' %}
219+
<script src="{{ asset_url }}"></script>
229220
{% endjavascripts %}
230221
231222
.. code-block:: html+php
232223

233224
<?php foreach ($view['assetic']->javascripts(
234225
array('@AcmeFooBundle/Resources/public/js/*'),
235226
array('yui_js')) as $url): ?>
236-
<script src="<?php echo $view->escape($url) ?>"></script>
227+
<script src="<?php echo $view->escape($url) ?>"></script>
237228
<?php endforeach; ?>
238229
239230
A more detailed guide about configuring and using Assetic filters as well as
@@ -249,11 +240,8 @@ done from the template and is relative to the public document root:
249240

250241
.. code-block:: html+jinja
251242

252-
{% javascripts
253-
'@AcmeFooBundle/Resources/public/js/*'
254-
output='js/compiled/main.js'
255-
%}
256-
<script src="{{ asset_url }}"></script>
243+
{% javascripts '@AcmeFooBundle/Resources/public/js/*' output='js/compiled/main.js' %}
244+
<script src="{{ asset_url }}"></script>
257245
{% endjavascripts %}
258246
259247
.. code-block:: html+php
@@ -263,7 +251,7 @@ done from the template and is relative to the public document root:
263251
array(),
264252
array('output' => 'js/compiled/main.js')
265253
) as $url): ?>
266-
<script src="<?php echo $view->escape($url) ?>"></script>
254+
<script src="<?php echo $view->escape($url) ?>"></script>
267255
<?php endforeach; ?>
268256
269257
.. note::
@@ -373,11 +361,8 @@ some isolated directory (e.g. ``/js/compiled``), to keep things organized:
373361

374362
.. code-block:: html+jinja
375363

376-
{% javascripts
377-
'@AcmeFooBundle/Resources/public/js/*'
378-
output='js/compiled/main.js'
379-
%}
380-
<script src="{{ asset_url }}"></script>
364+
{% javascripts '@AcmeFooBundle/Resources/public/js/*' output='js/compiled/main.js' %}
365+
<script src="{{ asset_url }}"></script>
381366
{% endjavascripts %}
382367
383368
.. code-block:: html+php
@@ -387,5 +372,5 @@ some isolated directory (e.g. ``/js/compiled``), to keep things organized:
387372
array(),
388373
array('output' => 'js/compiled/main.js')
389374
) as $url): ?>
390-
<script src="<?php echo $view->escape($url) ?>"></script>
375+
<script src="<?php echo $view->escape($url) ?>"></script>
391376
<?php endforeach; ?>

‎cookbook/assetic/jpeg_optimize.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,16 @@ It can now be used from a template:
5858
.. code-block:: html+jinja
5959

6060
{% image '@AcmeFooBundle/Resources/public/images/example.jpg'
61-
filter='jpegoptim' output='/images/example.jpg'
62-
%}
63-
<img src="{{ asset_url }}" alt="Example"/>
61+
filter='jpegoptim' output='/images/example.jpg' %}
62+
<img src="{{ asset_url }}" alt="Example"/>
6463
{% endimage %}
6564

6665
.. code-block:: html+php
6766

6867
<?php foreach ($view['assetic']->images(
6968
array('@AcmeFooBundle/Resources/public/images/example.jpg'),
7069
array('jpegoptim')) as $url): ?>
71-
<img src="<?php echo $view->escape($url) ?>" alt="Example"/>
70+
<img src="<?php echo $view->escape($url) ?>" alt="Example"/>
7271
<?php endforeach; ?>
7372

7473
Removing all EXIF Data
@@ -204,8 +203,7 @@ The Twig template can now be changed to the following:
204203

205204
.. code-block:: html+jinja
206205

207-
<img src="{{ jpegoptim('@AcmeFooBundle/Resources/public/images/example.jpg') }}"
208-
alt="Example"/>
206+
<img src="{{ jpegoptim('@AcmeFooBundle/Resources/public/images/example.jpg') }}" alt="Example"/>
209207

210208
You can specify the output directory in the config in the following way:
211209

@@ -254,4 +252,4 @@ You can specify the output directory in the config in the following way:
254252
),
255253
));
256254
257-
.. _`Jpegoptim`: http://www.kokkonen.net/tjko/projects.html
255+
.. _`Jpegoptim`: http://www.kokkonen.net/tjko/projects.html

‎cookbook/assetic/yuicompressor.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ the view layer, this work is done in your templates:
8282
.. code-block:: html+jinja
8383

8484
{% javascripts '@AcmeFooBundle/Resources/public/js/*' filter='yui_js' %}
85-
<script src="{{ asset_url }}"></script>
85+
<script src="{{ asset_url }}"></script>
8686
{% endjavascripts %}
8787
8888
.. code-block:: html+php
8989

9090
<?php foreach ($view['assetic']->javascripts(
9191
array('@AcmeFooBundle/Resources/public/js/*'),
9292
array('yui_js')) as $url): ?>
93-
<script src="<?php echo $view->escape($url) ?>"></script>
93+
<script src="<?php echo $view->escape($url) ?>"></script>
9494
<?php endforeach; ?>
9595
9696
.. note::
@@ -109,15 +109,15 @@ can be repeated to minify your stylesheets.
109109
.. code-block:: html+jinja
110110

111111
{% stylesheets '@AcmeFooBundle/Resources/public/css/*' filter='yui_css' %}
112-
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset_url }}" />
112+
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset_url }}" />
113113
{% endstylesheets %}
114114
115115
.. code-block:: html+php
116116

117117
<?php foreach ($view['assetic']->stylesheets(
118118
array('@AcmeFooBundle/Resources/public/css/*'),
119119
array('yui_css')) as $url): ?>
120-
<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $view->escape($url) ?>" />
120+
<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $view->escape($url) ?>" />
121121
<?php endforeach; ?>
122122
123123
Disable Minification in Debug Mode
@@ -134,15 +134,15 @@ apply this filter when debug mode is off.
134134
.. code-block:: html+jinja
135135

136136
{% javascripts '@AcmeFooBundle/Resources/public/js/*' filter='?yui_js' %}
137-
<script src="{{ asset_url }}"></script>
137+
<script src="{{ asset_url }}"></script>
138138
{% endjavascripts %}
139139
140140
.. code-block:: html+php
141141

142142
<?php foreach ($view['assetic']->javascripts(
143143
array('@AcmeFooBundle/Resources/public/js/*'),
144144
array('?yui_js')) as $url): ?>
145-
<script src="<?php echo $view->escape($url) ?>"></script>
145+
<script src="<?php echo $view->escape($url) ?>"></script>
146146
<?php endforeach; ?>
147147
148148

0 commit comments

Comments
 (0)