Skip to content

Hotfix/lms a11y #1136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gwprice merged 3 commits into from
Sep 26, 2013
Merged

Hotfix/lms a11y #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fe982f
fix a11y error in help modal
adampalay Sep 25, 2013
9affd38
fix focus management for help modal
adampalay Sep 25, 2013
6a412f4
add ESC key functionality to forgot password modal
adampalay Sep 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions lms/templates/forgot_password_modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,15 @@ <h2>${_("Password Reset")}</h2>
cycle_modal_tab("#pwd_reset_email", "#pwd_reset_button")
cycle_modal_tab("#pwd_reset_button", "#forgot-password-modal .close-modal")

// Hitting the ESC key will exit the modal
$("#forgot-password-modal").on("keydown", function(e) {
var keyCode = e.keyCode || e.which;
// 27 is the ESC key
if (keyCode === 27) {
e.preventDefault();
$("#forgot-password-modal .close-modal").click();
}
});

})(this)
</script>
15 changes: 9 additions & 6 deletions lms/templates/help_modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span c
<div id="feedback_error" class="modal-form-error" tabindex="-1"></div>
% if not user.is_authenticated():
<label data-field="name" for="feedback_form_name">${_('Name*')}</label>
<input name="name" type="text" id="feedback_form_email" aria-required="true">
<input name="name" type="text" id="feedback_form_name" aria-required="true">
<label data-field="email" for="feedback_form_email">${_('E-mail*')}</label>
<input name="email" type="text" id="feedback_form_email" aria-required="true">
% endif
Expand All @@ -80,8 +80,8 @@ <h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span c
</form>
</div>

<div class="inner-wrapper" id="feedback_success_wrapper" tabindex="-1">
<a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a>
<div class="inner-wrapper" id="feedback_success_wrapper" tabindex="0">
<a href="#" role="button" class="close-modal" title="${_('Close Modal')}" tabindex="0">&#10005;</a>

<header>
<h2>${_('Thank You!')}</h2>
Expand All @@ -106,7 +106,7 @@ <h2>${_('Thank You!')}</h2>
).format(
open_time=open_time,
close_time=close_time,
link_start='<a href="{}" target="_blank" id="feedback-faq-link">'.format(marketing_link('FAQ')),
link_start='<a href="{}" target="_blank" id="feedback-faq-link" tabindex="0">'.format(marketing_link('FAQ')),
link_end='</a>'
)}
</p>
Expand All @@ -119,7 +119,8 @@ <h2>${_('Thank You!')}</h2>
$(".help-modal .close-modal").off("click");
$("#lean_overlay").off("click");
$("#help-modal").attr("aria-hidden", "true");
$(".help-tab").focus();
$('area,input,select,textarea,button').removeAttr('tabindex');
$(".help-tab a").focus();
},
cycle_modal_tab = function(from_element_name, to_element_name) {
$(from_element_name).on('keydown', function(e) {
Expand Down Expand Up @@ -156,7 +157,7 @@ <h2>${_('Thank You!')}</h2>
};
cycle_modal_tab("#feedback_link_question", "#help_wrapper .close-modal");
cycle_modal_tab("#feedback_submit", "#feedback_form_wrapper .close-modal");
cycle_modal_tab("#feedback_faq_link", "#feedback_success_wrapper .close-modal");
cycle_modal_tab("#feedback-faq-link", "#feedback_success_wrapper .close-modal");
$("#help-modal").on("keydown", function(e) {
var keyCode = e.keyCode || e.which;
if (keyCode === 27) {
Expand Down Expand Up @@ -194,6 +195,8 @@ <h2>${_('Thank You!')}</h2>
});
$("#feedback_form").submit(function() {
$("input[type='submit']", this).attr("disabled", "disabled");
$('area,input,select,textarea,button').attr('tabindex', -1);
$("#feedback_form_wrapper .close-modal").focus();
});
$("#feedback_form").on("ajax:complete", function() {
$("input[type='submit']", this).removeAttr("disabled");
Expand Down