Skip to content

Commit 01abc93

Browse files
larseggertlarseggert
authored
fix: Add popup to explain colors for liaisons needing action. Rework how aria-label is supplied for several input fields. Update vnu.jar. Adjust some field styling. (ietf-tools#4115)
* fix: Add popup to explain colors for liaisons needing action Also fix the search field styling while I'm here. * Also fix some other field styling issues while I am here
1 parent dfc0ebc commit 01abc93

11 files changed

Lines changed: 61 additions & 56 deletions

File tree

‎bin/vnu.jar‎

2.79 MB
Binary file not shown.

‎ietf/secr/templates/groups/people.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "base_site.html" %}
2-
{% load staticfiles %}
2+
{% load staticfiles widget_tweaks %}
33

44
{% block title %}Groups - People{% endblock %}
55

@@ -51,9 +51,9 @@ <h3>Add Role</h3>
5151
<table class="full-width">
5252
<tbody>
5353
<tr>
54-
<td>{{ form.name.errors }}<label for="{{ form.name.id_for_label }}" aria-label="Name"></label>{{ form.name }}</td>
55-
<td>{{ form.person.errors }}<label for="{{ form.person.id_for_label }}" aria-label="Person"></label>{{ form.person }}{% if form.person.help_text %}<br>{{ form.person.help_text }}{% endif %}</td>
56-
<td>{{ form.email.errors }}<label for="{{ form.email.id_for_label }}" aria-label="Email"></label>{{ form.email }}{% if form.email.help_text %}<br>{{ form.email.help_text }}{% endif %}</td>
54+
<td>{{ form.name.errors }}{{ form.name|attr:"aria-label:Name" }}</td>
55+
<td>{{ form.person.errors }}{{ form.person|attr:"aria-label:Person" }}{% if form.person.help_text %}<br>{{ form.person.help_text }}{% endif %}</td>
56+
<td>{{ form.email.errors }}{{ form.email|attr:"aria-label:Email" }}{% if form.email.help_text %}<br>{{ form.email.help_text }}{% endif %}</td>
5757
<td><button type="submit" name="submit">Add</button></td>
5858
</tr>
5959
</tbody>

‎ietf/templates/doc/search/search_form.html‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
class="form-horizontal"
88
action="{% url 'ietf.doc.views_search.search' %}">
99
{% csrf_token %}
10+
<!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
1011
<div class="input-group search_field">
11-
<label for="id_name" aria-label="Document name/title/RFC number"></label>
12-
{{ form.name|add_class:"form-control"|attr:"placeholder:Document name/title/RFC number" }}
13-
<span class="input-group-btn">
14-
<button class="btn btn-primary" type="submit">
15-
<i class="bi bi-search"></i>
16-
Search
17-
</button>
18-
</span>
12+
{{ form.name|add_class:"form-control"|attr:"placeholder:Document name/title/RFC number"|attr:"aria-label:Document name/title/RFC number" }}
13+
<button class="btn btn-primary" type="submit">
14+
<i class="bi bi-search"></i>
15+
Search
16+
</button>
1917
</div>
2018
{{ form.sort }}
2119
<div class="accordion pt-3" id="search-accordion">
@@ -42,15 +40,15 @@ <h2 class="accordion-header" id="search-heading">
4240
<div class="col-sm-8">
4341
<div class="form-check">
4442
{{ form.rfcs|add_class:"form-check-input" }}
45-
<label class="form-check-label" for="id_rfcs">RFC</label>
43+
<label class="form-check-label" for="{{ form.rfcs.id_for_label }}">RFC</label>
4644
</div>
4745
<div class="form-check">
4846
{{ form.activedrafts|add_class:"form-check-input" }}
49-
<label class="form-check-label" for="id_activedrafts">Internet-Draft (active)</label>
47+
<label class="form-check-label" for="{{ form.activedrafts.id_for_label }}">Internet-Draft (active)</label>
5048
</div>
5149
<div class="form-check">
5250
{{ form.olddrafts|add_class:"form-check-input advdoctype" }}
53-
<label class="form-check-label" for="id_olddrafts">Internet-Draft (expired, replaced or withdrawn)</label>
51+
<label class="form-check-label" for="{{ form.olddrafts.id_for_label }}">Internet-Draft (expired, replaced or withdrawn)</label>
5452
</div>
5553
{% for value, label in form.fields.doctypes.choices %}
5654
<div class="form-check">
@@ -74,10 +72,10 @@ <h2 class="accordion-header" id="search-heading">
7472
value="author"
7573
{% if form.by.value == "author" %}checked{% endif %}
7674
id="author">
77-
<label for="author" class="form-check-label fw-bold">Author or Affiliation Name</label>
75+
<label for="{{ form.author.id_for_label }}" class="form-check-label fw-bold">Author or Affiliation Name</label>
7876
</div>
7977
</div>
80-
<div class="col-sm-8"><label aria-label="Author">{{ form.author|add_class:"form-control" }}</label></div>
78+
<div class="col-sm-8">{{ form.author|add_class:"form-control" }}</div>
8179
</div>
8280
<div class="row mb-3 search_field">
8381
<div class="col-sm-4">
@@ -88,10 +86,10 @@ <h2 class="accordion-header" id="search-heading">
8886
value="group"
8987
{% if form.by.value == "group" %}checked{% endif %}
9088
id="group">
91-
<label for="group" class="form-check-label fw-bold">WG</label>
89+
<label for="{{ form.group.id_for_label }}" class="form-check-label fw-bold">WG</label>
9290
</div>
9391
</div>
94-
<div class="col-sm-8"><label aria-label="Group">{{ form.group|add_class:"form-control" }}</label></div>
92+
<div class="col-sm-8">{{ form.group|add_class:"form-control" }}</div>
9593
</div>
9694
<div class="row mb-3 search_field">
9795
<div class="col-sm-4">
@@ -102,10 +100,10 @@ <h2 class="accordion-header" id="search-heading">
102100
value="area"
103101
{% if form.by.value == "area" %}checked{% endif %}
104102
id="area">
105-
<label for="area" class="form-check-label fw-bold">Area</label>
103+
<label for="{{ form.area.id_for_label }}" class="form-check-label fw-bold">Area</label>
106104
</div>
107105
</div>
108-
<div class="col-sm-8"><label aria-label="Area">{{ form.area|add_class:"form-select" }}</label></div>
106+
<div class="col-sm-8">{{ form.area|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}</div>
109107
</div>
110108
<div class="row mb-3 search_field">
111109
<div class="col-sm-4">
@@ -116,10 +114,10 @@ <h2 class="accordion-header" id="search-heading">
116114
value="ad"
117115
{% if form.by.value == "ad" %}checked{% endif %}
118116
id="areadir">
119-
<label for="areadir" class="form-check-label fw-bold">AD</label>
117+
<label for="{{ form.ad.id_for_label }}" class="form-check-label fw-bold">AD</label>
120118
</div>
121119
</div>
122-
<div class="col-sm-8"><label aria-label="AD">{{ form.ad|add_class:"form-select" }}</label></div>
120+
<div class="col-sm-8">{{ form.ad|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}</div>
123121
</div>
124122
<div class="row mb-3 search_field">
125123
<div class="col-sm-4">
@@ -130,11 +128,11 @@ <h2 class="accordion-header" id="search-heading">
130128
value="state"
131129
{% if form.by.value == "state" %}checked{% endif %}
132130
id="state">
133-
<label for="state" class="form-check-label fw-bold">IESG State</label>
131+
<label for="{{ form.state.id_for_label }}" class="form-check-label fw-bold">IESG State</label>
134132
</div>
135133
</div>
136-
<div class="col-sm-4"><label aria-label="State">{{ form.state|add_class:"form-select col-sm-4" }}</label></div>
137-
<div class="col-sm-4"><label aria-label="Substate">{{ form.substate|add_class:"form-select" }}</label></div>
134+
<div class="col-sm-4">{{ form.state|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}</div>
135+
<div class="col-sm-4">{{ form.substate|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}</div>
138136
</div>
139137
<div class="row mb-3 search_field">
140138
<div class="col-sm-4">
@@ -145,10 +143,10 @@ <h2 class="accordion-header" id="search-heading">
145143
value="irtfstate"
146144
{% if form.by.value == "irtfstate" %}checked{% endif %}
147145
id="irtfstate">
148-
<label for="irtfstate" class="form-check-label fw-bold">IRTF State</label>
146+
<label for="{{ form.irtfstate.id_for_label }}" class="form-check-label fw-bold">IRTF State</label>
149147
</div>
150148
</div>
151-
<div class="col-sm-8"><label aria-label="IRTF State">{{ form.irtfstate|add_class:"form-select" }}</label></div>
149+
<div class="col-sm-8">{{ form.irtfstate|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}</div>
152150
</div>
153151
<div class="row mb-3 search_field">
154152
<div class="col-sm-4">
@@ -159,10 +157,10 @@ <h2 class="accordion-header" id="search-heading">
159157
value="stream"
160158
{% if form.by.value == "stream" %}checked{% endif %}
161159
id="stream">
162-
<label for="stream" class="form-check-label fw-bold">Stream</label>
160+
<label for="{{ form.stream.id_for_label }}" class="form-check-label fw-bold">Stream</label>
163161
</div>
164162
</div>
165-
<div class="col-sm-8"><label aria-label="Stream">{{ form.stream|add_class:"form-select" }}</label></div>
163+
<div class="col-sm-8">{{ form.stream|add_class:"select2-field"|attr:"data-minimum-input-length:0"|attr:"data-max-entries:1"|attr:"data-minimum-results-for-search:Infinity" }}</div>
166164
</div>
167165
<div class="row mb-3 search_field">
168166
<div class="col-sm-4 d-grid">
@@ -180,8 +178,7 @@ <h2 class="accordion-header" id="search-heading">
180178
</div>
181179
</div>
182180
</form>
183-
<p class="text-center pt-3">
184-
<a href="https://www.ietf.org/search">Search page for www.ietf.org website</a>
185-
|
186-
<a href="https://mailarchive.ietf.org">Search page for IETF mail list archives</a>
181+
<p class="text-center pt-5">
182+
<a class="btn btn-outline-primary btn-sm" href="https://www.ietf.org/search">Search page for www.ietf.org website</a>
183+
<a class="btn btn-outline-primary btn-sm" href="https://mailarchive.ietf.org">Search page for IETF mail list archives</a>
187184
</p>

‎ietf/templates/doc/status_change/edit_related_rows.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
{# Copyright The IETF Trust 2015, All Rights Reserved #}
22
{% load origin %}
33
{% origin %}
4+
<!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
45
{% for rfc,choice_slug in form.relations.items %}
56
<div class="input-group mb-3">
6-
<label for="new_relation_row_{{ rfc }}" aria-label="Enter new affected RFC"></label>
77
<select class="form-control select2-field"
88
data-ajax--url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='draft' %}"
99
data-max-entries="1"
1010
data-width="resolve"
1111
data-result-key="text"
1212
name="new_relation_row_{{ rfc }}"
1313
id="new_relation_row_{{ rfc }}"
14+
aria-label="Enter new affected RFC"
1415
data-placeholder="Enter new affected RFC.">
1516
<option id="{{ rfc|upper }}" selected>
1617
{{ rfc|upper }}
1718
</option>
1819
</select>
19-
<label for="statchg_relation_row_{{ rfc }}" aria-label="Select proposed new status"></label>
20-
<select class="form-select" name="statchg_relation_row_{{ rfc }}" id="statchg_relation_row_{{ rfc }}">
20+
<select class="form-select"
21+
aria-label="Select proposed new status"
22+
name="statchg_relation_row_{{ rfc }}"
23+
id="statchg_relation_row_{{ rfc }}">
2124
<option {% if choice_slug == "" %}selected{% endif %}>
2225
(None)
2326
</option>
@@ -32,18 +35,20 @@
3235
</div>
3336
{% endfor %}
3437
<div class="input-group mb-3 new-relation-row">
35-
<label for="new_relation_row_rfc" aria-label="Enter new affected RFC"></label>
3638
<select name="new_relation_row_"
3739
id="new_relation_row_rfc"
40+
aria-label="Enter new affected RFC"
3841
class="form-control select2-field"
3942
data-ajax--url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='docalias' doc_type='draft' %}"
4043
data-result-key="text"
4144
data-max-entries="1"
4245
data-width="resolve"
4346
data-placeholder="Enter new affected RFC.">
4447
</select>
45-
<label for="statchg_relation_row" aria-label="Select proposed new status"></label>
46-
<select id="statchg_relation_row" class="form-select" name="statchg_relation_row_">
48+
<select id="statchg_relation_row"
49+
class="form-select"
50+
aria-label="Select proposed new status"
51+
name="statchg_relation_row_">
4752
<option {% if choice_slug == "" %}selected{% endif %}>
4853
(Select proposed new status.)
4954
</option>

‎ietf/templates/liaisons/liaison_table.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
{{ liaison.deadline|default:"-"|date:"Y-m-d" }}
2222
{% if liaison.deadline and not liaison.action_taken %}
2323
<br>
24-
<span class="badge rounded-pill
24+
<span title="{{ liaison.is_outgoing|yesno:'Outgoing,Incoming' }} liaison"
25+
class="badge rounded-pill
2526
{% if liaison.is_outgoing %}
2627
bg-warning
2728
{% else %}
@@ -36,4 +37,4 @@
3637
{% endfor %}
3738
</tbody>
3839
{% endif %}
39-
</table>
40+
</table>

‎ietf/templates/liaisons/search_form.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
action="{% url "ietf.liaisons.views.liaison_list" state=state %}"
99
method="get">
1010
<div class="input-group search_field my-3">
11-
<label aria-label="Liaison search">
12-
{{ form.text|add_class:"form-control"|attr:"placeholder:Title, body, identifiers, etc." }}
13-
</label>
11+
<!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
12+
{{ form.text|add_class:"form-control"|attr:"placeholder:Title, body, identifiers, etc."|attr:"aria-label:Liaison search" }}
1413
<button class="btn btn-primary" type="submit">
1514
<i class="bi bi-search"></i>
1615
Search

‎ietf/templates/nomcom/private_index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,16 @@ <h2 class="mt-3">
171171
</tr>
172172
</thead>
173173
<tbody>
174+
<!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
174175
{% for np in nominee_positions %}
175176
<tr>
176177
{% if is_chair and nomcom.group.state_id == 'active' %}
177178
<td>
178-
<label class="d-none" aria-label="np.nominee.name" for="id-{{ np.id }}"></label>
179179
<input class="batch-select form-check-input"
180180
type="checkbox"
181181
value="{{ np.id }}"
182182
id="id-{{ np.id }}"
183+
aria-label="np.nominee.name"
183184
name="selected">
184185
</td>
185186
<td class="edit">
@@ -246,4 +247,4 @@ <h2 class="mt-3">
246247
{% endblock %}
247248
{% block js %}
248249
<script src="{% static "ietf/js/list.js" %}"></script>
249-
{% endblock %}
250+
{% endblock %}

‎ietf/templates/nomcom/send_reminder_mail.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@ <h2>Send reminder to {{ reminder_description }}</h2>
3939
</tr>
4040
</thead>
4141
<tbody>
42+
<!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
4243
{% for nominee in nominees %}
4344
<tr>
4445
<td>
45-
<label class="d-none" aria-label="{{ nominee.name }}" for="id-{{ nominee.id }}"></label>
4646
<input type="checkbox"
4747
class="batch-select form-check-input"
4848
id="id-{{ nominee.id }}"
49+
aria-label="{{ nominee.name }}"
4950
value="{{ nominee.id }}"
5051
name="selected"
5152
checked>

‎ietf/templates/nomcom/view_feedback_pending.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,16 @@ <h2>Feedback pending from email list</h2>
104104
</tr>
105105
{% endif %}
106106
<tr>
107+
<!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
107108
<td>{{ form.instance.time|date:"r" }}{{ form.id }}</td>
108109
{% for choice in form.type.field.choices %}
109110
<td class="text-center">
110-
<label class="d-none" aria-label="{{ choice.1 }}" for="{{ choice.1|slugify }}"></label>
111111
<input type="radio"
112112
class="form-check-input"
113113
name="{{ form.type.html_name }}"
114114
value="{{ choice.0 }}"
115115
id="{{ choice.1|slugify }}"
116+
aria-label="{{ choice.1 }}"
116117
{% if not choice.0 %}checked{% endif %}
117118
title="{{ choice.1 }}">
118119
</td>
@@ -181,4 +182,4 @@ <h2>Feedback pending from email list</h2>
181182
</p>
182183
{% endif %}
183184
{% endblock %}
184-
{% block js %}{{ formset.media.js }}{% endblock %}
185+
{% block js %}{{ formset.media.js }}{% endblock %}

0 commit comments

Comments
 (0)