Skip to content

Commit 7b7f3c0

Browse files
ihalaij1ihalaij1
committed
Improve accessibility of All submissions page
1 parent 0fc5ed9 commit 7b7f3c0

3 files changed

Lines changed: 18 additions & 26 deletions

File tree

‎course/templates/course/staff/all_submissions_table.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<div class="accordion-item">
2828
<div class="accordion-header" id="searchHeading">
2929
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#searchCollapse" aria-expanded="true" aria-controls="searchCollapse">
30-
<i class="bi-search" style="margin-right:0.5em"></i>
30+
<i class="bi-search" style="margin-right:0.5em" aria-hidden="true"></i>
3131
{% translate "SEARCH" %} --
3232
{% if is_limited %}
3333
{% blocktranslate trimmed with displayed=displayed_count total=total_count %}
@@ -97,17 +97,17 @@
9797
return true;
9898
">
9999
<div class="col-md-5">
100-
<label for="submitter_name" class="form-label"><i class="bi-person"></i> {% translate "LABEL_SUBMITTER" %}</label>
100+
<label for="submitter_name" class="form-label"><i class="bi-person" aria-hidden="true"></i> {% translate "LABEL_SUBMITTER" %}</label>
101101
<div class="input-group">
102102
<input type="text" class="form-control" id="submitter_name" name="submitter_name"
103103
value="{{ filter_submitter_name }}" placeholder="{% translate 'FIRST_NAME' %} / {% translate 'LAST_NAME' %} / {% translate 'STUDENT_ID' %}">
104-
<button type="button" class="btn btn-outline-secondary" onclick="document.getElementById('submitter_name').value=''" title="{% translate 'CLEAR' %}" data-bs-toggle="tooltip" data-bs-title="{% translate 'CLEAR_SELECTION' %}">
105-
<i class="bi-x"></i>
104+
<button type="button" class="btn btn-outline-secondary" onclick="document.getElementById('submitter_name').value=''" data-bs-toggle="tooltip" data-bs-title="{% translate 'CLEAR_SELECTION' %}" aria-label="{% translate 'CLEAR_SELECTION' %}">
105+
<i class="bi-x" aria-hidden="true"></i>
106106
</button>
107107
</div>
108108
</div>
109109
<div class="col-md-5">
110-
<label for="exercise_id" class="form-label"><i class="bi-list-ol"></i> {% translate "LABEL_EXERCISE" %}</label>
110+
<label for="exercise_id" class="form-label"><i class="bi-list-ol" aria-hidden="true"></i> {% translate "LABEL_EXERCISE" %}</label>
111111
<select class="form-select" id="exercise_id" name="exercise_id" multiple="multiple" data-selected-ids="{{ filter_exercise_ids|join:',' }}">
112112
{% regroup exercises by course_module as exercise_modules %}
113113
{% for module in exercise_modules %}
@@ -122,7 +122,7 @@
122122
</select>
123123
</div>
124124
<div class="col-md-2">
125-
<label for="status" class="form-label"><i class="bi-question-octagon"></i> {% translate "STATUS" %}</label>
125+
<label for="status" class="form-label"><i class="bi-question-octagon" aria-hidden="true"></i> {% translate "STATUS" %}</label>
126126
<select class="form-select" id="status" name="status">
127127
<option value="">{% translate "STATUS_ANY" %}</option>
128128
<option value="not_ready" {% if filter_status == "not_ready" %}selected{% endif %}>
@@ -146,7 +146,7 @@
146146
</select>
147147
</div>
148148
<div class="col-md-6">
149-
<label for="tag_id" class="form-label"><i class="bi-tag"></i> {% translate "LABEL_SUBMISSION_TAGS" %}</label>
149+
<label for="tag_id" class="form-label"><i class="bi-tag" aria-hidden="true"></i> {% translate "LABEL_SUBMISSION_TAGS" %}</label>
150150
<select class="form-select" id="tag_id" name="tag_id" multiple="multiple" data-selected-ids="{{ filter_tag_ids|join:',' }}">
151151
{% for tag in tags %}
152152
<option value="{{ tag.id }}" data-type="{% if tag.font_white %}dark{% else %}light{% endif %}" data-color="{{ tag.color }}">
@@ -156,23 +156,23 @@
156156
</select>
157157
</div>
158158
<div class="col-md-3">
159-
<label for="assessed_manually" class="form-label"><i class="bi-pencil"></i> {% translate "ASSESSED_MANUALLY" %}</label>
159+
<label for="assessed_manually" class="form-label"><i class="bi-pencil" aria-hidden="true"></i> {% translate "ASSESSED_MANUALLY" %}</label>
160160
<select class="form-select" id="assessed_manually" name="assessed_manually">
161161
<option value="">{% translate "ALL" %}</option>
162162
<option value="yes" {% if filter_assessed_manually == "yes" %}selected{% endif %}>{% translate "YES" %}</option>
163163
<option value="no" {% if filter_assessed_manually == "no" %}selected{% endif %}>{% translate "NO" %}</option>
164164
</select>
165165
</div>
166166
<div class="col-md-3">
167-
<label for="late_penalty" class="form-label"><i class="bi-percent"></i> {% translate "INCLUDES_LATE_PENALTY" %}</label>
167+
<label for="late_penalty" class="form-label"><i class="bi-percent" aria-hidden="true"></i> {% translate "INCLUDES_LATE_PENALTY" %}</label>
168168
<select class="form-select" id="late_penalty" name="late_penalty">
169169
<option value="">{% translate "ALL" %}</option>
170170
<option value="yes" {% if filter_late_penalty == "yes" %}selected{% endif %}>{% translate "YES" %}</option>
171171
<option value="no" {% if filter_late_penalty == "no" %}selected{% endif %}>{% translate "NO" %}</option>
172172
</select>
173173
</div>
174174
<div class="col-md-2">
175-
<label for="time_range_helper" class="form-label"><i class="bi-clock-history"></i> {% translate "LABEL_SHOW_LAST" %}</label>
175+
<label for="time_range_helper" class="form-label"><i class="bi-clock-history" aria-hidden="true"></i> {% translate "LABEL_SHOW_LAST" %}</label>
176176
<select class="form-select" id="time_range_helper">
177177
<option value="">—</option>
178178
<option value="5">5 min</option>
@@ -191,32 +191,32 @@
191191
</select>
192192
</div>
193193
<div class="col-md-5">
194-
<label for="start_time" class="form-label"><i class="bi-hourglass-top"></i> {% translate "DATE_RANGE_START" %}</label>
194+
<label for="start_time" class="form-label"><i class="bi-hourglass-top" aria-hidden="true"></i> {% translate "DATE_RANGE_START" %}</label>
195195
<div class="input-group">
196196
<input type="datetime-local" class="form-control" id="start_time" name="start_time"
197197
value="{{ filter_start_time }}">
198-
<button type="button" class="btn btn-outline-secondary" onclick="document.getElementById('start_time').value=''" title="{% translate 'CLEAR' %}" data-bs-toggle="tooltip" data-bs-title="{% translate 'CLEAR_SELECTION' %}">
199-
<i class="bi-x"></i>
198+
<button type="button" class="btn btn-outline-secondary" onclick="document.getElementById('start_time').value=''" data-bs-toggle="tooltip" data-bs-title="{% translate 'CLEAR_SELECTION' %}" aria-label="{% translate 'CLEAR_SELECTION' %}">
199+
<i class="bi-x" aria-hidden="true"></i>
200200
</button>
201201
</div>
202202
</div>
203203
<div class="col-md-5">
204-
<label for="end_time" class="form-label"><i class="bi-hourglass-bottom"></i> {% translate "DATE_RANGE_END" %}</label>
204+
<label for="end_time" class="form-label"><i class="bi-hourglass-bottom" aria-hidden="true"></i> {% translate "DATE_RANGE_END" %}</label>
205205
<div class="input-group">
206206
<input type="datetime-local" class="form-control" id="end_time" name="end_time"
207207
value="{{ filter_end_time }}">
208-
<button type="button" class="btn btn-outline-secondary" onclick="document.getElementById('end_time').value=''" title="{% translate 'CLEAR' %}" data-bs-toggle="tooltip" data-bs-title="{% translate 'CLEAR_SELECTION' %}">
209-
<i class="bi-x"></i>
208+
<button type="button" class="btn btn-outline-secondary" onclick="document.getElementById('end_time').value=''" data-bs-toggle="tooltip" data-bs-title="{% translate 'CLEAR_SELECTION' %}" aria-label="{% translate 'CLEAR_SELECTION' %}">
209+
<i class="bi-x" aria-hidden="true"></i>
210210
</button>
211211
</div>
212212
</div>
213213
<div class="col-12 d-flex align-items-end">
214214
<button type="submit" class="btn btn-primary me-2">
215-
<i class="bi-search"></i> {% translate "SEARCH" %}
215+
<i class="bi-search" aria-hidden="true"></i> {% translate "SEARCH" %}
216216
</button>
217217
{% if has_filters %}
218218
<a href="{{ request.path }}" class="btn btn-secondary">
219-
<i class="bi-x-circle"></i> {% translate "CLEAR_SEARCH" %}
219+
<i class="bi-x-circle" aria-hidden="true"></i> {% translate "CLEAR_SEARCH" %}
220220
</a>
221221
{% endif %}
222222
</div>

‎locale/en/LC_MESSAGES/django.po‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,10 +1386,6 @@ msgstr "Last name"
13861386
msgid "STUDENT_ID"
13871387
msgstr "Student ID"
13881388

1389-
#: course/templates/course/staff/all_submissions_table.html
1390-
msgid "CLEAR"
1391-
msgstr ""
1392-
13931389
#: course/templates/course/staff/all_submissions_table.html
13941390
#: exercise/templates/exercise/staff/analytics.html
13951391
msgid "CLEAR_SELECTION"

‎locale/fi/LC_MESSAGES/django.po‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,10 +1394,6 @@ msgstr "Sukunimi"
13941394
msgid "STUDENT_ID"
13951395
msgstr "Opiskelijanumero"
13961396

1397-
#: course/templates/course/staff/all_submissions_table.html
1398-
msgid "CLEAR"
1399-
msgstr ""
1400-
14011397
#: course/templates/course/staff/all_submissions_table.html
14021398
#: exercise/templates/exercise/staff/analytics.html
14031399
msgid "CLEAR_SELECTION"

0 commit comments

Comments
 (0)