Skip to content

Commit 867ca26

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Routing] Fix some internal references links Add links to each Symfony UX component demo Linking to ux.symfony.com
2 parents 6e4dfa0 + 84f37a9 commit 867ca26

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

frontend/_ux-libraries.rst.inc

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
* `ux-autocomplete`_: Transform ``EntityType``, ``ChoiceType`` or *any* ``<select>`` element into an Ajax-powered autocomplete field
2-
* `ux-chartjs`_: Easy charts with `Chart.js`_
3-
* `ux-cropperjs`_: Form Type and tools for cropping images
1+
* `ux-autocomplete`_: Transform ``EntityType``, ``ChoiceType`` or *any*
2+
``<select>`` element into an Ajax-powered autocomplete field
3+
(`see demo <https://ux.symfony.com/autocomplete>`_)
4+
* `ux-chartjs`_: Easy charts with `Chart.js`_ (`see demo <https://ux.symfony.com/chartjs>`_)
5+
* `ux-cropperjs`_: Form Type and tools for cropping images (`see demo <https://ux.symfony.com/cropperjs>`_)
46
* `ux-dropzone`_: Form Type for stylized "drop zone" for file uploads
7+
(`see demo <https://ux.symfony.com/dropzone>`_)
58
* `ux-lazy-image`_: Optimize Image Loading with BlurHash
9+
(`see demo <https://ux.symfony.com/lazy-image>`_)
610
* `ux-live-component`_: Build Dynamic Interfaces with Zero JavaScript
11+
(`see demo <https://ux.symfony.com/live-component>`_)
712
* `ux-notify`_: Send server-sent native notification with Mercure
8-
* `ux-react`_: Render `React`_ component from Twig
9-
* `ux-swup`_: Integration with `Swup`_
13+
(`see demo <https://ux.symfony.com/notify>`_)
14+
* `ux-react`_: Render `React`_ component from Twig (`see demo <https://ux.symfony.com/react>`_)
15+
* `ux-swup`_: Integration with `Swup`_ (`see demo <https://ux.symfony.com/swup>`_)
1016
* `ux-turbo`_: Integration with `Turbo Drive`_ for a single-page-app experience
17+
(`see demo <https://ux.symfony.com/turbo>`_)
1118
* `ux-twig-component`_: Build Twig Components Backed by a PHP Class
12-
* `ux-typed`_: Integration with `Typed`_
19+
(`see demo <https://ux.symfony.com/twig-component>`_)
20+
* `ux-typed`_: Integration with `Typed`_ (`see demo <https://ux.symfony.com/typed>`_)
1321

1422
.. _`ux-autocomplete`: https://symfony.com/bundles/ux-autocomplete/current/index.html
1523
.. _`ux-chartjs`: https://symfony.com/bundles/ux-chartjs/current/index.html

frontend/ux.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
The Symfony UX Initiative & Packages
55
====================================
66

7+
.. tip::
8+
9+
Check out live demos of Symfony UX at `https://ux.symfony.com`_!
10+
711
Symfony UX is an initiative and set of libraries to seamlessly
812
integrate JavaScript tools into your application. For example,
913
want to render a chart with `Chart.js`_? Use `UX Chart.js`_ to build the
@@ -148,3 +152,4 @@ the Node package that is responsible for a lot of the magic.
148152
.. _`@symfony/stimulus-bridge`: https://github.com/symfony/stimulus-bridge
149153
.. _`stimulus-use`: https://stimulus-use.github.io/stimulus-use
150154
.. _`stimulus-components`: https://stimulus-components.netlify.app/
155+
.. _`https://ux.symfony.com`: https://ux.symfony.com

routing.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,12 +1137,13 @@ Special Parameters
11371137
In addition to your own parameters, routes can include any of the following
11381138
special parameters created by Symfony:
11391139

1140+
.. _routing-format-parameter:
1141+
.. _routing-locale-parameter:
1142+
11401143
``_controller``
11411144
This parameter is used to determine which controller and action is executed
11421145
when the route is matched.
11431146

1144-
.. _routing-format-parameter:
1145-
11461147
``_format``
11471148
The matched value is used to set the "request format" of the ``Request`` object.
11481149
This is used for such things as setting the ``Content-Type`` of the response
@@ -1152,8 +1153,6 @@ special parameters created by Symfony:
11521153
Used to set the fragment identifier, which is the optional last part of a URL that
11531154
starts with a ``#`` character and is used to identify a portion of a document.
11541155

1155-
.. _routing-locale-parameter:
1156-
11571156
``_locale``
11581157
Used to set the :ref:`locale <translation-locale-url>` on the request.
11591158

0 commit comments

Comments
 (0)