diff options
| author | Gabe Jackson <gabejackson@cxg.ch> | 2012-06-08 15:32:35 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-06-10 14:23:15 -0400 |
| commit | 584bd14dcfdee9585fec7794d53ce120ea73d0bc (patch) | |
| tree | 7303b054d610767073934793ae1223404444c9de /docs/topics/forms | |
| parent | a643e4d200e12d1570174fec343a27d6bc47f735 (diff) | |
Fixed #18134 -- BoundField.label_tag now includes the form's label_suffix
There was an inconsistency between how the label_tag for forms were
generated depending on which method was used: as_p, as_ul and as_table
contained code to append the label_suffix where as label_tag called on a
form field directly did NOT append the label_suffix. The code for
appending the label_suffix has been moved in to the label_tag code of
the field and the HTML generation code for as_p, as_ul and as_table now
calls this code as well.
This is a backwards incompatible change because users who have added the
label_suffix manually in their templates may now get double label_suffix
characters in their forms.
Diffstat (limited to 'docs/topics/forms')
| -rw-r--r-- | docs/topics/forms/index.txt | 16 | ||||
| -rw-r--r-- | docs/topics/forms/modelforms.txt | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt index ac58acc9e3..7d5a0ed411 100644 --- a/docs/topics/forms/index.txt +++ b/docs/topics/forms/index.txt @@ -302,7 +302,7 @@ loop:: {% for field in form %} <div class="fieldWrapper"> {{ field.errors }} - {{ field.label_tag }}: {{ field }} + {{ field.label_tag }} {{ field }} </div> {% endfor %} <p><input type="submit" value="Send message" /></p> @@ -316,8 +316,14 @@ attributes, which can be useful in your templates: The label of the field, e.g. ``Email address``. ``{{ field.label_tag }}`` - The field's label wrapped in the appropriate HTML ``<label>`` tag, - e.g. ``<label for="id_email">Email address</label>`` + The field's label wrapped in the appropriate HTML ``<label>`` tag. + + .. versionchanged:: 1.6 + + This includes the form's :attr:`~django.forms.Form.label_suffix`. For + example, the default ``label_suffix`` is a semicolon:: + + <label for="id_email">Email address:</label> ``{{ field.value }}`` The value of the field. e.g ``someone@example.com`` @@ -375,7 +381,7 @@ these two methods:: {% for field in form.visible_fields %} <div class="fieldWrapper"> {{ field.errors }} - {{ field.label_tag }}: {{ field }} + {{ field.label_tag }} {{ field }} </div> {% endfor %} <p><input type="submit" value="Send message" /></p> @@ -403,7 +409,7 @@ using the :ttag:`include` tag to reuse it in other templates:: {% for field in form %} <div class="fieldWrapper"> {{ field.errors }} - {{ field.label_tag }}: {{ field }} + {{ field.label_tag }} {{ field }} </div> {% endfor %} diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt index 4c46c6c0c0..d325a15cca 100644 --- a/docs/topics/forms/modelforms.txt +++ b/docs/topics/forms/modelforms.txt @@ -907,7 +907,7 @@ Third, you can manually render each field:: {{ formset.management_form }} {% for form in formset %} {% for field in form %} - {{ field.label_tag }}: {{ field }} + {{ field.label_tag }} {{ field }} {% endfor %} {% endfor %} </form> |