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

Merge pull request #16175 from edx/robrap/LEARNER-2026-clean-up

Browse Source 
LEARNER-2026: Revert remains of 'upgrade upsell to course info banner'.
This commit is contained in:
Robert Raposa
2017-10-06 10:02:49 -04:00
committed by GitHub
parent b96f646d35 e8945ebdc5
commit 91bf523920
8 changed files with 13 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/static/sass/edx-pattern-library-shims/base/_variables.scss
View File

@@ -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);

4
lms/djangoapps/courseware/views/views.py
View File

@@ -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.

8
lms/static/js/courseware/course_home_events.js
View File

@@ -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'});
});
};
});

18
lms/static/js/fixtures/courseware/course_home_events.html
View File

@@ -1,21 +1,3 @@
<div class="upgrade-banner">
<div class="notification-color-border"></div>
<div class="notification-content">
<div class="upgrade-icon">
<img src="${STATIC_URL}images/edx-verified-mini-cert.png">
</div>
<div class="upgrade-msg">
<h4 class="upgrade-msg">Give yourself an additional incentive to complete</h4>
<p class="view-verified-info">Earn a verified certificate
<a href="https://www.edx.org/verified-certificate" target="_blank">Learn More</a>
</p>
</div>
<div class="upgrade-banner-button">
<a href="/verify_student/upgrade/course-v1:Test+TestX+2015" class="btn-upgrade">Upgrade Now</a>
</div>
</div>
</div>
<div class="date-summary-container">
<div class="date-summary date-summary-verified-upgrade-deadline">
<h3 class="heading">Verification Upgrade Deadline</h3>

18
lms/static/js/spec/courseware/course_home_events_spec.js
View File

@@ -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'}
);
});
});

28
lms/static/sass/course/_info.scss
View File

@@ -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;
}
}
}

9
openedx/features/course_experience/static/course_experience/js/CourseHome.js
View File

@@ -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' });
});
}
}

5
openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js
View File

@@ -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' });
});
});