diff options
| author | James Bennett <james@b-list.org> | 2013-06-20 01:51:20 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-08 13:59:54 -0400 |
| commit | c0f03175ceeb132b88d6ff81d28d397e5a303989 (patch) | |
| tree | 57d40040b3e82f4b058690f33cf80f6ab4b9396b /docs/ref | |
| parent | 660c30ed953667b44bdec7058dafe10e0a8ce402 (diff) | |
Fixed #19695 -- Retitle "Form Media" to "Form Assets".
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/admin/index.txt | 10 | ||||
| -rw-r--r-- | docs/ref/forms/widgets.txt | 9 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index a22a51e8fb..e5e9428805 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1554,13 +1554,13 @@ instances which allow you to easily customize the response data before rendering. For more details, see the :doc:`TemplateResponse documentation </ref/template-response>`. -.. _modeladmin-media-definitions: +.. _modeladmin-asset-definitions: -``ModelAdmin`` media definitions +``ModelAdmin`` asset definitions -------------------------------- There are times where you would like add a bit of CSS and/or JavaScript to -the add/change views. This can be accomplished by using a Media inner class +the add/change views. This can be accomplished by using a ``Media`` inner class on your ``ModelAdmin``:: class ArticleAdmin(admin.ModelAdmin): @@ -1572,8 +1572,8 @@ on your ``ModelAdmin``:: The :doc:`staticfiles app </ref/contrib/staticfiles>` prepends :setting:`STATIC_URL` (or :setting:`MEDIA_URL` if :setting:`STATIC_URL` is -``None``) to any media paths. The same rules apply as :ref:`regular media -definitions on forms <form-media-paths>`. +``None``) to any asset paths. The same rules apply as :ref:`regular asset +definitions on forms <form-asset-paths>`. jQuery ~~~~~~ diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt index 341574ad37..5b66776cfc 100644 --- a/docs/ref/forms/widgets.txt +++ b/docs/ref/forms/widgets.txt @@ -171,16 +171,15 @@ You can also set the HTML ``id`` using :attr:`~Widget.attrs`. See Styling widget classes ^^^^^^^^^^^^^^^^^^^^^^ -With widgets, it is possible to add media (``css`` and ``javascript``) +With widgets, it is possible to add assets (``css`` and ``javascript``) and more deeply customize their appearance and behavior. In a nutshell, you will need to subclass the widget and either -:ref:`define a class "Media" <media-as-a-static-definition>` as a member of the -subclass, or :ref:`create a property "media" <dynamic-property>`, returning an -instance of that class. +:ref:`define a "Media" inner class <assets-as-a-static-definition>` or +:ref:`create a "media" property <dynamic-property>`. These methods involve somewhat advanced Python programming and are described in -detail in the :doc:`Form Media </topics/forms/media>` topic guide. +detail in the :doc:`Form Assets </topics/forms/media>` topic guide. .. _base-widget-classes: diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 30e7e84fdb..8b069579ba 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2475,7 +2475,7 @@ URL to use when referring to static files located in :setting:`STATIC_ROOT`. Example: ``"/static/"`` or ``"http://static.example.com/"`` If not ``None``, this will be used as the base path for -:ref:`media definitions<form-media-paths>` and the +:ref:`asset definitions<form-asset-paths>` (the ``Media`` class) and the :doc:`staticfiles app</ref/contrib/staticfiles>`. It must end in a slash if set to a non-empty value. |