Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lms/static/sass/_build-lms-v1.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 0 additions & 1 deletion lms/static/sass/bootstrap/lms-main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
29 changes: 0 additions & 29 deletions lms/static/sass/features/_next-up-banner.scss

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ <h2 class="hd hd-3 page-title">${course.display_name_with_default}</h2>
</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
Expand Down

This file was deleted.

22 changes: 4 additions & 18 deletions openedx/features/course_experience/views/course_home.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
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>'
Expand Down Expand Up @@ -83,24 +82,21 @@ def _get_resume_course_info(self, request, course_id):
"""
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)
resume_block = get_resume_block(course_outline_root_block) if course_outline_root_block else None
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):
"""
Expand Down Expand Up @@ -139,7 +135,6 @@ def render_to_fragment(self, request, course_id=None, **kwargs):
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
Expand All @@ -161,11 +156,8 @@ def render_to_fragment(self, request, course_id=None, **kwargs):
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
Expand All @@ -174,11 +166,6 @@ def render_to_fragment(self, request, course_id=None, **kwargs):
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
Expand Down Expand Up @@ -239,7 +226,6 @@ def render_to_fragment(self, request, course_id=None, **kwargs):
'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,
Expand Down
27 changes: 0 additions & 27 deletions openedx/features/course_experience/views/next_up_banner.py

This file was deleted.