diff --git a/cms/envs/common.py b/cms/envs/common.py index c10ff8844c..92a6de11bc 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -2416,6 +2416,3 @@ DEFAULT_EMAIL_LOGO_URL = 'https://edx-cdn.org/v3/default/logo.png' ############## Settings for course import olx validation ############################ COURSE_OLX_VALIDATION_STAGE = 1 COURSE_OLX_VALIDATION_IGNORE_LIST = None - -################# show account activate cta after register ######################## -SHOW_ACTIVATE_CTA_POPUP_COOKIE_NAME = 'show-account-activation-popup' diff --git a/common/djangoapps/student/tests/test_email.py b/common/djangoapps/student/tests/test_email.py index 91fb58706d..0d9e7c47de 100644 --- a/common/djangoapps/student/tests/test_email.py +++ b/common/djangoapps/student/tests/test_email.py @@ -26,7 +26,8 @@ from common.djangoapps.student.views import ( SETTING_CHANGE_INITIATED, confirm_email_change, do_email_change_request, - validate_new_email) + validate_new_email +) from common.djangoapps.third_party_auth.views import inactive_user_view from common.djangoapps.util.testing import EventTestMixin from lms.djangoapps.courseware.toggles import COURSEWARE_PROCTORING_IMPROVEMENTS diff --git a/common/djangoapps/student/views/dashboard.py b/common/djangoapps/student/views/dashboard.py index 5a308360ca..0eead5ab38 100644 --- a/common/djangoapps/student/views/dashboard.py +++ b/common/djangoapps/student/views/dashboard.py @@ -741,8 +741,6 @@ def student_dashboard(request): # lint-amnesty, pylint: disable=too-many-statem enr for enr in course_enrollments if entitlement.enrollment_course_run.course_id != enr.course_id ] - show_account_activation_popup = request.COOKIES.get(settings.SHOW_ACTIVATE_CTA_POPUP_COOKIE_NAME, None) - context = { 'urls': urls, 'programs_data': programs_data, @@ -774,7 +772,6 @@ def student_dashboard(request): # lint-amnesty, pylint: disable=too-many-statem 'denied_banner': denied_banner, 'billing_email': settings.PAYMENT_SUPPORT_EMAIL, 'user': user, - 'show_account_activation_popup': show_account_activation_popup, 'logout_url': reverse('logout'), 'platform_name': platform_name, 'enrolled_courses_either_paid': enrolled_courses_either_paid, @@ -829,8 +826,4 @@ def student_dashboard(request): # lint-amnesty, pylint: disable=too-many-statem 'resume_button_urls': resume_button_urls }) - response = render_to_response('dashboard.html', context) - if show_account_activation_popup: - response.delete_cookie(settings.SHOW_ACTIVATE_CTA_POPUP_COOKIE_NAME) - - return response + return render_to_response('dashboard.html', context) diff --git a/lms/envs/common.py b/lms/envs/common.py index 9ff3195cca..e21b9e87d8 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -4672,6 +4672,3 @@ DEFAULT_EMAIL_LOGO_URL = 'https://edx-cdn.org/v3/default/logo.png' ################# Settings for olx validation. ################# COURSE_OLX_VALIDATION_STAGE = 1 COURSE_OLX_VALIDATION_IGNORE_LIST = None - -################# show account activate cta after register ######################## -SHOW_ACTIVATE_CTA_POPUP_COOKIE_NAME = 'show-account-activation-popup' diff --git a/lms/static/js/dashboard/legacy.js b/lms/static/js/dashboard/legacy.js index 0dba4c9bf9..29f7ccb777 100644 --- a/lms/static/js/dashboard/legacy.js +++ b/lms/static/js/dashboard/legacy.js @@ -224,29 +224,6 @@ return false; }); - $('#send_cta_email').click(function(e) { - $.ajax({ - type: 'POST', - url: urls.sendAccountActivationEmail, - data: $(this).serializeArray() - }); - e.preventDefault(); - - $('#activate-account-modal').css('display', 'none'); - $('#lean_overlay').css({display: 'none'}); - }); - - $('#activate-account-modal').on('click', '#button', function() { - $('#activate-account-modal').css('display', 'none'); - $('#lean_overlay').css({display: 'none'}); - }); - if ($('#activate-account-modal').css('display') === 'block') { - $('#lean_overlay').css({ - display: 'block', - 'z-index': 0 - }); - } - $('.action-email-settings').each(function(index) { $(this).attr('id', 'email-settings-' + index); // a bit of a hack, but gets the unique selector for the modal trigger diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index d8312b3e02..d63f9a9f08 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -1636,41 +1636,6 @@ a.fade-cover { } } -#activate-account-modal { - display: block; - position: fixed; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - margin-top: -60px; - text-align: left; - height: 252px; - width: 450px; - box-shadow: none; - background: none; - - .inner-wrapper { - h3 { - padding: 1.5rem 1rem 1rem 1rem; - text-align: left; - font-weight: bold; - font-size: 1.3rem; - line-height: 1.75rem; - } - border: none; - border-radius: 5px; - } -} - -.activate-account-modal-button { - text-align: right; - display: block; - padding: 1rem 1rem 1rem 0; -} -.activate-account-modal-body { - padding: 0 1rem; -} - .reasons_survey { margin: 20px; diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 9c95db04d1..5369df1551 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -5,7 +5,6 @@ <%! import pytz import six -import logging from datetime import datetime, timedelta from django.urls import reverse from django.utils.translation import ugettext as _ @@ -47,8 +46,7 @@ from common.djangoapps.student.models import CourseEnrollment edx.dashboard.legacy.init({ dashboard: "${reverse('dashboard') | n, js_escaped_string}", signInUser: "${reverse('signin_user') | n, js_escaped_string}", - changeEmailSettings: "${reverse('change_email_settings') | n, js_escaped_string}", - sendAccountActivationEmail: "${reverse('send_account_activation_email') | n, js_escaped_string}" + changeEmailSettings: "${reverse('change_email_settings') | n, js_escaped_string}" }); }); @@ -316,29 +314,6 @@ from common.djangoapps.student.models import CourseEnrollment -%if show_account_activation_popup: -
-%endif