+
{% if entry.content_type %} {% filter capfirst %}{{ entry.content_type }}{% endfilter %} {% else %} diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html index 397eadf4a22..396be276f91 100644 --- a/django/contrib/admin/templates/admin/login.html +++ b/django/contrib/admin/templates/admin/login.html @@ -1,7 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n static %} -{% block extrastyle %}{{ block.super }} +{% block extrastyle %}{{ block.super }} {{ form.media }} {% endblock %} @@ -49,7 +49,7 @@
{{ form.password.errors }}
{{ form.password.label_tag }} {{ form.password }}
-
+
{% url 'admin_password_reset' as password_reset_url %}
{% if password_reset_url %}
@@ -58,7 +58,7 @@
{% endif %}
-
+
diff --git a/django/contrib/admin/templates/admin/pagination.html b/django/contrib/admin/templates/admin/pagination.html
index fc1e600805b..bef843a4449 100644
--- a/django/contrib/admin/templates/admin/pagination.html
+++ b/django/contrib/admin/templates/admin/pagination.html
@@ -8,5 +8,5 @@
{% endif %}
{{ cl.result_count }} {% if cl.result_count == 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endif %}
{% if show_all_url %} {% trans 'Show all' %}{% endif %}
-{% if cl.formset and cl.result_count %}{% endif %}
+{% if cl.formset and cl.result_count %}{% endif %}
diff --git a/django/contrib/admin/templates/admin/related_widget_wrapper.html b/django/contrib/admin/templates/admin/related_widget_wrapper.html
index af17be81113..7b0a8093929 100644
--- a/django/contrib/admin/templates/admin/related_widget_wrapper.html
+++ b/django/contrib/admin/templates/admin/related_widget_wrapper.html
@@ -7,21 +7,21 @@
- 
+
{% endif %}
{% if can_add_related %}
- 
+
{% endif %}
{% if can_delete_related %}
- 
+
{% endif %}
{% endspaceless %}
diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html
index 1417c1f599b..3bb5cba52c4 100644
--- a/django/contrib/admin/templates/admin/search_form.html
+++ b/django/contrib/admin/templates/admin/search_form.html
@@ -2,14 +2,14 @@
{% if cl.search_fields %}
diff --git a/django/contrib/admin/templates/admin/submit_line.html b/django/contrib/admin/templates/admin/submit_line.html
index d6db711953b..2e6cf057f00 100644
--- a/django/contrib/admin/templates/admin/submit_line.html
+++ b/django/contrib/admin/templates/admin/submit_line.html
@@ -1,11 +1,11 @@
{% load i18n admin_urls %}
-{% if show_save %}{% endif %}
+{% if show_save %}{% endif %}
{% if show_delete_link %}
{% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
{% endif %}
-{% if show_save_as_new %}{% endif %}
-{% if show_save_and_add_another %}{% endif %}
-{% if show_save_and_continue %}{% endif %}
+{% if show_save_as_new %}{% endif %}
+{% if show_save_and_add_another %}{% endif %}
+{% if show_save_and_continue %}{% endif %}
diff --git a/django/contrib/admin/templates/admin/widgets/clearable_file_input.html b/django/contrib/admin/templates/admin/widgets/clearable_file_input.html
index 71491fca451..80699d1a50c 100644
--- a/django/contrib/admin/templates/admin/widgets/clearable_file_input.html
+++ b/django/contrib/admin/templates/admin/widgets/clearable_file_input.html
@@ -1,6 +1,6 @@
{% if widget.is_initial %}{{ widget.initial_text }}: {{ widget.value }}{% if not widget.required %}
-
-{% endif %}
+
+{% endif %}
{{ widget.input_text }}:{% endif %}
-{% if widget.is_initial %}
+
{% endif %}
{% if can_add_related %}
-
+
{% endif %}
{% if can_delete_related %}
-
+
{% endif %}
{% endspaceless %}
diff --git a/django/contrib/admin/templates/admin/widgets/split_datetime.html b/django/contrib/admin/templates/admin/widgets/split_datetime.html
index 985f82d0abb..7fc7bf68339 100644
--- a/django/contrib/admin/templates/admin/widgets/split_datetime.html
+++ b/django/contrib/admin/templates/admin/widgets/split_datetime.html
@@ -1,4 +1,4 @@
- {{ date_label }} {% with widget=widget.subwidgets.0 %}{% include widget.template_name %}{% endwith %}
+ {{ date_label }} {% with widget=widget.subwidgets.0 %}{% include widget.template_name %}{% endwith %}
{{ time_label }} {% with widget=widget.subwidgets.1 %}{% include widget.template_name %}{% endwith %}
{{ current_label }} {{ widget.value }}
{{ change_label }} {% endif %}{% include "django/forms/widgets/input.html" %}{% if widget.value %}
{{ current_label }} {{ widget.value }}
{{ change_label }} {% endif %}{% include "django/forms/widgets/input.html" %}{% if widget.value %}
{% firstof library.grouper _("Built-in filters") %}
- {% if library.grouper %}{% blocktrans with code="{"|add:"% load "|add:library.grouper|add:" %"|add:"}" %}To use these filters, put {{ code }} in your template before using the filter.{% endblocktrans %}
{% endif %} + {% if library.grouper %}
{% blocktrans with code="{"|add:"% load "|add:library.grouper|add:" %"|add:"}" %}To use these filters, put {{ code }} in your template before using the filter.{% endblocktrans %}
{% endif %} {% for filter in library.list|dictsort:"name" %}
{{ filter.name }}
{{ filter.title }} {{ filter.body }} - {% if not forloop.last %}{% endif %} + {% if not forloop.last %}
{% endif %} {% endfor %}
{% firstof library.grouper _("Built-in tags") %}
- {% if library.grouper %}{% blocktrans with code="{"|add:"% load "|add:library.grouper|add:" %"|add:"}" %}To use these tags, put {{ code }} in your template before using the tag.{% endblocktrans %}
{% endif %} + {% if library.grouper %}
{% blocktrans with code="{"|add:"% load "|add:library.grouper|add:" %"|add:"}" %}To use these tags, put {{ code }} in your template before using the tag.{% endblocktrans %}
{% endif %} {% for tag in library.list|dictsort:"name" %}
{{ tag.name }}
{{ tag.title|striptags }}
{{ tag.body }} - {% if not forloop.last %}{% endif %} + {% if not forloop.last %}
{% endif %} {% endfor %}
{{ full_name }}. Name: {{ url_name }}.
{% endblocktrans %}
{{ view.title }}
-+
{% endifchanged %} {% endfor %} diff --git a/django/forms/forms.py b/django/forms/forms.py index 1be78149935..19d5778468a 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -274,7 +274,7 @@ class BaseForm: normal_row='
%s', + help_text_html='
%s', errors_on_separate_row=False) def as_ul(self): diff --git a/django/forms/jinja2/django/forms/widgets/clearable_file_input.html b/django/forms/jinja2/django/forms/widgets/clearable_file_input.html index 7248f32d2a6..9e76435216a 100644 --- a/django/forms/jinja2/django/forms/widgets/clearable_file_input.html +++ b/django/forms/jinja2/django/forms/widgets/clearable_file_input.html @@ -1,5 +1,5 @@ {% if widget.is_initial %}{{ widget.initial_text }}: {{ widget.value }}{% if not widget.required %} - -{% endif %}
+ +{% endif %}
{{ widget.input_text }}:{% endif %} - + diff --git a/django/forms/jinja2/django/forms/widgets/input.html b/django/forms/jinja2/django/forms/widgets/input.html index abbdf6bd26d..d5651571f22 100644 --- a/django/forms/jinja2/django/forms/widgets/input.html +++ b/django/forms/jinja2/django/forms/widgets/input.html @@ -1 +1 @@ - + diff --git a/django/forms/templates/django/forms/widgets/clearable_file_input.html b/django/forms/templates/django/forms/widgets/clearable_file_input.html index 7248f32d2a6..9e76435216a 100644 --- a/django/forms/templates/django/forms/widgets/clearable_file_input.html +++ b/django/forms/templates/django/forms/widgets/clearable_file_input.html @@ -1,5 +1,5 @@ {% if widget.is_initial %}{{ widget.initial_text }}: {{ widget.value }}{% if not widget.required %} - -{% endif %}
+ +{% endif %}
{{ widget.input_text }}:{% endif %} - + diff --git a/django/forms/templates/django/forms/widgets/input.html b/django/forms/templates/django/forms/widgets/input.html index 5feef43c553..9010a921450 100644 --- a/django/forms/templates/django/forms/widgets/input.html +++ b/django/forms/templates/django/forms/widgets/input.html @@ -1 +1 @@ - + diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 6ccbb862744..76c12e2dcb6 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -74,7 +74,7 @@ class Media: media = sorted(self._css) return chain.from_iterable([ format_html( - '', + '', self.absolute_path(path), medium ) for path in self._css[medium] ] for medium in media) diff --git a/django/template/backends/utils.py b/django/template/backends/utils.py index 8147bb49889..8d41213965a 100644 --- a/django/template/backends/utils.py +++ b/django/template/backends/utils.py @@ -6,7 +6,7 @@ from django.utils.safestring import SafeText def csrf_input(request): return format_html( - '', + '', get_token(request)) diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index 5d7665d64e9..e876c555f3b 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -404,7 +404,7 @@ def force_escape(value): def linebreaks_filter(value, autoescape=True): """ Replace 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 (````). """ autoescape = autoescape and not isinstance(value, SafeData) @@ -416,13 +416,13 @@ def linebreaks_filter(value, autoescape=True): def linebreaksbr(value, autoescape=True): """ Convert all newlines in a piece of plain text to HTML line breaks - (``
``). + (``
``). """ autoescape = autoescape and not isinstance(value, SafeData) value = normalize_newlines(value) if autoescape: value = escape(value) - return mark_safe(value.replace('\n', '
')) + return mark_safe(value.replace('\n', '
')) @register.filter(is_safe=True) diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 6d8813b2fe7..abb72fa13c9 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -54,7 +54,7 @@ class CsrfTokenNode(Node): if csrf_token == 'NOTPROVIDED': return format_html("") else: - return format_html("", csrf_token) + return format_html("", csrf_token) else: # It's very probable that the token is missing because of # misconfiguration, so we raise a warning @@ -1408,7 +1408,7 @@ def widthratio(parser, token): For example::
+ 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
diff --git a/django/test/html.py b/django/test/html.py
index fdedafe76e4..c01f73c1fba 100644
--- a/django/test/html.py
+++ b/django/test/html.py
@@ -118,7 +118,7 @@ class Element:
output += ''.join(str(c) for c in self.children)
output += '\n' % self.name
else:
- output += ' />'
+ output += '>'
return output
def __repr__(self):
diff --git a/django/utils/html.py b/django/utils/html.py
index 9c219ba1c6d..e6389d4db56 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -124,13 +124,13 @@ def format_html_join(sep, format_string, args_generator):
@keep_lazy_text
def linebreaks(value, autoescape=False):
- """Convert newlines into and
s."""
+ """Convert newlines into
and
s."""
value = normalize_newlines(value)
paras = re.split('\n{2,}', str(value))
if autoescape:
- paras = ['
%s
' % escape(p).replace('\n', '') for p in paras] + paras = ['
%s
' % escape(p).replace('\n', '') for p in paras] else: - paras = ['
%s
' % p.replace('\n', '') for p in paras] + paras = ['
%s
' % p.replace('\n', '') for p in paras] return '\n\n'.join(paras) diff --git a/django/views/static.py b/django/views/static.py index c9d4b0317a7..c93c136993b 100644 --- a/django/views/static.py +++ b/django/views/static.py @@ -62,9 +62,9 @@ DEFAULT_DIRECTORY_INDEX_TEMPLATE = """ - - - + + +
'), + 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 5e001a2f62e..bafa688f984 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) -
\n
\n
\n
' + '
\n
\n
\n
' >>> print(f.as_p()) -
-
-
-
+
+
+
+
``as_ul()`` ----------- @@ -525,12 +525,12 @@ flexibility:: >>> f = ContactForm() >>> f.as_ul() - '
Subject:
-Message:
-Sender:
-Cc myself:
+Subject:
+Message:
+Sender:
+Cc myself:
If ``auto_id`` is set to ``True``, then the form output *will* include `` """ + Java""" ) def test_form_with_iterable_boundfield(self): @@ -667,17 +667,17 @@ Java f = BeatleForm(auto_id=False) self.assertHTMLEqual( '\n'.join(str(bf) for bf in f['name']), - """ - - -""" + """ + + +""" ) self.assertHTMLEqual( '\n'.join('%s
' % bf for bf in f['name']),
- """
-
-
-"""
+ """
+
+
+"""
)
def test_form_with_iterable_boundfield_id(self):
@@ -693,24 +693,24 @@ Java
self.assertEqual(fields[0].choice_label, 'John')
self.assertHTMLEqual(
fields[0].tag(),
- ''
+ ''
)
self.assertHTMLEqual(
str(fields[0]),
''
+ 'value="john" id="id_name_0" required> John'
)
self.assertEqual(fields[1].id_for_label, 'id_name_1')
self.assertEqual(fields[1].choice_label, 'Paul')
self.assertHTMLEqual(
fields[1].tag(),
- ''
+ ''
)
self.assertHTMLEqual(
str(fields[1]),
''
+ 'value="paul" id="id_name_1" required> Paul'
)
def test_iterable_boundfield_select(self):
@@ -730,7 +730,7 @@ Java
name = CharField()
f = BeatleForm(auto_id=False)
- self.assertHTMLEqual('\n'.join(str(bf) for bf in f['name']), '')
+ self.assertHTMLEqual('\n'.join(str(bf) for bf in f['name']), '')
def test_boundfield_slice(self):
class BeatleForm(Form):
@@ -773,7 +773,7 @@ Java
""")
f = SongForm({'name': 'Yesterday', 'composers': ['P']}, auto_id=False)
- self.assertHTMLEqual(str(f['name']), '')
+ self.assertHTMLEqual(str(f['name']), '')
self.assertHTMLEqual(str(f['composers']), """
+
+
""" +""" ) def test_initial_instance_value(self): @@ -145,26 +145,26 @@ class ModelFormCallableModelDefault(TestCase): - +
+
-
+ +-
""" + +""" ) @@ -308,7 +308,7 @@ class EmptyLabelTestCase(TestCase): f = EmptyCharLabelChoiceForm() self.assertHTMLEqual( f.as_p(), - """+ """
""" +id="id_generic_relations-taggeditem-content_type-object_id-0-id">""" ) platypus = Animal.objects.create( common_name='Platypus', latin_name='Ornithorhynchus anatinus', @@ -60,29 +60,29 @@ id="id_generic_relations-taggeditem-content_type-object_id-0-id" />""" ''.join(form.as_p() for form in formset.forms), """
+name="generic_relations-taggeditem-content_type-object_id-0-tag" value="shiny" maxlength="50">
+id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">
+value="%s" id="id_generic_relations-taggeditem-content_type-object_id-0-id">+name="generic_relations-taggeditem-content_type-object_id-1-tag" maxlength="50">
+id="id_generic_relations-taggeditem-content_type-object_id-1-DELETE">
""" % tagged_item_id +id="id_generic_relations-taggeditem-content_type-object_id-1-id">""" % tagged_item_id ) lion = Animal.objects.create(common_name='Lion', latin_name='Panthera leo') formset = GenericFormSet(instance=lion, prefix='x') self.assertHTMLEqual( ''.join(form.as_p() for form in formset.forms), """-
--
""" + ++
""" ) def test_options(self): @@ -101,7 +101,7 @@ id="id_generic_relations-taggeditem-content_type-object_id-1-id" />""" % tag self.assertHTMLEqual( formset.forms[0].as_p(), '' % harmless.pk + 'id="id_generic_relations-taggeditem-content_type-object_id-0-id">' % harmless.pk ) self.assertEqual(formset.forms[0].instance, harmless) self.assertEqual(formset.forms[1].instance, mammal) diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index 5fb710faf8b..8eedf09d688 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -909,13 +909,13 @@ class FormattingTests(SimpleTestCase): self.assertHTMLEqual( form6.as_ul(), '