From 2f96d393e770085a73b3d74dde20bcbab8488a19 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Mon, 8 Apr 2019 13:56:44 +0200 Subject: [PATCH] use html+twig instead of twig for some examples --- form/bootstrap4.rst | 2 +- frontend/encore/server-data.rst | 4 ++-- frontend/encore/simple-example.rst | 2 +- frontend/encore/split-chunks.rst | 2 +- frontend/encore/versioning.rst | 2 +- quick_tour/the_view.rst | 6 +++--- reference/dic_tags.rst | 2 +- reference/forms/twig_reference.rst | 4 ++-- templating.rst | 8 ++++---- translation.rst | 2 +- web_link.rst | 23 +++++++++++------------ 11 files changed, 28 insertions(+), 29 deletions(-) diff --git a/form/bootstrap4.rst b/form/bootstrap4.rst index 8d1b071dbe3..afc806efbd8 100644 --- a/form/bootstrap4.rst +++ b/form/bootstrap4.rst @@ -66,7 +66,7 @@ configuration: If you prefer to apply the Bootstrap styles on a form to form basis, include the ``form_theme`` tag in the templates where those forms are used: -.. code-block:: twig +.. code-block:: html+twig {# ... #} {# this tag only applies to the forms defined in this template #} diff --git a/frontend/encore/server-data.rst b/frontend/encore/server-data.rst index ae19c262e86..34301f1b29b 100644 --- a/frontend/encore/server-data.rst +++ b/frontend/encore/server-data.rst @@ -6,7 +6,7 @@ In Symfony applications, you may find that you need to pass some dynamic data dynamic configuration is by storing information in ``data`` attributes and reading them later in JavaScript. For example: -.. code-block:: twig +.. code-block:: html-twig

@@ -36,7 +36,7 @@ store any content. In Twig, use the ``html_attr`` escaping strategy to avoid mes with HTML attributes. For example, if your ``User`` object has some ``getProfileData()`` method that returns an array, you could do the following: -.. code-block:: twig +.. code-block:: html+twig

diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst index cfb208b65a1..09af99c4a96 100644 --- a/frontend/encore/simple-example.rst +++ b/frontend/encore/simple-example.rst @@ -83,7 +83,7 @@ Congrats! You now have three new files: Next, include these in your base layout file. Two Twig helpers from WebpackEncoreBundle can do most of the work for you: -.. code-block:: twig +.. code-block:: html+twig {# app/Resources/views/base.html.twig #} diff --git a/frontend/encore/split-chunks.rst b/frontend/encore/split-chunks.rst index e619256c125..a86686b6b14 100644 --- a/frontend/encore/split-chunks.rst +++ b/frontend/encore/split-chunks.rst @@ -33,7 +33,7 @@ Twig functions from WebpackEncoreBundle, you don't need to do anything else! The functions automatically read this file and render as many ``script`` or ``link`` tags as needed: -.. code-block:: twig +.. code-block:: html+twig {# May now render multiple script tags: diff --git a/frontend/encore/versioning.rst b/frontend/encore/versioning.rst index a5ec30256fd..eb8f5558f08 100644 --- a/frontend/encore/versioning.rst +++ b/frontend/encore/versioning.rst @@ -65,7 +65,7 @@ an ``img`` tag) to certain assets. If you're using Symfony, just activate the That's it! Just be sure to wrap each path in the Twig ``asset()`` function like normal: -.. code-block:: twig +.. code-block:: html+twig

diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst index c33e2872096..e0cd5528a1d 100644 --- a/quick_tour/the_view.rst +++ b/quick_tour/the_view.rst @@ -146,7 +146,7 @@ One of the best features of Twig is its extensibility via tags, filters and functions. Take a look at the following sample template that uses filters extensively to modify the information before displaying it to the user: -.. code-block:: twig +.. code-block:: html+twig

@@ -170,7 +170,7 @@ create a new template fragment that can then be included from other templates. Imagine that we want to display ads on some pages of our application. First, create a ``banner.html.twig`` template: -.. code-block:: twig +.. code-block:: html+twig {# app/Resources/views/ads/banner.html.twig #}

@@ -256,7 +256,7 @@ Including Assets: Images, JavaScripts and Stylesheets What would the Internet be without images, JavaScripts and stylesheets? Symfony provides the ``asset()`` function to deal with them easily: -.. code-block:: twig +.. code-block:: html+twig diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index f57ad5463bd..76244012507 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -178,7 +178,7 @@ Second, define a service: Finally, apply the filter: -.. code-block:: twig +.. code-block:: html+twig {% javascripts '@AcmeBaseBundle/Resources/public/js/global.js' diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst index 408eea77f70..d4ad0d24c5a 100644 --- a/reference/forms/twig_reference.rst +++ b/reference/forms/twig_reference.rst @@ -195,7 +195,7 @@ This test will check if the current choice is equal to the ``selected_value`` or if the current choice is in the array (when ``selected_value`` is an array). -.. code-block:: twig +.. code-block:: html+twig

{{ article.title|capitalize }}