Skip to content

Commit 736edbe

Browse files
committed
Change .djDebugClose <a> tag to more semantic <button type="button">
Anchor tags are for hyperlinks. The close button does not link to (nor contains) a new URL. The href was previously specified as an empty string. Replace these with actual buttons. The buttons continue to be styled the same as before. The CSS was simplified a bit due to the change in the element.
1 parent 26aae88 commit 736edbe

File tree

10 files changed

+9
-12
lines changed

10 files changed

+9
-12
lines changed

debug_toolbar/static/debug_toolbar/css/toolbar.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@
366366
}
367367

368368
#djDebug .djdt-panelContent .djDebugClose {
369-
display: block;
370369
position: absolute;
371370
top: 4px;
372371
right: 15px;
@@ -381,7 +380,6 @@
381380
text-align: center;
382381
font-weight: 900;
383382
font-size: 20px;
384-
text-decoration: none;
385383
box-sizing: content-box;
386384
}
387385

debug_toolbar/static/debug_toolbar/js/toolbar.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ const djdt = {
4949
}
5050
}
5151
);
52-
$$.on(djDebug, "click", "a.djDebugClose", function (event) {
53-
event.preventDefault();
52+
$$.on(djDebug, "click", ".djDebugClose", function (event) {
5453
djdt.hide_one_level();
5554
});
5655
$$.on(

debug_toolbar/static/debug_toolbar/js/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function ajax(url, init) {
4242
} else {
4343
const win = document.querySelector("#djDebugWindow");
4444
win.innerHTML =
45-
'<div class="djDebugPanelTitle"><a class="djDebugClose" href="">»</a><h3>' +
45+
'<div class="djDebugPanelTitle"><button type="button" class="djDebugClose">»</button><h3>' +
4646
response.status +
4747
": " +
4848
response.statusText +

debug_toolbar/templates/debug_toolbar/includes/panel_content.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% if panel.has_content and panel.enabled %}
44
<div id="{{ panel.panel_id }}" class="djdt-panelContent djdt-hidden">
55
<div class="djDebugPanelTitle">
6-
<a href="" class="djDebugClose">×</a>
6+
<button type="button" class="djDebugClose">×</button>
77
<h3>{{ panel.title }}</h3>
88
</div>
99
<div class="djDebugPanelContent">

debug_toolbar/templates/debug_toolbar/panels/sql_explain.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% load i18n %}
22
<div class="djDebugPanelTitle">
3-
<a class="djDebugClose" href="">»</a>
3+
<button type="button" class="djDebugClose">»</button>
44
<h3>{% trans "SQL explained" %}</h3>
55
</div>
66
<div class="djDebugPanelContent">

debug_toolbar/templates/debug_toolbar/panels/sql_profile.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% load i18n %}
22
<div class="djDebugPanelTitle">
3-
<a class="djDebugClose" href="">»</a>
3+
<button type="button" class="djDebugClose">»</button>
44
<h3>{% trans "SQL profiled" %}</h3>
55
</div>
66
<div class="djDebugPanelContent">

debug_toolbar/templates/debug_toolbar/panels/sql_select.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% load i18n %}
22
<div class="djDebugPanelTitle">
3-
<a class="djDebugClose" href="">»</a>
3+
<button type="button" class="djDebugClose">»</button>
44
<h3>{% trans "SQL selected" %}</h3>
55
</div>
66
<div class="djDebugPanelContent">

debug_toolbar/templates/debug_toolbar/panels/template_source.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% load i18n %}
22
<div class="djDebugPanelTitle">
3-
<a class="djDebugClose" href="">»</a>
3+
<button type="button" class="djDebugClose">»</button>
44
<h3>{% trans "Template source:" %} <code>{{ template_name }}</code></h3>
55
</div>
66
<div class="djDebugPanelContent">

tests/panels/test_custom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_escapes_panel_title(self):
3333
"""
3434
<div id="CustomPanel" class="djdt-panelContent djdt-hidden">
3535
<div class="djDebugPanelTitle">
36-
<a href="" class="djDebugClose">×</a>
36+
<button type="button" class="djDebugClose">×</button>
3737
<h3>Title with special chars &amp;&quot;&#39;&lt;&gt;</h3>
3838
</div>
3939
<div class="djDebugPanelContent">

tests/panels/test_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def test_panel_title(self):
2424
"""
2525
<div id="SettingsPanel" class="djdt-panelContent djdt-hidden">
2626
<div class="djDebugPanelTitle">
27-
<a href="" class="djDebugClose">×</a>
27+
<button type="button" class="djDebugClose">×</button>
2828
<h3>Settings from None</h3>
2929
</div>
3030
<div class="djDebugPanelContent">

0 commit comments

Comments
 (0)