diff --git a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py index ac50323b5a..fcf53900dc 100644 --- a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py +++ b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py @@ -754,7 +754,7 @@ class CertificatesTest(BaseInstructorDashboardTest): self.assertIn( 'Student username/email field is required and can not be empty. ' - 'Kindly fill in username/email and then press "Add Exception" button.', + 'Kindly fill in username/email and then press "Add to Exception List" button.', self.certificates_section.message.text ) diff --git a/lms/static/js/certificates/models/certificate_exception.js b/lms/static/js/certificates/models/certificate_exception.js index cee08e0d74..8385c7185e 100644 --- a/lms/static/js/certificates/models/certificate_exception.js +++ b/lms/static/js/certificates/models/certificate_exception.js @@ -32,7 +32,7 @@ validate: function(attrs){ if (!_.str.trim(attrs.user_name) && !_.str.trim(attrs.user_email)) { return gettext('Student username/email field is required and can not be empty. ' + - 'Kindly fill in username/email and then press "Add Exception" button.'); + 'Kindly fill in username/email and then press "Add to Exception List" button.'); } } diff --git a/lms/static/js/certificates/views/certificate_bulk_whitelist.js b/lms/static/js/certificates/views/certificate_bulk_whitelist.js index 419994e717..9b71832ba3 100644 --- a/lms/static/js/certificates/views/certificate_bulk_whitelist.js +++ b/lms/static/js/certificates/views/certificate_bulk_whitelist.js @@ -161,23 +161,30 @@ break; case MESSAGE_GROUP.data_format_error: - text = qty > 1 ? gettext(qty + ' records are not in correct format'): - gettext(qty + ' record is not in correct format'); + text = qty > 1 ? gettext(qty + ' records are not in correct format and not added to' + + ' the exception list'): + gettext(qty + ' record is not in correct format and not added to the exception' + + ' list'); break; case MESSAGE_GROUP.user_not_exist: - text = qty > 1 ? gettext(qty + ' learners do not exist in LMS'): - gettext(qty + ' learner does not exist in LMS'); + text = qty > 1 ? gettext(qty + ' learners do not exist in LMS and not added to the' + + ' exception list'): + gettext(qty + ' learner does not exist in LMS and not added to the exception list'); break; case MESSAGE_GROUP.user_already_white_listed: - text = qty > 1 ? gettext(qty + ' learners are already white listed'): - gettext(qty + ' learner is already white listed'); + text = qty > 1 ? gettext(qty + ' learners are already white listed and not added to' + + ' the exception list'): + gettext(qty + ' learner is already white listed and not added to the exception ' + + 'list'); break; case MESSAGE_GROUP.user_not_enrolled: - text = qty > 1 ? gettext(qty + ' learners are not enrolled in course'): - gettext(qty + ' learner is not enrolled in course'); + text = qty > 1 ? gettext(qty + ' learners are not enrolled in course and not added to' + + ' the exception list'): + gettext(qty + ' learner is not enrolled in course and not added to the exception' + + ' list'); break; } return text; @@ -199,8 +206,7 @@ chooseFile: function(event) { if (event && event.preventDefault) { event.preventDefault(); } if (event.currentTarget.files.length === 1) { - this.$el.find(DOM_SELECTORS.upload_csv_button).removeClass('is-disabled') - .addClass('btn-blue'); + this.$el.find(DOM_SELECTORS.upload_csv_button).removeClass('disabled'); this.$el.find(DOM_SELECTORS.browse_file).val( event.currentTarget.value.substring(event.currentTarget.value.lastIndexOf("\\") + 1)); } diff --git a/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js b/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js index 1207302d78..1cfcb27bbd 100644 --- a/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js +++ b/lms/static/js/spec/instructor_dashboard/certificates_exception_spec.js @@ -25,7 +25,7 @@ define([ var EXPECTED_ERRORS = { user_name_or_email_required: 'Student username/email field is required and can not be empty. ' + - 'Kindly fill in username/email and then press "Add Exception" button.' + 'Kindly fill in username/email and then press "Add to Exception List" button.' }; beforeEach(function() { @@ -338,7 +338,7 @@ define([ var error_messages = { empty_user_name_email: 'Student username/email field is required and can not be empty. ' + - 'Kindly fill in username/email and then press "Add Exception" button.', + 'Kindly fill in username/email and then press "Add to Exception List" button.', duplicate_user: "

" + (duplicate_user) + " already in exception list.

" }; diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss index a3dd5d5cbd..f0f050fed4 100644 --- a/lms/static/sass/course/instructor/_instructor_2.scss +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -2160,6 +2160,7 @@ input[name="subject"] { } #certificate-white-list-editor { + padding-top: 5px; .certificate-exception-inputs { .student-username-or-email { width: 300px; @@ -2179,7 +2180,9 @@ input[name="subject"] { .white-listed-students { margin-top: 10px; + padding-top: 5px; table { + margin-top: 5px; width: 100%; word-wrap: break-word; @@ -2260,6 +2263,7 @@ input[name="subject"] { .bulk-white-list-exception { margin-top: 10px; + padding-top: 5px; .white-list-csv { .bulk-exception-results { margin-top: 10px; @@ -2271,6 +2275,7 @@ input[name="subject"] { .message { padding: 5px 10px; margin: 2px; + border-top-style: none; } } diff --git a/lms/templates/instructor/instructor_dashboard_2/certificate-bulk-white-list.underscore b/lms/templates/instructor/instructor_dashboard_2/certificate-bulk-white-list.underscore index 79a794f425..5c53b654dc 100644 --- a/lms/templates/instructor/instructor_dashboard_2/certificate-bulk-white-list.underscore +++ b/lms/templates/instructor/instructor_dashboard_2/certificate-bulk-white-list.underscore @@ -11,7 +11,7 @@ -
+
\ No newline at end of file