Refs #30400 -- Improved typography in debug and csrf templates.
This commit is contained in:
parent
779e615e36
commit
0e6fa65ffd
|
@ -60,14 +60,14 @@ CSRF_FAILURE_TEMPLATE = """
|
||||||
|
|
||||||
<p>In general, this can occur when there is a genuine Cross Site Request Forgery, or when
|
<p>In general, this can occur when there is a genuine Cross Site Request Forgery, or when
|
||||||
<a
|
<a
|
||||||
href="https://docs.djangoproject.com/en/{{ docs_version }}/ref/csrf/">Django's
|
href="https://docs.djangoproject.com/en/{{ docs_version }}/ref/csrf/">Django’s
|
||||||
CSRF mechanism</a> has not been used correctly. For POST forms, you need to
|
CSRF mechanism</a> has not been used correctly. For POST forms, you need to
|
||||||
ensure:</p>
|
ensure:</p>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>Your browser is accepting cookies.</li>
|
<li>Your browser is accepting cookies.</li>
|
||||||
|
|
||||||
<li>The view function passes a <code>request</code> to the template's <a
|
<li>The view function passes a <code>request</code> to the template’s <a
|
||||||
href="https://docs.djangoproject.com/en/dev/topics/templates/#django.template.backends.base.Template.render"><code>render</code></a>
|
href="https://docs.djangoproject.com/en/dev/topics/templates/#django.template.backends.base.Template.render"><code>render</code></a>
|
||||||
method.</li>
|
method.</li>
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ CSRF_FAILURE_TEMPLATE = """
|
||||||
page with the form, because the token is rotated after a login.</li>
|
page with the form, because the token is rotated after a login.</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p>You're seeing the help section of this page because you have <code>DEBUG =
|
<p>You’re seeing the help section of this page because you have <code>DEBUG =
|
||||||
True</code> in your Django settings file. Change that to <code>False</code>,
|
True</code> in your Django settings file. Change that to <code>False</code>,
|
||||||
and only the initial error message will be displayed. </p>
|
and only the initial error message will be displayed. </p>
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
<p>
|
<p>
|
||||||
{% if request_path %}
|
{% if request_path %}
|
||||||
The current path, <code>{{ request_path }}</code>,{% else %}
|
The current path, <code>{{ request_path }}</code>,{% else %}
|
||||||
The empty path{% endif %} didn't match any of these.
|
The empty path{% endif %} didn’t match any of these.
|
||||||
</p>
|
</p>
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>{{ reason }}</p>
|
<p>{{ reason }}</p>
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
|
|
||||||
<div id="explanation">
|
<div id="explanation">
|
||||||
<p>
|
<p>
|
||||||
You're seeing this error because you have <code>DEBUG = True</code> in
|
You’re seeing this error because you have <code>DEBUG = True</code> in
|
||||||
your Django settings file. Change that to <code>False</code>, and Django
|
your Django settings file. Change that to <code>False</code>, and Django
|
||||||
will display a standard 404 page.
|
will display a standard 404 page.
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -474,7 +474,7 @@ Exception Value: {{ exception_value|force_escape }}
|
||||||
{% if not is_email %}
|
{% if not is_email %}
|
||||||
<div id="explanation">
|
<div id="explanation">
|
||||||
<p>
|
<p>
|
||||||
You're seeing this error because you have <code>DEBUG = True</code> in your
|
You’re seeing this error because you have <code>DEBUG = True</code> in your
|
||||||
Django settings file. Change that to <code>False</code>, and Django will
|
Django settings file. Change that to <code>False</code>, and Django will
|
||||||
display a standard page generated by the handler for this status code.
|
display a standard page generated by the handler for this status code.
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -59,7 +59,7 @@ Using settings module {{ settings.SETTINGS_MODULE }}{% for k, v in settings.item
|
||||||
{{ k }} = {{ v|stringformat:"r" }}{% endfor %}
|
{{ k }} = {{ v|stringformat:"r" }}{% endfor %}
|
||||||
|
|
||||||
{% if not is_email %}
|
{% if not is_email %}
|
||||||
You're seeing this error because you have DEBUG = True in your
|
You’re seeing this error because you have DEBUG = True in your
|
||||||
Django settings file. Change that to False, and Django will
|
Django settings file. Change that to False, and Django will
|
||||||
display a standard page generated by the handler for this status code.
|
display a standard page generated by the handler for this status code.
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -113,13 +113,13 @@ class DebugViewTests(SimpleTestCase):
|
||||||
def test_404(self):
|
def test_404(self):
|
||||||
response = self.client.get('/raises404/')
|
response = self.client.get('/raises404/')
|
||||||
self.assertEqual(response.status_code, 404)
|
self.assertEqual(response.status_code, 404)
|
||||||
self.assertContains(response, "<code>not-in-urls</code>, didn't match", status_code=404)
|
self.assertContains(response, '<code>not-in-urls</code>, didn’t match', status_code=404)
|
||||||
|
|
||||||
def test_404_not_in_urls(self):
|
def test_404_not_in_urls(self):
|
||||||
response = self.client.get('/not-in-urls')
|
response = self.client.get('/not-in-urls')
|
||||||
self.assertNotContains(response, "Raised by:", status_code=404)
|
self.assertNotContains(response, "Raised by:", status_code=404)
|
||||||
self.assertContains(response, "Django tried these URL patterns", status_code=404)
|
self.assertContains(response, "Django tried these URL patterns", status_code=404)
|
||||||
self.assertContains(response, "<code>not-in-urls</code>, didn't match", status_code=404)
|
self.assertContains(response, '<code>not-in-urls</code>, didn’t match', status_code=404)
|
||||||
# Pattern and view name of a RegexURLPattern appear.
|
# Pattern and view name of a RegexURLPattern appear.
|
||||||
self.assertContains(response, r"^regex-post/(?P<pk>[0-9]+)/$", status_code=404)
|
self.assertContains(response, r"^regex-post/(?P<pk>[0-9]+)/$", status_code=404)
|
||||||
self.assertContains(response, "[name='regex-post']", status_code=404)
|
self.assertContains(response, "[name='regex-post']", status_code=404)
|
||||||
|
@ -130,7 +130,7 @@ class DebugViewTests(SimpleTestCase):
|
||||||
@override_settings(ROOT_URLCONF=WithoutEmptyPathUrls)
|
@override_settings(ROOT_URLCONF=WithoutEmptyPathUrls)
|
||||||
def test_404_empty_path_not_in_urls(self):
|
def test_404_empty_path_not_in_urls(self):
|
||||||
response = self.client.get('/')
|
response = self.client.get('/')
|
||||||
self.assertContains(response, "The empty path didn't match any of these.", status_code=404)
|
self.assertContains(response, 'The empty path didn’t match any of these.', status_code=404)
|
||||||
|
|
||||||
def test_technical_404(self):
|
def test_technical_404(self):
|
||||||
response = self.client.get('/technical404/')
|
response = self.client.get('/technical404/')
|
||||||
|
|
Loading…
Reference in New Issue