Skip to content

E
edx-ora2
Commit 09b8bdef by Christina Roberts
Options

Merge pull request #868 from edx/christina/a11y-cleanup 

Minor a11y fixes.
parents bd5bbe38 991e2a89
Showing with 15 additions and 19 deletions
openassessment/templates/openassessmentblock/staff_area/oa_staff_area.html
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<div class="openassessment__staff-tools wrapper--staff-tools wrapper--ui-staff"> <div class="openassessment__staff-tools wrapper--staff-tools wrapper--ui-staff">
<div class="staff-info ui-staff"> <div class="staff-info ui-staff">
<button class="ui-staff_close_button ui-staff__title"><span class="sr">{% trans "Close" %}</span> <i class="icon fa fa-close" aria-hidden="true"></i></button>
<h2 class="staff-info__title ui-staff__title"> <h2 class="staff-info__title ui-staff__title">
<span class="staff-info__title__copy">{% trans "Manage Individual Learners" %}</span> <span class="staff-info__title__copy">{% trans "Manage Individual Learners" %}</span>
<button class="ui-staff_close_button"><span class="sr">{% trans "Close" %}</span> <i class="icon fa fa-close" aria-hidden="true"></i></button>
</h2> </h2>
<div class="staff-info__content ui-staff__content"> <div class="staff-info__content ui-staff__content">
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
<div class="openassessment__staff-info wrapper--staff-info wrapper--ui-staff"> <div class="openassessment__staff-info wrapper--staff-info wrapper--ui-staff">
<div class="staff-info ui-staff"> <div class="staff-info ui-staff">
<button class="ui-staff_close_button ui-staff__title"><span class="sr">{% trans "Close" %}</span> <i class="icon fa fa-close" aria-hidden="true"></i></button>
<h2 class="staff-info__title ui-staff__title"> <h2 class="staff-info__title ui-staff__title">
<span class="staff-info__title__copy">{% trans "View Assignment Statistics" %}</span> <span class="staff-info__title__copy">{% trans "View Assignment Statistics" %}</span>
<button class="ui-staff_close_button"><span class="sr">{% trans "Close" %}</span> <i class="icon fa fa-close" aria-hidden="true"></i></button>
</h2> </h2>
<div class="staff-info__content ui-staff__content"> <div class="staff-info__content ui-staff__content">
...@@ -166,9 +166,9 @@ ...@@ -166,9 +166,9 @@
{% if staff_assessment_required %} {% if staff_assessment_required %}
<div class="openassessment__staff-grading wrapper--staff-grading wrapper--ui-staff"> <div class="openassessment__staff-grading wrapper--staff-grading wrapper--ui-staff">
<div class="staff-grading ui-staff"> <div class="staff-grading ui-staff">
<button class="ui-staff_close_button ui-staff__title"><span class="sr">{% trans "Close" %}</span> <i class="icon fa fa-close" aria-hidden="true"></i></button>
<h2 class="staff-grading__title ui-staff__title"> <h2 class="staff-grading__title ui-staff__title">
<span class="staff-info__title__copy">{% trans "Grade Available Responses" %}</span> <span class="staff-info__title__copy">{% trans "Grade Available Responses" %}</span>
<button class="ui-staff_close_button"><span class="sr">{% trans "Close" %}</span> <i class="icon fa fa-close" aria-hidden="true"></i></button>
</h2> </h2>
<div class="staff-info__content ui-staff__content"> <div class="staff-info__content ui-staff__content">
......
openassessment/templates/openassessmentblock/staff_area/oa_student_info.html
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
</h2> </h2>
<div class="staff-info__status ui-staff__content__section wrapper--ui--collapse staff-info__student__response"> <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse staff-info__student__response">
<button class="ui-staff ui-slidable" aria-expanded="false" id="learner_response_{{ submission.uuid }}"> <button class="ui-staff ui-slidable" aria-controls="learner_response_content_{{ submission.uuid }}" aria-expanded="false" id="learner_response_{{ submission.uuid }}">
<h2 class="staff-info__title ui-staff__subtitle"> <h2 class="staff-info__title ui-staff__subtitle">
<i class="icon fa fa-caret-right" aria-hidden="true"></i> <i class="icon fa fa-caret-right" aria-hidden="true"></i>
<span>{% trans "Learner's Response" %}</span> <span>{% trans "Learner's Response" %}</span>
</h2> </h2>
</button> </button>
<div class="ui-slidable__content" aria-labelledby="learner_response_{{ submission.uuid }}"> <div class="ui-slidable__content" role="group" id="learner_response_content_{{ submission.uuid }}" aria-labelledby="learner_response_{{ submission.uuid }}">
{% if workflow_cancellation %} {% if workflow_cancellation %}
<p> <p>
{% if workflow_cancellation.cancelled_by %} {% if workflow_cancellation.cancelled_by %}
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
{% endif %} {% endif %}
<div class="staff-info__status ui-staff__content__section wrapper--ui--collapse staff-info__student__grade"> <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse staff-info__student__grade">
<button class="ui-staff ui-slidable" aria-expanded="false" id="final_grade_{{ submission.uuid }}"> <button class="ui-staff ui-slidable" aria-controls="final_grade_content_{{ submission.uuid }}" aria-expanded="false" id="final_grade_{{ submission.uuid }}">
<h2 class="staff-info__title ui-staff__subtitle"> <h2 class="staff-info__title ui-staff__subtitle">
<i class="icon fa fa-caret-right" aria-hidden="true"></i> <i class="icon fa fa-caret-right" aria-hidden="true"></i>
<span>{% trans "Learner's Final Grade" %}</span> <span>{% trans "Learner's Final Grade" %}</span>
</h2> </h2>
</button> </button>
<div class="ui-slidable__content" aria-labelledby="final_grade_{{ submission.uuid }}"> <div class="ui-slidable__content" role="group" id="final_grade_content_{{ submission.uuid }}" aria-labelledby="final_grade_{{ submission.uuid }}">
{% if workflow_status == "done" %} {% if workflow_status == "done" %}
<div class="staff-info__final__grade__score"> <div class="staff-info__final__grade__score">
{% with points_earned_string=score.points_earned|stringformat:"s" points_possible_string=score.points_possible|stringformat:"s" %} {% with points_earned_string=score.points_earned|stringformat:"s" points_possible_string=score.points_possible|stringformat:"s" %}
...@@ -146,13 +146,13 @@ ...@@ -146,13 +146,13 @@
{% if not workflow_cancellation %} {% if not workflow_cancellation %}
<div class="staff-info__staff-override ui-staff__content__section wrapper--ui--collapse"> <div class="staff-info__staff-override ui-staff__content__section wrapper--ui--collapse">
<button class="ui-staff ui-slidable" aria-expanded="false" id="grade_override_{{ submission.uuid }}"> <button class="ui-staff ui-slidable" aria-controls="grade_override_content_{{ submission.uuid }}" aria-expanded="false" id="grade_override_{{ submission.uuid }}">
<h2 class="staff-info__title ui-staff__subtitle"> <h2 class="staff-info__title ui-staff__subtitle">
<i class="icon fa fa-caret-right" aria-hidden="true"></i> <i class="icon fa fa-caret-right" aria-hidden="true"></i>
<span>{% trans "Submit Assessment Grade Override" %}</span> <span>{% trans "Submit Assessment Grade Override" %}</span>
</h2> </h2>
</button> </button>
<div class="staff-info__staff-override__content ui-slidable__content" aria-labelledby="grade_override_{{ submission.uuid }}"> <div class="staff-info__staff-override__content ui-slidable__content" role="group" id="grade_override_content_{{ submission.uuid }}" aria-labelledby="grade_override_{{ submission.uuid }}">
<div class="wrapper--input"> <div class="wrapper--input">
{% include "openassessmentblock/staff_area/oa_staff_override_assessment.html" %} {% include "openassessmentblock/staff_area/oa_staff_override_assessment.html" %}
</div> </div>
...@@ -160,13 +160,13 @@ ...@@ -160,13 +160,13 @@
</div> </div>
<div class="staff-info__workflow-cancellation ui-staff__content__section wrapper--ui--collapse"> <div class="staff-info__workflow-cancellation ui-staff__content__section wrapper--ui--collapse">
<button class="ui-staff ui-slidable" aria-expanded="false" id="remove_submission_{{ submission.uuid }}"> <button class="ui-staff ui-slidable" aria-controls="remove_submission_content_{{ submission.uuid }}" aria-expanded="false" id="remove_submission_{{ submission.uuid }}">
<h2 class="staff-info__title ui-staff__subtitle"> <h2 class="staff-info__title ui-staff__subtitle">
<i class="icon fa fa-caret-right" aria-hidden="true"></i> <i class="icon fa fa-caret-right" aria-hidden="true"></i>
<span>{% trans "Remove Submission From Peer Grading" %}</span> <span>{% trans "Remove Submission From Peer Grading" %}</span>
</h2> </h2>
</button> </button>
<div class="staff-info__cancel-submission__content ui-slidable__content" aria-labelledby="remove_submission_{{ submission.uuid }}"> <div class="staff-info__cancel-submission__content ui-slidable__content" role="group" id="remove_submission_content_{{ submission.uuid }}" aria-labelledby="remove_submission_{{ submission.uuid }}">
<div class="wrapper--input"> <div class="wrapper--input">
<form data-submission-uuid="{{ submission.uuid }}"> <form data-submission-uuid="{{ submission.uuid }}">
......
openassessment/templates/openassessmentblock/staff_area/oa_student_info_assessment_detail.html
{% load i18n %} {% load i18n %}
<div class="staff-info__status ui-staff__content__section wrapper--ui--collapse staff-info__{{ class_type }}__assessments"> <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse staff-info__{{ class_type }}__assessments">
<button class="ui-staff ui-slidable" aria-expanded="false" id="{{ class_type }}_{{ submission.uuid }}"> <button class="ui-staff ui-slidable" aria-controls="{{ class_type }}_content_{{ submission.uuid }}" aria-expanded="false" id="{{ class_type }}_{{ submission.uuid }}">
<h2 class="staff-info__title ui-staff__subtitle"> <h2 class="staff-info__title ui-staff__subtitle">
<i class="icon fa fa-caret-right" aria-hidden="true"></i> <i class="icon fa fa-caret-right" aria-hidden="true"></i>
<span>{{ translated_title }}</span> <span>{{ translated_title }}</span>
</h2> </h2>
</button> </button>
<div class="ui-slidable__content" aria-labelledby="{{ class_type }}_{{ submission.uuid }}"> <div class="ui-slidable__content" role="group" id="{{ class_type }}_content_{{ submission.uuid }}" aria-labelledby="{{ class_type }}_{{ submission.uuid }}">
{% for assessment in assessments %} {% for assessment in assessments %}
{% with assessment_num=forloop.counter %} {% with assessment_num=forloop.counter %}
{% if assessments|length > 1 %} {% if assessments|length > 1 %}
......
openassessment/xblock/static/css/openassessment-ltr.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/css/openassessment-rtl.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/js/spec/lms/oa_staff_area.js
...@@ -420,9 +420,9 @@ describe('OpenAssessment.StaffAreaView', function() { ...@@ -420,9 +420,9 @@ describe('OpenAssessment.StaffAreaView', function() {
var staffArea = createStaffArea(); var staffArea = createStaffArea();
chooseStudent(staffArea, 'testStudent'); chooseStudent(staffArea, 'testStudent');
$('.ui-slidable', staffArea.element).each(function(index, slidable) { $('.ui-slidable', staffArea.element).each(function(index, slidable) {
var id = slidable.id;
var content = $(slidable).next('.ui-slidable__content'); var content = $(slidable).next('.ui-slidable__content');
expect(content).toHaveAttr('aria-labelledby', id); expect(content).toHaveAttr('aria-labelledby', slidable.id);
expect(slidable).toHaveAttr('aria-controls', content.id);
}); });
}); });
......
openassessment/xblock/static/sass/oa/utilities/_shame.scss
...@@ -189,10 +189,6 @@ ...@@ -189,10 +189,6 @@
} }
} }
.ui-staff__title {
color: $copy-staff-color !important;
}
.wrapper--staff-assessment { .wrapper--staff-assessment {
// 'p' elements in LMS have a color set on them. // 'p' elements in LMS have a color set on them.
.student__answer__display__content p { .student__answer__display__content p {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment