Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed #35143 -- Improved accessibility of 404/500 debug pages. #17787

Merged
merged 1 commit into from Jan 31, 2024
Merged

Fixed #35143 -- Improved accessibility of 404/500 debug pages. #17787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Expand Up @@ -638,6 +638,7 @@ answer newbie questions, and generally made Django that much better:
Marc Tamlyn <marc.tamlyn@gmail.com>
Marc-Aurèle Brothier <ma.brothier@gmail.com>
Marian Andre <django@andre.sk>
Marijke Luttekes <mail@marijkeluttekes.dev>
Marijn Vriens <marijn@metronomo.cl>
Mario Gonzalez <gonzalemario@gmail.com>
Mariusz Felisiak <felisiak.mariusz@gmail.com>
Expand Down
27 changes: 15 additions & 12 deletions django/views/templates/technical_404.html
View file
Open in desktop
Expand Up @@ -9,9 +9,9 @@
body * { padding:10px 20px; }
body * * { padding:0; }
body { font:small sans-serif; background:#eee; color:#000; }
body>div { border-bottom:1px solid #ddd; }
body > :where(header, main, footer) { border-bottom:1px solid #ddd; }
felixxm marked this conversation as resolved.
Show resolved Hide resolved
h1 { font-weight:normal; margin-bottom:.4em; }
h1 span { font-size:60%; color:#666; font-weight:normal; }
h1 small { font-size:60%; color:#666; font-weight:normal; }
table { border:none; border-collapse: collapse; width:100%; }
td, th { vertical-align:top; padding:2px 3px; }
th { width:12em; text-align:right; color:#666; padding-right:.5em; }
Expand All @@ -24,27 +24,28 @@
</style>
</head>
<body>
<div id="summary">
<h1>Page not found <span>(404)</span></h1>
<header id="summary">
<h1>Page not found <small>(404)</small></h1>
{% if reason and resolved %}<pre class="exception_value">{{ reason }}</pre>{% endif %}
<table class="meta">
<tr>
<th>Request Method:</th>
<th scope="row">Request Method:</th>
<td>{{ request.META.REQUEST_METHOD }}</td>
</tr>
<tr>
<th>Request URL:</th>
<th scope="row">Request URL:</th>
<td>{{ request.build_absolute_uri }}</td>
</tr>
{% if raising_view_name %}
<tr>
<th>Raised by:</th>
<th scope="row">Raised by:</th>
<td>{{ raising_view_name }}</td>
</tr>
{% endif %}
</table>
</div>
<div id="info">
</header>

<main id="info">
{% if urlpatterns %}
<p>
Using the URLconf defined in <code>{{ urlconf }}</code>,
Expand All @@ -54,8 +55,10 @@ <h1>Page not found <span>(404)</span></h1>
{% for pattern in urlpatterns %}
<li>
{% for pat in pattern %}
<code>
{{ pat.pattern }}
{% if forloop.last and pat.name %}[name='{{ pat.name }}']{% endif %}
</code>
{% endfor %}
</li>
{% endfor %}
Expand All @@ -69,14 +72,14 @@ <h1>Page not found <span>(404)</span></h1>
{% if resolved %}matched the last one.{% else %}didn’t match any of these.{% endif %}
</p>
{% endif %}
</div>
</main>

<div id="explanation">
<footer id="explanation">
<p>
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 display a standard 404 page.
</p>
</div>
</footer>
</body>
</html>
72 changes: 39 additions & 33 deletions django/views/templates/technical_500.html
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
body * { padding:10px 20px; }
body * * { padding:0; }
body { font:small sans-serif; background-color:#fff; color:#000; }
body>div { border-bottom:1px solid #ddd; }
body > :where(header, main, footer) { border-bottom:1px solid #ddd; }
h1 { font-weight:normal; }
h2 { margin-bottom:.8em; }
h3 { margin:1em 0 .5em 0; }
Expand Down Expand Up @@ -47,6 +47,8 @@
.user div.commands a { color: black; }
#summary { background: #ffc; }
#summary h2 { font-weight: normal; color: #666; }
#info { padding: 0; }
#info > * { padding:10px 20px; }
#explanation { background:#eee; }
#template, #template-not-exist { background:#f6f6f6; }
#template-not-exist ul { margin: 0 0 10px 20px; }
Expand Down Expand Up @@ -97,67 +99,69 @@
{% endif %}
</head>
<body>
<div id="summary">
<header id="summary">
<h1>{% if exception_type %}{{ exception_type }}{% else %}Report{% endif %}
{% if request %} at {{ request.path_info }}{% endif %}</h1>
<pre class="exception_value">{% if exception_value %}{{ exception_value|force_escape }}{% if exception_notes %}{{ exception_notes }}{% endif %}{% else %}No exception message supplied{% endif %}</pre>
<table class="meta">
{% if request %}
<tr>
<th>Request Method:</th>
<th scope="row">Request Method:</th>
<td>{{ request.META.REQUEST_METHOD }}</td>
</tr>
<tr>
<th>Request URL:</th>
<th scope="row">Request URL:</th>
<td>{{ request_insecure_uri }}</td>
</tr>
{% endif %}
<tr>
<th>Django Version:</th>
<th scope="row">Django Version:</th>
<td>{{ django_version_info }}</td>
</tr>
{% if exception_type %}
<tr>
<th>Exception Type:</th>
<th scope="row">Exception Type:</th>
<td>{{ exception_type }}</td>
</tr>
{% endif %}
{% if exception_type and exception_value %}
<tr>
<th>Exception Value:</th>
<th scope="row">Exception Value:</th>
<td><pre>{{ exception_value|force_escape }}</pre></td>
</tr>
{% endif %}
{% if lastframe %}
<tr>
<th>Exception Location:</th>
<th scope="row">Exception Location:</th>
<td><span class="fname">{{ lastframe.filename }}</span>, line {{ lastframe.lineno }}, in {{ lastframe.function }}</td>
</tr>
{% endif %}
{% if raising_view_name %}
<tr>
<th>Raised during:</th>
<th scope="row">Raised during:</th>
<td>{{ raising_view_name }}</td>
</tr>
{% endif %}
<tr>
<th>Python Executable:</th>
<th scope="row">Python Executable:</th>
<td>{{ sys_executable }}</td>
</tr>
<tr>
<th>Python Version:</th>
<th scope="row">Python Version:</th>
<td>{{ sys_version_info }}</td>
</tr>
<tr>
<th>Python Path:</th>
<td><pre>{{ sys_path|pprint }}</pre></td>
<th scope="row">Python Path:</th>
<td><pre><code>{{ sys_path|pprint }}</code></pre></td>
</tr>
<tr>
<th>Server time:</th>
<th scope="row">Server time:</th>
<td>{{server_time|date:"r"}}</td>
</tr>
</table>
</div>
</header>

<main id="info">
{% if unicode_hint %}
<div id="unicode-hint">
<h2>Unicode error hint</h2>
Expand Down Expand Up @@ -195,11 +199,11 @@ <h3>{{ template_info.message|force_escape }}</h3>
{% if template_info.bottom != template_info.total %} cut-bottom{% endif %}">
{% for source_line in template_info.source_lines %}
{% if source_line.0 == template_info.line %}
<tr class="error"><th>{{ source_line.0 }}</th>
<tr class="error"><th scope="row">{{ source_line.0 }}</th>
MHLut marked this conversation as resolved.
Show resolved Hide resolved
<td>{{ template_info.before }}<span class="specific">{{ template_info.during }}</span>{{ template_info.after }}</td>
</tr>
{% else %}
<tr><th>{{ source_line.0 }}</th>
<tr><th scope="row">{{ source_line.0 }}</th>
felixxm marked this conversation as resolved.
Show resolved Hide resolved
<td>{{ source_line.1 }}</td></tr>
{% endif %}
{% endfor %}
Expand Down Expand Up @@ -266,8 +270,8 @@ <h2>Local Vars</h2>
<table class="vars" id="v{{ frame.id }}">
<thead>
<tr>
<th>Variable</th>
<th>Value</th>
<th scope="col">Variable</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -354,8 +358,8 @@ <h3 id="get-info">GET</h3>
<table class="req">
<thead>
<tr>
<th>Variable</th>
<th>Value</th>
<th scope="col">Variable</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand All @@ -376,8 +380,8 @@ <h3 id="post-info">POST</h3>
<table class="req">
<thead>
<tr>
<th>Variable</th>
<th>Value</th>
<th scope="col">Variable</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand All @@ -398,8 +402,8 @@ <h3 id="files-info">FILES</h3>
<table class="req">
<thead>
<tr>
<th>Variable</th>
<th>Value</th>
<th scope="col">Variable</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand All @@ -420,8 +424,8 @@ <h3 id="cookie-info">COOKIES</h3>
<table class="req">
<thead>
<tr>
<th>Variable</th>
<th>Value</th>
<th scope="col">Variable</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand All @@ -441,8 +445,8 @@ <h3 id="meta-info">META</h3>
<table class="req">
<thead>
<tr>
<th>Variable</th>
<th>Value</th>
<th scope="col">Variable</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand All @@ -463,8 +467,8 @@ <h4>Using settings module <code>{{ settings.SETTINGS_MODULE }}</code></h4>
<table class="req">
<thead>
<tr>
<th>Setting</th>
<th>Value</th>
<th scope="col">Setting</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand All @@ -478,14 +482,16 @@ <h4>Using settings module <code>{{ settings.SETTINGS_MODULE }}</code></h4>
</table>

</div>
</main>

{% if not is_email %}
<div id="explanation">
<footer id="explanation">
<p>
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
display a standard page generated by the handler for this status code.
</p>
</div>
</footer>
{% endif %}
</body>
</html>
3 changes: 2 additions & 1 deletion docs/releases/5.1.txt
View file
Open in desktop
Expand Up @@ -156,7 +156,8 @@ Email
Error Reporting
~~~~~~~~~~~~~~~

* ...
* In order to improve accessibility, the technical 404 and 500 error pages now
use HTML landmark elements for the header, footer, and main content areas.

File Storage
~~~~~~~~~~~~
Expand Down