diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.js b/common/lib/xmodule/xmodule/js/src/sequence/display.js index a0c1407943..b3fb21600c 100644 --- a/common/lib/xmodule/xmodule/js/src/sequence/display.js +++ b/common/lib/xmodule/xmodule/js/src/sequence/display.js @@ -274,7 +274,8 @@ edx.HtmlUtils.template($('#sequence-breadcrumbs-tpl').text())({ courseId: this.el.parent().data('course-id'), blockId: this.id, - pathText: this.el.find('.nav-item.active').data('path') + pathText: this.el.find('.nav-item.active').data('path'), + unifiedCourseView: this.path.data('unified-course-view') }) ); diff --git a/common/static/common/templates/sequence-breadcrumbs.underscore b/common/static/common/templates/sequence-breadcrumbs.underscore index c66e14b334..da2bd4ba91 100644 --- a/common/static/common/templates/sequence-breadcrumbs.underscore +++ b/common/static/common/templates/sequence-breadcrumbs.underscore @@ -1,7 +1,9 @@ - - - <%- gettext('Return to course outline') %> - <%- gettext('Outline') %> - - > +<% if (unifiedCourseView) { %> + + + <%- gettext('Return to course outline') %> + <%- gettext('Outline') %> + + > +<% } %> <%- pathText %> diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 902e26b954..210d695eed 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -3,6 +3,8 @@ <%namespace name='static' file='/static_content.html'/> <%def name="online_help_token()"><% return "courseware" %> <%! +import waffle + from django.utils.translation import ugettext as _ from django.conf import settings @@ -152,7 +154,10 @@ ${HTML(fragment.foot_html())} % endif
-
+
% if getattr(course, 'entrance_exam_enabled') and \ getattr(course, 'entrance_exam_minimum_score_pct') and \ entrance_exam_current_score is not UNDEFINED: diff --git a/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html b/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html index c9473597c6..444778d07f 100644 --- a/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html +++ b/openedx/features/course_experience/templates/course_experience/course-outline-fragment.html @@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _ %> -<%static:require_module_async module_name="js/courseware/course_outline_factory" class_name="CourseOutlineFactory"> +<%static:require_module_async module_name="course_experience/js/course_outline_factory" class_name="CourseOutlineFactory"> CourseOutlineFactory('.block-tree');