Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1136 from edx/hotfix/lms-a11y

Browse Source
This commit is contained in:
Greg Price
2013-09-26 06:39:05 -07:00
parent f004e953fc 6a412f4df6
commit 407efdaae6
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/templates/forgot_password_modal.html
View File

@@ -75,5 +75,15 @@
cycle_modal_tab("#pwd_reset_email", "#pwd_reset_button") cycle_modal_tab("#pwd_reset_email", "#pwd_reset_button")
cycle_modal_tab("#pwd_reset_button", "#forgot-password-modal .close-modal") 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) })(this)
</script> </script>

15
lms/templates/help_modal.html
View File

@@ -61,7 +61,7 @@ discussion_link = get_discussion_link(course) if course else None
<div id="feedback_error" class="modal-form-error" tabindex="-1"></div> <div id="feedback_error" class="modal-form-error" tabindex="-1"></div>
% if not user.is_authenticated(): % if not user.is_authenticated():
<label data-field="name" for="feedback_form_name">${_('Name*')}</label> <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> <label data-field="email" for="feedback_form_email">${_('E-mail*')}</label>
<input name="email" type="text" id="feedback_form_email" aria-required="true"> <input name="email" type="text" id="feedback_form_email" aria-required="true">
% endif % endif
@@ -80,8 +80,8 @@ discussion_link = get_discussion_link(course) if course else None
</form> </form>
</div> </div>
<div class="inner-wrapper" id="feedback_success_wrapper" tabindex="-1"> <div class="inner-wrapper" id="feedback_success_wrapper" tabindex="0">
<a href="#" role="button" class="close-modal" title="${_('Close Modal')}">&#10005;</a> <a href="#" role="button" class="close-modal" title="${_('Close Modal')}" tabindex="0">&#10005;</a>
<header> <header>
<h2>${_('Thank You!')}</h2> <h2>${_('Thank You!')}</h2>
@@ -106,7 +106,7 @@ discussion_link = get_discussion_link(course) if course else None
).format( ).format(
open_time=open_time, open_time=open_time,
close_time=close_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>' link_end='</a>'
)} )}
</p> </p>
@@ -119,7 +119,8 @@ discussion_link = get_discussion_link(course) if course else None
$(".help-modal .close-modal").off("click"); $(".help-modal .close-modal").off("click");
$("#lean_overlay").off("click"); $("#lean_overlay").off("click");
$("#help-modal").attr("aria-hidden", "true"); $("#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) { cycle_modal_tab = function(from_element_name, to_element_name) {
$(from_element_name).on('keydown', function(e) { $(from_element_name).on('keydown', function(e) {
@@ -156,7 +157,7 @@ discussion_link = get_discussion_link(course) if course else None
}; };
cycle_modal_tab("#feedback_link_question", "#help_wrapper .close-modal"); cycle_modal_tab("#feedback_link_question", "#help_wrapper .close-modal");
cycle_modal_tab("#feedback_submit", "#feedback_form_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) { $("#help-modal").on("keydown", function(e) {
var keyCode = e.keyCode || e.which; var keyCode = e.keyCode || e.which;
if (keyCode === 27) { if (keyCode === 27) {
@@ -194,6 +195,8 @@ discussion_link = get_discussion_link(course) if course else None
}); });
$("#feedback_form").submit(function() { $("#feedback_form").submit(function() {
$("input[type='submit']", this).attr("disabled", "disabled"); $("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() { $("#feedback_form").on("ajax:complete", function() {
$("input[type='submit']", this).removeAttr("disabled"); $("input[type='submit']", this).removeAttr("disabled");