{% block title %}{% endblock %}

From ff05de760cc4ef4c7f188e163c722ec3bc1f0cbf Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sat, 20 Jan 2018 23:09:10 -0800 Subject: Fixed #29038 -- Removed closing slash from HTML void tags. --- docs/howto/static-files/index.txt | 2 +- docs/intro/contributing.txt | 4 +- docs/intro/overview.txt | 2 +- docs/intro/tutorial04.txt | 6 +- docs/intro/tutorial06.txt | 2 +- docs/ref/class-based-views/generic-editing.txt | 8 +- docs/ref/contrib/admin/index.txt | 2 +- docs/ref/forms/api.txt | 222 ++++++++++++------------- docs/ref/forms/fields.txt | 50 +++--- docs/ref/forms/widgets.txt | 34 ++-- docs/ref/request-response.txt | 2 +- docs/ref/templates/builtins.txt | 22 +-- docs/ref/templates/language.txt | 4 +- docs/releases/2.1.txt | 4 + docs/topics/auth/default.txt | 4 +- docs/topics/forms/formsets.txt | 66 ++++---- docs/topics/forms/index.txt | 10 +- docs/topics/forms/media.txt | 32 ++-- docs/topics/forms/modelforms.txt | 14 +- docs/topics/i18n/timezones.txt | 2 +- docs/topics/i18n/translation.txt | 12 +- docs/topics/pagination.txt | 2 +- docs/topics/testing/tools.txt | 2 +- 23 files changed, 256 insertions(+), 252 deletions(-) (limited to 'docs') diff --git a/docs/howto/static-files/index.txt b/docs/howto/static-files/index.txt index 847e3c9c19..bff1a5daa1 100644 --- a/docs/howto/static-files/index.txt +++ b/docs/howto/static-files/index.txt @@ -30,7 +30,7 @@ Configuring static files .. code-block:: html+django {% load static %} - My image

4. Store your static files in a folder called ``static`` in your app. For example ``my_app/static/my_app/example.jpg``. diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index 07d9aae379..ef44c81600 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -535,8 +535,8 @@ Use the arrow keys to move up and down. +++ b/docs/ref/forms/api.txt @@ -1065,3 +1065,13 @@ You can put several Django forms inside one ``

`` tag. To give each >>> print(father.as_ul()) -

First name:

Last name:

First name:

Last name:

+ +The prefix can also be specified on the form class:: + diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt index f6e34b0695..7cf17ba376 100644 --- a/docs/intro/overview.txt +++ b/docs/intro/overview.txt @@ -307,7 +307,7 @@ Here's what the "base.html" template, including the use of :doc:`static files {% block title %}{% endblock %} - Logo

{% block content %}{% endblock %} diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt index 6f685fc402..8e1f8d9aef 100644 --- a/docs/intro/tutorial04.txt +++ b/docs/intro/tutorial04.txt @@ -22,10 +22,10 @@ tutorial, so that the template contains an HTML ```` element: {% csrf_token %} {% for choice in question.choice_set.all %} - - {{ choice.choice_text }}
+ + {{ choice.choice_text }}
{% endfor %} - +

A quick rundown: diff --git a/docs/intro/tutorial06.txt b/docs/intro/tutorial06.txt index 0d3dd23315..231ae315ee 100644 --- a/docs/intro/tutorial06.txt +++ b/docs/intro/tutorial06.txt @@ -70,7 +70,7 @@ Next, add the following at the top of ``polls/templates/polls/index.html``: {% load static %} - + The ``{% static %}`` template tag generates the absolute URL of static files. diff --git a/docs/ref/class-based-views/generic-editing.txt b/docs/ref/class-based-views/generic-editing.txt index 65cd772536..8c1fe0f758 100644 --- a/docs/ref/class-based-views/generic-editing.txt +++ b/docs/ref/class-based-views/generic-editing.txt @@ -76,7 +76,7 @@ editing content: @@ -132,7 +132,7 @@ editing content: ``UpdateView`` @@ -189,7 +189,7 @@ editing content: ``DeleteView`` @@ -240,5 +240,5 @@ editing content: diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index c043561f17..39c02f26af 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1180,7 +1180,7 @@ subclass:: # for each line of the address and you want to separate each # line by a linebreak return format_html_join( - mark_safe('
'), + mark_safe('
'), '{}', ((line,) for line in instance.get_full_address()), ) or mark_safe("I can't determine this address.") diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt index 5e001a2f62..bafa688f98 100644 --- a/docs/ref/forms/api.txt +++ b/docs/ref/forms/api.txt @@ -255,9 +255,9 @@ precedence:: ... comment = forms.CharField() >>> f = CommentForm(initial={'name': 'instance'}, auto_id=False) >>> print(f) - Name: - Url: - Comment: + Name: + Url: + Comment: .. method:: Form.get_initial_for_field(field, field_name) @@ -322,10 +322,10 @@ You can alter the field of :class:`Form` instance to change the way it is presented in the form:: >>> f.as_table().split('\n')[0] - 'Name:' + 'Name:' >>> f.fields['name'].label = "Username" >>> f.as_table().split('\n')[0] - 'Username:' + 'Username:' Beware not to alter the ``base_fields`` attribute because this modification will influence all subsequent ``ContactForm`` instances within the same Python @@ -334,7 +334,7 @@ process:: >>> f.base_fields['name'].label = "Username" >>> another_f = CommentForm(auto_id=False) >>> another_f.as_table().split('\n')[0] - 'Username:' + 'Username:' Accessing "clean" data ====================== @@ -438,10 +438,10 @@ simply ``print`` it:: >>> f = ContactForm() >>> print(f) - Subject: - Message: - Sender: - Cc myself: + Subject: + Message: + Sender: + Cc myself: If the form is bound to data, the HTML output will include that data appropriately. For example, if a field is represented by an @@ -455,10 +455,10 @@ include ``checked`` if appropriate:: ... 'cc_myself': True} >>> f = ContactForm(data) >>> print(f) - Subject: - Message: - Sender: - Cc myself: + Subject: + Message: + Sender: + Cc myself: This default output is a two-column HTML table, with a ```` for each field. Notice the following: @@ -506,12 +506,12 @@ containing one field:: >>> f = ContactForm() >>> f.as_p() - '

Subject:

Message:

Sender:

Cc myself:

' + '

Subject:

Message:

Sender:

Cc myself:

' >>> print(f.as_p()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

``as_ul()`` ----------- @@ -525,12 +525,12 @@ flexibility:: >>> f = ContactForm() >>> f.as_ul() - '

Subject:

Message:

Sender:

Cc myself:

' + '

Subject:

Message:

Sender:

Cc myself:

' >>> print(f.as_ul()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

``as_table()`` -------------- @@ -543,12 +543,12 @@ it calls its ``as_table()`` method behind the scenes:: >>> f = ContactForm() >>> f.as_table() - 'Subject:\nMessage:\nSender:\nCc myself:' + 'Subject:\nMessage:\nSender:\nCc myself:' >>> print(f) - Subject: - Message: - Sender: - Cc myself: + Subject: + Message: + Sender: + Cc myself: .. _ref-forms-api-styling-form-rows: @@ -618,20 +618,20 @@ tags nor ``id`` attributes:: >>> f = ContactForm(auto_id=False) >>> print(f.as_table()) - Subject: - Message: - Sender: - Cc myself: + Subject: + Message: + Sender: + Cc myself: >>> print(f.as_ul()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

>>> print(f.as_p()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

If ``auto_id`` is set to ``True``, then the form output *will* include ```` tags and will simply use the field name as its ``id`` for each form @@ -639,20 +639,20 @@ field:: >>> f = ContactForm(auto_id=True) >>> print(f.as_table()) - Subject: - Message: - Sender: - Cc myself: + Subject: + Message: + Sender: + Cc myself: >>> print(f.as_ul()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

>>> print(f.as_p()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

If ``auto_id`` is set to a string containing the format character ``'%s'``, then the form output will include ```` tags, and will generate ``id`` @@ -662,20 +662,20 @@ attributes based on the format string. For example, for a format string >>> f = ContactForm(auto_id='id_for_%s') >>> print(f.as_table()) - Subject: - Message: - Sender: - Cc myself: + Subject: + Message: + Sender: + Cc myself: >>> print(f.as_ul()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

>>> print(f.as_p()) -

Subject:

Message:

Sender:

Cc myself:

Subject:

Message:

Sender:

Cc myself:

If ``auto_id`` is set to any other true value -- such as a string that doesn't include ``%s`` -- then the library will act as if ``auto_id`` is ``True``. @@ -692,16 +692,16 @@ It's possible to customize that character, or omit it entirely, using the >>> f = ContactForm(auto_id='id_for_%s', label_suffix='') >>> print(f.as_ul()) -

Subject

Message

Sender

Cc myself

Subject

Message

Sender

Cc myself

>>> f = ContactForm(auto_id='id_for_%s', label_suffix=' ->') >>> print(f.as_ul()) -

Subject ->

Message ->

Sender ->

Cc myself ->

Subject ->

Message ->

Sender ->

Cc myself ->

Note that the label suffix is added only if the last character of the label isn't a punctuation character (in English, those are ``.``, ``!``, ``?`` @@ -788,22 +788,22 @@ method you're using:: ... 'cc_myself': True} >>> f = ContactForm(data, auto_id=False) >>> print(f.as_table()) - Subject:

This field is required.

- Message: - Sender:

Enter a valid email address.

- Cc myself: + Subject:

This field is required.

+ Message: + Sender:

Enter a valid email address.

+ Cc myself: >>> print(f.as_ul()) -

This field is required.

Subject:

Message:

Enter a valid email address.

Sender:

Cc myself:

This field is required.

Subject:

Message:

Enter a valid email address.

Sender:

Cc myself:

>>> print(f.as_p())

This field is required.

Subject:

Message:

Subject:

Message:

Enter a valid email address.

Sender:

Cc myself:

Sender:

Cc myself:

.. _ref-forms-error-list-format: @@ -824,11 +824,11 @@ pass that in at construction time:: >>> f = ContactForm(data, auto_id=False, error_class=DivErrorList) >>> f.as_p()

This field is required.

Subject:

Message:

Subject:

Message:

Enter a valid email address.

Sender:

Cc myself:

Sender:

Cc myself:

More granular output ==================== @@ -848,25 +848,25 @@ using the field's name as the key:: >>> form = ContactForm() >>> print(form['subject']) - + To retrieve all ``BoundField`` objects, iterate the form:: >>> form = ContactForm() >>> for boundfield in form: print(boundfield) - - - - + + + + The field-specific output honors the form object's ``auto_id`` setting:: >>> f = ContactForm(auto_id=False) >>> print(f['message']) - + >>> f = ContactForm(auto_id='id_%s') >>> print(f['message']) - + Attributes of ``BoundField`` ---------------------------- @@ -897,7 +897,7 @@ Attributes of ``BoundField`` >>> data = {'subject': 'hi', 'message': '', 'sender': '', 'cc_myself': ''} >>> f = ContactForm(data, auto_id=False) >>> print(f['message']) - + >>> f['message'].errors ['This field is required.'] >>> print(f['message'].errors) @@ -949,7 +949,7 @@ Attributes of ``BoundField`` .. code-block:: html - ... + ... .. attribute:: BoundField.is_hidden @@ -1168,11 +1168,11 @@ fields are ordered first:: ... priority = forms.CharField() >>> f = ContactFormWithPriority(auto_id=False) >>> print(f.as_ul()) -

Subject:

Message:

Sender:

Cc myself:

Priority:

Subject:

Message:

Sender:

Cc myself:

Priority:

It's possible to subclass multiple forms, treating forms as mixins. In this example, ``BeatleForm`` subclasses both ``PersonForm`` and ``InstrumentForm`` @@ -1189,10 +1189,10 @@ classes:: ... haircut_type = forms.CharField() >>> b = BeatleForm(auto_id=False) >>> print(b.as_ul()) -

First name:

Last name:

Instrument:

Haircut type:

First name:

Last name:

Instrument:

Haircut type:

It's possible to declaratively remove a ``Field`` inherited from a parent class by setting the name of the field to ``None`` on the subclass. For example:: @@ -1222,11 +1222,11 @@ You can put several Django forms inside one ``

`` tag. To give each >>> mother = PersonForm(prefix="mother") >>> father = PersonForm(prefix="father") >>> print(mother.as_ul()) -

First name:

Last name:

First name:

Last name:

>>> print(father.as_ul()) -

First name:

Last name:

First name:

Last name:

The prefix can also be specified on the form class:: diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 6c24c3534e..65a231d8e2 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -119,9 +119,9 @@ We've specified ``auto_id=False`` to simplify the output:: ... comment = forms.CharField() >>> f = CommentForm(auto_id=False) >>> print(f) - Your name: - Your website: - Comment: + Your name: + Your website: + Comment: ``label_suffix`` ---------------- @@ -137,9 +137,9 @@ The ``label_suffix`` argument lets you override the form's ... captcha_answer = forms.IntegerField(label='2 + 2', label_suffix=' =') >>> f = ContactForm(label_suffix='?') >>> print(f.as_p()) -

Age?

Nationality?

2 + 2 =

Age?

Nationality?

2 + 2 =

``initial`` ----------- @@ -161,9 +161,9 @@ field is initialized to a particular value. For example:: ... comment = forms.CharField() >>> f = CommentForm(auto_id=False) >>> print(f) - Name: - Url: - Comment: + Name: + Url: + Comment: You may be thinking, why not just pass a dictionary of the initial values as data when displaying the form? Well, if you do that, you'll trigger validation, @@ -176,9 +176,9 @@ and the HTML output will include any validation errors:: >>> default_data = {'name': 'Your name', 'url': 'http://'} >>> f = CommentForm(default_data, auto_id=False) >>> print(f) - Name: - Url:

Enter a valid URL.

- Comment:

This field is required.

+ Name: + Url:

Enter a valid URL.

+ Comment:

This field is required.

This is why ``initial`` values are only displayed for unbound forms. For bound forms, the HTML output will use the bound data. @@ -205,7 +205,7 @@ Instead of a constant, you can also pass any callable:: >>> class DateForm(forms.Form): ... day = forms.DateField(initial=datetime.date.today) >>> print(DateForm()) - Day: + Day: The callable will be evaluated only when the unbound form is displayed, not when it is defined. @@ -241,20 +241,20 @@ fields. We've specified ``auto_id=False`` to simplify the output:: ... cc_myself = forms.BooleanField(required=False) >>> f = HelpTextContactForm(auto_id=False) >>> print(f.as_table()) - Subject:
100 characters max. - Message: - Sender:
A valid email address, please. - Cc myself: + Subject:
100 characters max. + Message: + Sender:
A valid email address, please. + Cc myself: >>> print(f.as_ul())) -

Subject: 100 characters max.

Message:

Sender: A valid email address, please.

Cc myself:

Subject: 100 characters max.

Message:

Sender: A valid email address, please.

Cc myself:

>>> print(f.as_p()) -

Subject: 100 characters max.

Message:

Sender: A valid email address, please.

Cc myself:

Subject: 100 characters max.

Message:

Sender: A valid email address, please.

Cc myself:

``error_messages`` ------------------ diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt index dc6256ee06..ee913f0f72 100644 --- a/docs/ref/forms/widgets.txt +++ b/docs/ref/forms/widgets.txt @@ -142,9 +142,9 @@ provided for each widget will be rendered exactly the same:: >>> f = CommentForm(auto_id=False) >>> f.as_table() - Name: - Url: - Comment: + Name: + Url: + Comment: On a real Web page, you probably don't want every widget to look the same. You might want a larger input element for the comment, and you might want the @@ -161,9 +161,9 @@ Django will then include the extra attributes in the rendered output: >>> f = CommentForm(auto_id=False) >>> f.as_table() - Name: - Url: - Comment: + Name: + Url: + Comment: You can also set the HTML ``id`` using :attr:`~Widget.attrs`. See :attr:`BoundField.id_for_label` for an example. @@ -211,18 +211,18 @@ foundation for custom widgets. >>> from django import forms >>> name = forms.TextInput(attrs={'size': 10, 'title': 'Your name',}) >>> name.render('name', 'A name') - '' + '' If you assign a value of ``True`` or ``False`` to an attribute, it will be rendered as an HTML5 boolean attribute:: >>> name = forms.TextInput(attrs={'required': True}) >>> name.render('name', 'A name') - '' + '' >>> >>> name = forms.TextInput(attrs={'required': False}) >>> name.render('name', 'A name') - '' + '' .. attribute:: Widget.supports_microseconds @@ -701,16 +701,16 @@ that specifies the template used to render each choice. For example, for the .. code-block:: html

- John + John

- Paul + Paul

- George + George

- Ringo + Ringo

That included the ```` tags. To get more granular, you can use each @@ -732,22 +732,22 @@ that specifies the template used to render each choice. For example, for the John - + Paul - + George - + Ringo - + If you decide not to loop over the radio buttons -- e.g., if your template diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index bc870b101b..e2e8e4cec1 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -124,7 +124,7 @@ All attributes should be considered read-only, unless stated otherwise. .. attribute:: HttpRequest.FILES A dictionary-like object containing all uploaded files. Each key in - ``FILES`` is the ``name`` from the ````. Each + ``FILES`` is the ``name`` from the ````. Each value in ``FILES`` is an :class:`~django.core.files.uploadedfile.UploadedFile`. See :doc:`/topics/files` for more information. diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index ec05d16292..6f37b04320 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1192,7 +1192,7 @@ value to a maximum value, and then applies that ratio to a constant. For example:: Bar

+ height="10" width="{% widthratio this_value max_value max_width %}"> If ``this_value`` is 175, ``max_value`` is 200, and ``max_width`` is 100, the image in the above example will be 88 pixels wide @@ -1832,14 +1832,14 @@ If ``value`` is ``['a', 'b', 'c', 'd']`` or ``"abcd"``, the output will be -------------- Replaces line breaks in plain text with appropriate HTML; a single -newline becomes an HTML line break (``
``) and a new line +newline becomes an HTML line break (``
``) and a new line followed by a blank line becomes a paragraph break (``

``). For example:: {{ value|linebreaks }} -If ``value`` is ``Joel\nis a slug``, the output will be ``

Joel
is a +If ``value`` is ``Joel\nis a slug``, the output will be ``

Joel
is a slug

``. .. templatefilter:: linebreaksbr @@ -1848,13 +1848,13 @@ slug

``. ---------------- Converts all newlines in a piece of plain text to HTML line breaks -(``
``). +(``
``). For example:: {{ value|linebreaksbr }} -If ``value`` is ``Joel\nis a slug``, the output will be ``Joel
is a +If ``value`` is ``Joel\nis a slug``, the output will be ``Joel
is a slug``. .. templatefilter:: linenumbers @@ -2531,20 +2531,20 @@ app is installed, the tag will serve files using ``url()`` method of the storage specified by :setting:`STATICFILES_STORAGE`. For example:: {% load static %} - Hi!

It is also able to consume standard context variables, e.g. assuming a ``user_stylesheet`` variable is passed to the template:: {% load static %} - + If you'd like to retrieve a static URL without displaying it, you can use a slightly different call:: {% load static %} {% static "images/hi.jpg" as myphoto %} -

.. admonition:: Using Jinja2 templates? @@ -2561,7 +2561,7 @@ over exactly where and how :setting:`STATIC_URL` is injected into the template, you can use the :ttag:`get_static_prefix` template tag:: {% load static %} - Hi!

There's also a second form you can use to avoid extra processing if you need the value multiple times:: @@ -2569,8 +2569,8 @@ the value multiple times:: {% load static %} {% get_static_prefix as STATIC_PREFIX %} - Hi!

.. templatetag:: get_media_prefix diff --git a/docs/ref/templates/language.txt b/docs/ref/templates/language.txt index 806832e061..c6ce3b3dfd 100644 --- a/docs/ref/templates/language.txt +++ b/docs/ref/templates/language.txt @@ -291,7 +291,7 @@ It's easiest to understand template inheritance by starting with an example:: - + {% block title %}My amazing site{% endblock %} @@ -344,7 +344,7 @@ like:: - + My amazing blog diff --git a/docs/releases/2.1.txt b/docs/releases/2.1.txt index c0bd207445..3465f41ce5 100644 --- a/docs/releases/2.1.txt +++ b/docs/releases/2.1.txt @@ -255,6 +255,10 @@ Miscellaneous :class:`~django.forms.SelectMultiple` widget now uses HTML5 boolean syntax rather than XHTML's ``multiple="multiple"``. +* HTML rendered by form widgets no longer includes a closing slash on void + elements, e.g. ``
``. This is incompatible within XHTML, although some + widgets already used aspects of HTML5 such as boolean attributes. + .. _deprecated-features-2.1: Features deprecated in 2.1 diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt index 3e8a63c25f..a118e56543 100644 --- a/docs/topics/auth/default.txt +++ b/docs/topics/auth/default.txt @@ -1056,8 +1056,8 @@ implementation details see :ref:`using-the-views`. - - + + {# Assumes you setup the password_reset view in your URLconf #} diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt index 08c0194e53..cb07e7ad59 100644 --- a/docs/topics/forms/formsets.txt +++ b/docs/topics/forms/formsets.txt @@ -29,8 +29,8 @@ would with a regular form:: >>> formset = ArticleFormSet() >>> for form in formset: ... print(form.as_table()) - Title: - Pub date: + Title: + Pub date: As you can see it only displayed one empty form. The number of empty forms that is displayed is controlled by the ``extra`` parameter. By default, @@ -69,12 +69,12 @@ example:: >>> for form in formset: ... print(form.as_table()) - Title: - Pub date: - Title: - Pub date: - Title: - Pub date: + Title: + Pub date: + Title: + Pub date: + Title: + Pub date: There are now a total of three forms showing above. One for the initial data that was passed in and two extra forms. Also note that we are passing in a @@ -103,8 +103,8 @@ gives you the ability to limit the number of forms the formset will display:: >>> formset = ArticleFormSet() >>> for form in formset: ... print(form.as_table()) - Title: - Pub date: + Title: + Pub date: If the value of ``max_num`` is greater than the number of existing items in the initial data, up to ``extra`` additional blank forms will be added to the @@ -406,15 +406,15 @@ Lets you create a formset with the ability to order:: ... ]) >>> for form in formset: ... print(form.as_table()) - Title: - Pub date: - Order: - Title: - Pub date: - Order: - Title: - Pub date: - Order: + Title: + Pub date: + Order: + Title: + Pub date: + Order: + Title: + Pub date: + Order: This adds an additional field to each form. This new field is named ``ORDER`` and is an ``forms.IntegerField``. For the forms that came from the initial @@ -466,15 +466,15 @@ Lets you create a formset with the ability to select forms for deletion:: ... ]) >>> for form in formset: ... print(form.as_table()) - Title: - Pub date: - Delete: - Title: - Pub date: - Delete: - Title: - Pub date: - Delete: + Title: + Pub date: + Delete: + Title: + Pub date: + Delete: + Title: + Pub date: + Delete: Similar to ``can_order`` this adds a new field to each form named ``DELETE`` and is a ``forms.BooleanField``. When data comes through marking any of the @@ -540,9 +540,9 @@ default fields/attributes of the order and deletion fields:: >>> formset = ArticleFormSet() >>> for form in formset: ... print(form.as_table()) - Title: - Pub date: - My field: + Title: + Pub date: + My field: .. _custom-formset-form-kwargs: @@ -592,14 +592,14 @@ For example, in the default case, you might see: .. code-block:: html Title: - + But with ``ArticleFormset(prefix='article')`` that becomes: .. code-block:: html Title: - + This is useful if you want to :ref:`use more than one formset in a view `. diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt index 86de7d1b06..71d5a37ed9 100644 --- a/docs/topics/forms/index.txt +++ b/docs/topics/forms/index.txt @@ -259,7 +259,7 @@ The whole form, when rendered for the first time, will look like: .. code-block:: html+django Your name: - + Note that it **does not** include the `` All the form's fields and their attributes will be unpacked into HTML markup @@ -512,13 +512,13 @@ Here's the output of ``{{ form.as_p }}`` for our ``ContactForm`` instance: .. code-block:: html+django

Subject: -

Message:

Sender: -

Cc myself: -

Note that each form field has an ID attribute set to ``id_``, which is referenced by the accompanying label tag. This is important in ensuring that diff --git a/docs/topics/forms/media.txt b/docs/topics/forms/media.txt index 28c5054bc3..6b9165339f 100644 --- a/docs/topics/forms/media.txt +++ b/docs/topics/forms/media.txt @@ -71,7 +71,7 @@ can be retrieved through this property:: >>> w = CalendarWidget() >>> print(w.media) - + @@ -114,9 +114,9 @@ requirements:: If this last CSS definition were to be rendered, it would become the following HTML:: - - - + + + ``js`` ------ @@ -145,8 +145,8 @@ example above:: >>> w = FancyCalendarWidget() >>> print(w.media) - - + + @@ -165,7 +165,7 @@ an ``extend=False`` declaration to the ``Media`` declaration:: >>> w = FancyCalendarWidget() >>> print(w.media) - + If you require even more control over inheritance, define your assets using a @@ -228,7 +228,7 @@ was ``None``:: >>> w = CalendarWidget() >>> print(w.media) - + @@ -236,7 +236,7 @@ But if :setting:`STATIC_URL` is ``'http://static.example.com/'``:: >>> w = CalendarWidget() >>> print(w.media) - + @@ -245,7 +245,7 @@ Or if :mod:`~django.contrib.staticfiles` is configured using the >>> w = CalendarWidget() >>> print(w.media) - + @@ -268,12 +268,12 @@ operator to filter out a medium of interest. For example:: >>> w = CalendarWidget() >>> print(w.media) - + >>> print(w.media['css']) - + When you use the subscript operator, the value that is returned is a new ``Media`` object -- but one that only contains the media of interest. @@ -300,7 +300,7 @@ specified by both:: >>> w1 = CalendarWidget() >>> w2 = OtherWidget() >>> print(w1.media + w2.media) - + @@ -362,7 +362,7 @@ are part of the form:: >>> f = ContactForm() >>> f.media - + @@ -382,8 +382,8 @@ form:: >>> f = ContactForm() >>> f.media - - + + diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt index 3c49e3b8e3..553271e598 100644 --- a/docs/topics/forms/modelforms.txt +++ b/docs/topics/forms/modelforms.txt @@ -770,14 +770,14 @@ with the ``Author`` model. It works just like a regular formset:: >>> formset = AuthorFormSet() >>> print(formset) - - Name: + + Name: Title: + .. note:: @@ -959,10 +959,10 @@ so long as the total number of forms does not exceed ``max_num``:: >>> formset = AuthorFormSet(queryset=Author.objects.order_by('name')) >>> for form in formset: ... print(form.as_table()) - Name: - Name: - Name: - Name: + Name: + Name: + Name: + Name: A ``max_num`` value of ``None`` (the default) puts a high limit on the number of forms displayed (1000). In practice this is equivalent to no limit. diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt index 902dd7aa3a..eb97677777 100644 --- a/docs/topics/i18n/timezones.txt +++ b/docs/topics/i18n/timezones.txt @@ -204,7 +204,7 @@ Include a form in ``template.html`` that will ``POST`` to this view: {% endfor %} - + .. _time-zones-in-forms: diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 305f3a5839..5003bfb997 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -610,7 +610,7 @@ filters::

{% for stage in tour_stages %} - {% cycle start end %}: {{ stage }}{% if forloop.counter|divisibleby:2 %}
{% else %}, {% endif %} + {% cycle start end %}: {{ stage }}{% if forloop.counter|divisibleby:2 %}
{% else %}, {% endif %} {% endfor %}

@@ -891,9 +891,9 @@ use the ``{% get_language_info %}`` tag:: You can then access the information:: - Language code: {{ lang.code }}
- Name of language: {{ lang.name_local }}
- Name in English: {{ lang.name }}
+ Language code: {{ lang.code }}
+ Name of language: {{ lang.name_local }}
+ Name in English: {{ lang.name }}
Bi-directional: {{ lang.bidi }} Name in the active language: {{ lang.name_translated }} @@ -1788,7 +1788,7 @@ Here's example HTML template code: {% load i18n %} In this example, Django looks up the URL of the page to which the user will be diff --git a/docs/topics/pagination.txt b/docs/topics/pagination.txt index 81efaafd28..80a6b66fc6 100644 --- a/docs/topics/pagination.txt +++ b/docs/topics/pagination.txt @@ -101,7 +101,7 @@ pages along with any interesting information from the objects themselves:: {% for contact in contacts %} {# Each "contact" is a Contact model object. #} - {{ contact.full_name|upper }}
+ {{ contact.full_name|upper }}
... {% endfor %} diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt index c7ae792fb5..d3be9e2124 100644 --- a/docs/topics/testing/tools.txt +++ b/docs/topics/testing/tools.txt @@ -1485,7 +1485,7 @@ your test suite. self.assertHTMLEqual( '

Hello world!

', '''
- Hello world! + Hello world!
''' ) self.assertHTMLEqual( -- cgit v1.3