From 8bb88df35f49d47d1929fd713a2e73844eb868a5 Mon Sep 17 00:00:00 2001
From: Dillon Dumesnil <dillon.dumesnil@gmail.com>
Date: Fri, 23 Oct 2020 11:05:27 -0700
Subject: [PATCH] Revert "AA-51: Adds in 'Up next' banner to course home"
---
lms/static/sass/_build-lms-v1.scss | 1 -
lms/static/sass/bootstrap/lms-main.scss | 1 -
lms/static/sass/features/_next-up-banner.scss | 29 -------------------
.../course-home-fragment.html | 3 --
.../next-up-banner-fragment.html | 13 ---------
.../course_experience/views/course_home.py | 22 +++-----------
.../course_experience/views/next_up_banner.py | 27 -----------------
7 files changed, 4 insertions(+), 92 deletions(-)
delete mode 100644 lms/static/sass/features/_next-up-banner.scss
delete mode 100644 openedx/features/course_experience/templates/course_experience/next-up-banner-fragment.html
delete mode 100644 openedx/features/course_experience/views/next_up_banner.py
diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss
index cfac8d84f66..99c6c79e30e 100644
--- a/lms/static/sass/_build-lms-v1.scss
+++ b/lms/static/sass/_build-lms-v1.scss
@@ -74,7 +74,6 @@
@import 'features/content-type-gating';
@import 'features/course-duration-limits';
@import 'features/first-purchase-banner';
-@import 'features/next-up-banner';
// search
@import 'search/search';
diff --git a/lms/static/sass/bootstrap/lms-main.scss b/lms/static/sass/bootstrap/lms-main.scss
index 893a19a3c79..b26039a256c 100644
--- a/lms/static/sass/bootstrap/lms-main.scss
+++ b/lms/static/sass/bootstrap/lms-main.scss
@@ -32,7 +32,6 @@ $static-path: '../..';
@import 'features/course-upgrade-message';
@import 'features/course-duration-limits';
@import 'features/first-purchase-banner';
-@import 'features/next-up-banner';
// Individual Pages
@import "views/program-marketing-page";
diff --git a/lms/static/sass/features/_next-up-banner.scss b/lms/static/sass/features/_next-up-banner.scss
deleted file mode 100644
index aff36638f3a..00000000000
--- a/lms/static/sass/features/_next-up-banner.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-// Up next banner
-.next-up-banner {
- display: none; // Required to be none for Optimizely experiment in AA-29
- background-color: #d8edf8;
- color: #393f43;
- font-size: 16px;
- border: 1px solid #bbdff2;
- border-radius: 4px;
- box-sizing: border-box;
- line-height: 1.5;
- margin: $baseline auto;
- padding: 20px;
-
- a:not(.btn) {
- font-weight: bold;
- text-decoration: underline;
- color: #006ea9;
-
- &:hover {
- color: darken(#006ea9, 15%);
- text-decoration: underline;
- }
- }
-
- & + .page-content {
- margin-top: 0;
- padding-top: 0;
- }
-}
diff --git a/openedx/features/course_experience/templates/course_experience/course-home-fragment.html b/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
index 080b34532ad..222ef33040f 100644
--- a/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/course-home-fragment.html
@@ -63,9 +63,6 @@ from openedx.features.course_experience.course_tools import HttpMethod
</header>
<div class="page-content">
<div class="page-content-main">
- % if next_up_banner_fragment:
- ${HTML(next_up_banner_fragment.body_html())}
- % endif
% if offer_banner_fragment:
${HTML(offer_banner_fragment.content)}
% endif
diff --git a/openedx/features/course_experience/templates/course_experience/next-up-banner-fragment.html b/openedx/features/course_experience/templates/course_experience/next-up-banner-fragment.html
deleted file mode 100644
index 63762d52330..00000000000
--- a/openedx/features/course_experience/templates/course_experience/next-up-banner-fragment.html
+++ /dev/null
@@ -1,13 +0,0 @@
-## mako
-
-<%page expression_filter="h"/>
-
-<%!
-from django.utils.translation import ugettext as _
-%>
-
-<div class="next-up-banner">
- <b>${_("Get started on what's next: ")}</b>
- <a href="${resume_course_url}">${assignment_title}</a>
- (${assignment_duration})
-</div>
\ No newline at end of file
diff --git a/openedx/features/course_experience/views/course_home.py b/openedx/features/course_experience/views/course_home.py
index fe03ef2aaea..edbf2dd07e3 100644
--- a/openedx/features/course_experience/views/course_home.py
+++ b/openedx/features/course_experience/views/course_home.py
@@ -48,7 +48,6 @@ from .course_home_messages import CourseHomeMessageFragmentView
from .course_outline import CourseOutlineFragmentView
from .course_sock import CourseSockFragmentView
from .latest_update import LatestUpdateFragmentView
-from .next_up_banner import NextUpBannerFragmentView
from .welcome_message import WelcomeMessageFragmentView
EMPTY_HANDOUTS_HTML = u'<ol></ol>'
@@ -83,11 +82,10 @@ class CourseHomeFragmentView(EdxFragmentView):
"""
Returns information relevant to resume course functionality.
- Returns a tuple: (has_visited_course, resume_course_url, resume_course_title)
- has_visited_course: True if the user has ever visited the course, False otherwise.
+ Returns a tuple: (has_visited_course, resume_course_url)
+ has_visited_course: True if the user has ever visted the course, False otherwise.
resume_course_url: The URL of the 'resume course' block if the user has visited the course,
otherwise the URL of the course root.
- resume_course_title: The display_name of the resume course block, otherwise the display_name of course root
"""
course_outline_root_block = get_course_outline_block_tree(request, course_id, request.user)
@@ -95,12 +93,10 @@ class CourseHomeFragmentView(EdxFragmentView):
has_visited_course = bool(resume_block)
if resume_block:
resume_course_url = resume_block['lms_web_url']
- resume_course_title = resume_block['display_name']
else:
resume_course_url = course_outline_root_block['lms_web_url'] if course_outline_root_block else None
- resume_course_title = course_outline_root_block['display_name'] if course_outline_root_block else None
- return has_visited_course, resume_course_url, resume_course_title
+ return has_visited_course, resume_course_url
def _get_course_handouts(self, request, course):
"""
@@ -139,7 +135,6 @@ class CourseHomeFragmentView(EdxFragmentView):
update_message_fragment = None
course_sock_fragment = None
offer_banner_fragment = None
- next_up_banner_fragment = None
course_expiration_fragment = None
has_visited_course = None
resume_course_url = None
@@ -161,11 +156,8 @@ class CourseHomeFragmentView(EdxFragmentView):
course_sock_fragment = CourseSockFragmentView().render_to_fragment(
request, course=course, **kwargs
)
- has_visited_course, resume_course_url, resume_course_title = self._get_resume_course_info(
- request, course_id
- )
+ has_visited_course, resume_course_url = self._get_resume_course_info(request, course_id)
handouts_html = self._get_course_handouts(request, course)
-
offer_banner_fragment = get_first_purchase_offer_banner_fragment(
request.user,
course_overview
@@ -174,11 +166,6 @@ class CourseHomeFragmentView(EdxFragmentView):
request.user,
course_overview
)
-
- next_up_banner_fragment = NextUpBannerFragmentView().render_to_fragment(
- assignment_title=resume_course_title, resume_course_url=resume_course_url, assignment_duration='10 min'
- )
-
elif allow_public_outline or allow_public:
outline_fragment = CourseOutlineFragmentView().render_to_fragment(
request, course_id=course_id, user_is_enrolled=False, **kwargs
@@ -239,7 +226,6 @@ class CourseHomeFragmentView(EdxFragmentView):
'course_home_message_fragment': course_home_message_fragment,
'offer_banner_fragment': offer_banner_fragment,
'course_expiration_fragment': course_expiration_fragment,
- 'next_up_banner_fragment': next_up_banner_fragment,
'has_visited_course': has_visited_course,
'resume_course_url': resume_course_url,
'course_tools': course_tools,
diff --git a/openedx/features/course_experience/views/next_up_banner.py b/openedx/features/course_experience/views/next_up_banner.py
deleted file mode 100644
index d1067581415..00000000000
--- a/openedx/features/course_experience/views/next_up_banner.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-View logic for handling course messages.
-"""
-
-from django.template.loader import render_to_string
-from web_fragments.fragment import Fragment
-
-from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
-
-
-class NextUpBannerFragmentView(EdxFragmentView):
- """
- A fragment that displays an up next banner with a call to action to resume the course.
- """
-
- # pylint: disable=arguments-differ
- def render_to_fragment(self, assignment_title, resume_course_url, assignment_duration='10 mins'):
- """
- Renders an up next banner fragment with the provided assignment title, duration, and a link to the URL.
- """
- context = {
- 'assignment_title': assignment_title,
- 'resume_course_url': resume_course_url,
- 'assignment_duration': assignment_duration,
- }
- html = render_to_string('course_experience/next-up-banner-fragment.html', context)
- return Fragment(html)
--
GitLab