Skip to content

Commit 897fe6d

Browse files
authored
feat(#985): fix w3c validation (#2536)
* fix w3c validation: normalize aria roles, css decimals, and deprecated attributes * revert treeitem role in tree containers where parent has role=tree * add role=menu to subnav ul elements containing menuitem children * remove role=menuitem from non-interactive empty placeholder list items
1 parent fc05338 commit 897fe6d

File tree

8 files changed

+136
-136
lines changed

8 files changed

+136
-136
lines changed

apps/jobs/templates/jobs/base.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,36 @@ <h1 class="call-to-action">{% block header_action %}{{ jobs_count }} jobs on the
2626
<a href="{% url 'jobs:job_types' %}">Types</a>
2727
<ul class="subnav menu" role="menu" aria-hidden="true">
2828
{% for t in active_types %}
29-
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_type' slug=t.slug %}">{{ t.name }}</a></li>
29+
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_type' slug=t.slug %}">{{ t.name }}</a></li>
3030
{% empty %}
31-
<li class="tier-2" role="treeitem">No Active Types</li>
31+
<li class="tier-2">No Active Types</li>
3232
{% endfor %}
3333
</ul>
3434
</li>
3535
<li class="tier-1 element-3 {% if view.job_category_view %}current_item selected{% endif %}" aria-haspopup="true">
3636
<a href="{% url 'jobs:job_categories' %}">Categories</a>
3737
<ul class="subnav menu" role="menu" aria-hidden="true">
3838
{% for c in active_categories %}
39-
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_category' slug=c.slug %}">{{ c.name }}</a></li>
39+
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_category' slug=c.slug %}">{{ c.name }}</a></li>
4040
{% empty %}
41-
<li class="tier-2" role="treeitem">No Active Categories</li>
41+
<li class="tier-2">No Active Categories</li>
4242
{% endfor %}
4343
</ul>
4444
</li>
4545
<li class="tier-1 element-4 {% if view.job_location_view %}current_item selected{% endif %}">
4646
<a href="{% url 'jobs:job_locations' %}">Locations</a>
4747
<ul class="subnav menu" role="menu" aria-hidden="true">
48-
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_telecommute' %}">Telecommute</a></li>
48+
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_telecommute' %}">Telecommute</a></li>
4949
{% for l in active_locations %}
50-
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_location' slug=l.location_slug %}">
50+
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_location' slug=l.location_slug %}">
5151
{% if l.region and l.region != l.city %}
5252
{{ l.city }}, {{ l.region }} &ndash; {{ l.country }}
5353
{% else %}
5454
{{ l.city }} &ndash; {{ l.country }}
5555
{% endif %}
5656
</a></li>
5757
{% empty %}
58-
<li class="tier-2" role="treeitem">No Active Locations</li>
58+
<li class="tier-2">No Active Locations</li>
5959
{% endfor %}
6060
</ul>
6161
</li>
@@ -64,8 +64,8 @@ <h1 class="call-to-action">{% block header_action %}{{ jobs_count }} jobs on the
6464
<li class="tier-1 element-6 last">
6565
<a href="{% url 'jobs:job_review' %}">Admin</a>
6666
<ul class="subnav menu" role="menu" aria-hidden="true">
67-
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_review' %}">Review queue</a></li>
68-
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_moderate' %}">Moderate approved posts</a></li>
67+
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_review' %}">Review queue</a></li>
68+
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_moderate' %}">Moderate approved posts</a></li>
6969
</ul>
7070
</li>
7171
{% endif %}

apps/minutes/templates/minutes/minutes_detail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1>PSF Meeting Minutes for {{ minutes.date|date }}</h1>
4646
<h2>{{ minutes.date.year }}</h2>
4747
<ul class="section-nav menu" role="menu" aria-hidden="false">
4848
{% for item in same_year_minutes %}
49-
<li class="tier-1 element-1" role="treeitem"><a href="{{ item.get_absolute_url }}">{{ item.date|date }}</a></li>
49+
<li class="tier-1 element-1" role="menuitem"><a href="{{ item.get_absolute_url }}">{{ item.date|date }}</a></li>
5050
{% endfor %}
5151
</ul>
5252

0 commit comments

Comments
 (0)