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

Merge pull request #27999 from edx/aehsan/van-526/activation_cta_issues_fixed

Browse Source 
activation a11y issue fixed
This commit is contained in:
Adeel Ehsan
2021-06-23 00:47:33 +05:00
committed by GitHub
parent 1748992468 2e650110c9
commit a8d1fb11ab
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lms/static/js/dashboard/legacy.js
View File

@@ -234,17 +234,20 @@
url: urls.sendAccountActivationEmail,
data: $(this).serializeArray(),
success: function() {
$('#activate-account-modal p svg').remove();
// xss-lint: disable=javascript-jquery-append
$('#activate-account-modal p').append(
// xss-lint: disable=javascript-concat-html
'<svg style="vertical-align:bottom" width="20" height="20"' +
// xss-lint: disable=javascript-concat-html
'viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">\n' +
// xss-lint: disable=javascript-concat-html
'<path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" fill="#178253"/>\n' +
'</svg>'
);
setTimeout(
function(){
$('#activate-account-modal p svg').remove();
// xss-lint: disable=javascript-jquery-append
$('#activate-account-modal p').append(
// xss-lint: disable=javascript-concat-html
'<svg style="vertical-align:bottom" width="20" height="20"' +
// xss-lint: disable=javascript-concat-html
'viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">\n' +
// xss-lint: disable=javascript-concat-html
'<path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" fill="#178253"/>\n' +
'</svg>'
);
}, 500); // adding timeout to make spinner animation longer
}
});
e.preventDefault();
@@ -252,7 +255,7 @@
// xss-lint: disable=javascript-jquery-append
$('#activate-account-modal p').append(
// xss-lint: disable=javascript-concat-html
'<svg class="fa-pulse" style="vertical-align:bottom" width="24" height="24"' +
'<svg class="fa-pulse" style="vertical-align:bottom" width="20" height="20"' +
// xss-lint: disable=javascript-concat-html
'viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">\n' +
// xss-lint: disable=javascript-concat-html
@@ -270,6 +273,7 @@
display: 'block',
'z-index': 0
});
$('#activate-account-modal').focus()
}
$('.action-email-settings').each(function(index) {

2
lms/templates/dashboard.html
View File

@@ -319,7 +319,7 @@ from common.djangoapps.student.models import CourseEnrollment
</main>
%if show_account_activation_popup:
<div id="activate-account-modal" class="modal activate-account-modal" aria-hidden="true">
<div id="activate-account-modal" class="modal activate-account-modal" aria-hidden="true" tabindex=0 >
<div class="inner-wrapper" role="dialog" aria-labelledby="activate-account-modal-title" aria-live="polite">
<h3>
${_("Activate your account so you can log back in")}