diff --git a/common/static/sass/edx-pattern-library-shims/base/_variables.scss b/common/static/sass/edx-pattern-library-shims/base/_variables.scss index dba1a33ad5..fe86405bd8 100644 --- a/common/static/sass/edx-pattern-library-shims/base/_variables.scss +++ b/common/static/sass/edx-pattern-library-shims/base/_variables.scss @@ -203,6 +203,7 @@ $btn-border-radius: $component-border-radius !default; $btn-large-padding-vertical: spacing-vertical(small); $btn-large-padding-horizontal: spacing-horizontal(mid-large); + $btn-base-padding-vertical: spacing-vertical(x-small); $btn-base-padding-horizontal: spacing-horizontal(base); $btn-base-font-size: font-size(base); diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py index d01f8d00e1..aa50c0732c 100644 --- a/lms/djangoapps/courseware/views/views.py +++ b/lms/djangoapps/courseware/views/views.py @@ -30,7 +30,6 @@ from courseware.courses import ( sort_by_announcement, sort_by_start_date ) -from courseware.date_summary import VerifiedUpgradeDeadlineDate from courseware.masquerade import setup_masquerade from courseware.model_data import FieldDataCache from courseware.models import BaseStudentModuleHistory, StudentModule @@ -404,9 +403,6 @@ def course_info(request, course_id): return render_to_response('courseware/info.html', context) -UPGRADE_COOKIE_NAME = 'show_upgrade_notification' - - class StaticCourseTabView(EdxFragmentView): """ View that displays a static course tab with a given name. diff --git a/lms/static/js/courseware/course_home_events.js b/lms/static/js/courseware/course_home_events.js index 2902292de7..1d8670adc3 100644 --- a/lms/static/js/courseware/course_home_events.js +++ b/lms/static/js/courseware/course_home_events.js @@ -9,13 +9,7 @@ }); }); $('.date-summary-verified-upgrade-deadline .date-summary-link').on('click', function() { - Logger.log('edx.course.enrollment.upgrade.clicked', {location: 'sidebar'}); - }); - $('.upgrade-banner-button').on('click', function() { - Logger.log('edx.course.enrollment.upgrade.clicked', {location: 'notification'}); - }); - $('.view-verified-info').on('click', function() { - Logger.log('edx.course.home.learn_about_verified.clicked', {location: 'notification'}); + Logger.log('edx.course.enrollment.upgrade.clicked', {location: 'date-sidebar'}); }); }; }); diff --git a/lms/static/js/fixtures/courseware/course_home_events.html b/lms/static/js/fixtures/courseware/course_home_events.html index a86ab48b53..e115db5f41 100644 --- a/lms/static/js/fixtures/courseware/course_home_events.html +++ b/lms/static/js/fixtures/courseware/course_home_events.html @@ -1,21 +1,3 @@ -
-
-
-
- -
-
-

Give yourself an additional incentive to complete

-

Earn a verified certificate - Learn More -

-
-
- Upgrade Now -
-
-
-

Verification Upgrade Deadline

diff --git a/lms/static/js/spec/courseware/course_home_events_spec.js b/lms/static/js/spec/courseware/course_home_events_spec.js index 935da03bfd..3a4459dbd7 100644 --- a/lms/static/js/spec/courseware/course_home_events_spec.js +++ b/lms/static/js/spec/courseware/course_home_events_spec.js @@ -17,22 +17,10 @@ define(['jquery', 'logger', 'js/courseware/course_home_events'], function($, Log }); }); - it('sends an event when "Upgrade to Verified" is clicked from the sidebar', function() { + it('sends an event when "Upgrade to Verified" is clicked from the date sidebar', function() { $('.date-summary-link').click(); - expect(Logger.log).toHaveBeenCalledWith('edx.course.enrollment.upgrade.clicked', {location: 'sidebar'}); - }); - - it('sends an event when "Upgrade Now" is clicked from the upsell notification', function() { - $('.upgrade-banner-button').click(); - expect(Logger.log).toHaveBeenCalledWith( - 'edx.course.enrollment.upgrade.clicked', {location: 'notification'} - ); - }); - - it('sends an event when "Learn More" is clicked from the upsell notification', function() { - $('.view-verified-info').click(); - expect(Logger.log).toHaveBeenCalledWith( - 'edx.course.home.learn_about_verified.clicked', {location: 'notification'} + expect(Logger.log).toHaveBeenCalledWith('edx.course.enrollment.upgrade.clicked', + {location: 'date-sidebar'} ); }); }); diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index d127a9584e..dc9a436fc7 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -104,34 +104,6 @@ div.info-wrapper { min-width: 80px; } } - - .upgrade-msg { - flex: 5 1 60%; //This percentage was required to get the text - // in the message to wrap when collapsed. - flex-direction: column; - margin: 0; - padding: $baseline/2 0; - .msg-title { - font-weight: font-weight(semi-bold); - font-size: font-size(large); - line-height: $base-line-height; - margin: 0; - } - .view-verified-info { - margin-top: $baseline/4; - font-weight: font-weight(normal); - font-size: font-size(base); - } - - a:link, a:hover, a:visited, a:active { - text-decoration: underline !important; - } - } - - .upgrade-banner-button { - @include margin(0, 0, 0, auto); - padding: $baseline/2 $baseline; - } } } diff --git a/openedx/features/course_experience/static/course_experience/js/CourseHome.js b/openedx/features/course_experience/static/course_experience/js/CourseHome.js index 166928ee5c..3db834b7b9 100644 --- a/openedx/features/course_experience/static/course_experience/js/CourseHome.js +++ b/openedx/features/course_experience/static/course_experience/js/CourseHome.js @@ -96,7 +96,7 @@ export class CourseHome { // eslint-disable-line import/prefer-default-export const $vcDismissToggle = $('.vc-toggle', $vcMessage); const logEventProperties = { courseRunKey: this.courseRunKey }; - Logger.log('edx.course.upgrade.hero.displayed', logEventProperties); + Logger.log('edx.bi.course.upgrade.hero.displayed', logEventProperties); // Get height of container and button let vcHeight = $vcMessage.outerHeight(); @@ -125,7 +125,7 @@ export class CourseHome { // eslint-disable-line import/prefer-default-export $vcDismissToggle.click(() => { if ($vcMessage.hasClass('polite')) { // Expand message - Logger.log('edx.course.upgrade.hero.expanded', logEventProperties); + Logger.log('edx.bi.course.upgrade.hero.expanded', logEventProperties); this.persistUpgradeMessageState(false); $('.vc-fade').fadeOut(400); @@ -136,14 +136,15 @@ export class CourseHome { // eslint-disable-line import/prefer-default-export }); } else { // Collapse message - Logger.log('edx.course.upgrade.hero.collapsed', logEventProperties); + Logger.log('edx.bi.course.upgrade.hero.collapsed', logEventProperties); this.persistUpgradeMessageState(true); collapseMessage(); } }); $('.btn-upgrade', $vcMessage).click(() => { - Logger.log('edx.course.upgrade.hero.clicked', logEventProperties); + Logger.log('edx.bi.course.upgrade.hero.clicked', logEventProperties); + Logger.log('edx.course.enrollment.upgrade.clicked', { location: 'hero' }); }); } } diff --git a/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js b/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js index c31eb474c0..45958cc5b9 100644 --- a/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js +++ b/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js @@ -57,13 +57,14 @@ describe('Course Home factory', () => { it('should send events to Segment and edX on initial load', () => { expect(window.analytics.track).toHaveBeenCalledWith('Promotion Viewed', segmentEventProperties); - expect(Logger.log).toHaveBeenCalledWith('edx.course.upgrade.hero.displayed', { courseRunKey: runKey }); + expect(Logger.log).toHaveBeenCalledWith('edx.bi.course.upgrade.hero.displayed', { courseRunKey: runKey }); }); it('should send events to Segment and edX after clicking the upgrade button ', () => { $('.vc-message .btn-upgrade').click(); expect(window.analytics.track).toHaveBeenCalledWith('Promotion Viewed', segmentEventProperties); - expect(Logger.log).toHaveBeenCalledWith('edx.course.upgrade.hero.clicked', { courseRunKey: runKey }); + expect(Logger.log).toHaveBeenCalledWith('edx.bi.course.upgrade.hero.clicked', { courseRunKey: runKey }); + expect(Logger.log).toHaveBeenCalledWith('edx.course.enrollment.upgrade.clicked', { location: 'hero' }); }); });