From e7e7b3bc15decf316215cd37f6e1a1544377aebe Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Mon, 24 Apr 2017 14:52:42 -0400 Subject: [PATCH 1/2] Add a sidebar to the new course home page LEARNER-606 --- lms/djangoapps/courseware/tabs.py | 3 +- lms/djangoapps/courseware/views/index.py | 3 +- lms/templates/courseware/courseware.html | 3 +- .../features/course_experience/__init__.py | 4 +++ .../course-home-fragment.html | 32 ++++++++++++++++--- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py index d0fa746437..6fd2f425bf 100644 --- a/lms/djangoapps/courseware/tabs.py +++ b/lms/djangoapps/courseware/tabs.py @@ -10,6 +10,7 @@ from django.utils.translation import ugettext as _, ugettext_noop from courseware.access import has_access from courseware.entrance_exams import user_can_skip_entrance_exam from openedx.core.lib.course_tabs import CourseTabPluginManager +from openedx.features.course_experience import UNIFIED_COURSE_VIEW_FLAG from request_cache.middleware import RequestCache from student.models import CourseEnrollment from xmodule.tabs import CourseTab, CourseTabList, key_checker, link_reverse_func @@ -43,7 +44,7 @@ class CoursewareTab(EnrolledTab): """ Returns the main course URL for the current user. """ - if waffle.flag_is_active(request, 'unified_course_view'): + if waffle.flag_is_active(request, UNIFIED_COURSE_VIEW_FLAG): return 'edx.course_experience.course_home' else: return 'courseware' diff --git a/lms/djangoapps/courseware/views/index.py b/lms/djangoapps/courseware/views/index.py index 7de2fcc051..0813cbbe2d 100644 --- a/lms/djangoapps/courseware/views/index.py +++ b/lms/djangoapps/courseware/views/index.py @@ -33,6 +33,7 @@ from openedx.core.djangoapps.user_api.preferences.api import get_user_preference from openedx.core.djangoapps.crawlers.models import CrawlersConfig from openedx.core.djangoapps.monitoring_utils import set_custom_metrics_for_course_key from openedx.features.enterprise_support.api import data_sharing_consent_required +from openedx.features.course_experience import UNIFIED_COURSE_VIEW_FLAG from request_cache.middleware import RequestCache from shoppingcart.models import CourseRegistrationCode from student.views import is_course_blocked @@ -338,7 +339,7 @@ class CoursewareIndex(View): 'disable_optimizely': True, 'section_title': None, 'sequence_title': None, - 'disable_accordion': waffle.flag_is_active(request, 'unified_course_view') + 'disable_accordion': waffle.flag_is_active(request, UNIFIED_COURSE_VIEW_FLAG), } table_of_contents = toc_for_course( self.effective_user, diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 128f9b6ab1..41aa56fabb 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -12,6 +12,7 @@ from django.utils.translation import ugettext as _ from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled from openedx.core.djangolib.js_utils import js_escaped_string from openedx.core.djangolib.markup import HTML +from openedx.features.course_experience import UNIFIED_COURSE_VIEW_FLAG %> <% include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams) @@ -157,7 +158,7 @@ ${HTML(fragment.foot_html())}
% if getattr(course, 'entrance_exam_enabled') and \ getattr(course, 'entrance_exam_minimum_score_pct') and \ diff --git a/openedx/features/course_experience/__init__.py b/openedx/features/course_experience/__init__.py index e69de29bb2..b4428c50f8 100644 --- a/openedx/features/course_experience/__init__.py +++ b/openedx/features/course_experience/__init__.py @@ -0,0 +1,4 @@ +# Unified course experience settings + +UNIFIED_COURSE_EXPERIENCE_FLAG = 'unified_course_experience' +UNIFIED_COURSE_VIEW_FLAG = 'unified_course_view' 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 557ad53f9d..6373b447b2 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 @@ -5,6 +5,8 @@ <%! import json +import waffle + from django.conf import settings from django.utils.translation import ugettext as _ from django.template.defaultfilters import escapejs @@ -13,6 +15,7 @@ from django.core.urlresolvers import reverse from django_comment_client.permissions import has_permission from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string from openedx.core.djangolib.markup import HTML +from openedx.features.course_experience import UNIFIED_COURSE_EXPERIENCE_FLAG %> <%block name="content"> @@ -25,9 +28,11 @@ from openedx.core.djangolib.markup import HTML
- - ${_("Bookmarks")} - + % if not waffle.flag_is_active(request, UNIFIED_COURSE_EXPERIENCE_FLAG): + + ${_("Bookmarks")} + + % endif % if has_visited_course: ${_("Resume Course")} @@ -54,7 +59,26 @@ from openedx.core.djangolib.markup import HTML
- ${HTML(outline_fragment.body_html())} + % if waffle.flag_is_active(request, UNIFIED_COURSE_EXPERIENCE_FLAG): +
+
+ ${HTML(outline_fragment.body_html())} +
+ +
+ % else: + ${HTML(outline_fragment.body_html())} + % endif
From 25229a741bbd3d26f1007e5a5a472fbcbb8f6ca3 Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Mon, 24 Apr 2017 15:29:34 -0400 Subject: [PATCH 2/2] Implement course handouts LEARNER-607 --- lms/djangoapps/courseware/courses.py | 2 +- lms/static/sass/features/_course-outline.scss | 2 -- lms/static/sass/shared-v2/_components.scss | 4 +++ .../features/course_experience/__init__.py | 6 ++++- .../course-home-fragment.html | 26 ++++++++++++------- .../course_experience/views/course_home.py | 6 ++++- 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py index 35dc76e392..fb9a3dabeb 100644 --- a/lms/djangoapps/courseware/courses.py +++ b/lms/djangoapps/courseware/courses.py @@ -278,7 +278,7 @@ def get_course_info_section(request, user, course, section_key): html = '' if info_module is not None: try: - html = info_module.render(STUDENT_VIEW).content + html = info_module.render(STUDENT_VIEW).content.strip() except Exception: # pylint: disable=broad-except html = render_to_string('courseware/error-message.html', None) log.exception( diff --git a/lms/static/sass/features/_course-outline.scss b/lms/static/sass/features/_course-outline.scss index 468bee42da..7d5c69720a 100644 --- a/lms/static/sass/features/_course-outline.scss +++ b/lms/static/sass/features/_course-outline.scss @@ -11,8 +11,6 @@ padding: 0 ($baseline * 2); &:not(:first-child) { - border-top: 1px solid $lms-border-color; - .section-name { margin-top: $baseline; } diff --git a/lms/static/sass/shared-v2/_components.scss b/lms/static/sass/shared-v2/_components.scss index 549298f9c0..5f36120e42 100644 --- a/lms/static/sass/shared-v2/_components.scss +++ b/lms/static/sass/shared-v2/_components.scss @@ -149,3 +149,7 @@ } } } + +.section:not(:first-child) { + margin-top: $baseline; +} diff --git a/openedx/features/course_experience/__init__.py b/openedx/features/course_experience/__init__.py index b4428c50f8..800a50452d 100644 --- a/openedx/features/course_experience/__init__.py +++ b/openedx/features/course_experience/__init__.py @@ -1,4 +1,8 @@ -# Unified course experience settings +# Unified course experience settings. +# Waffle flag to enable a single unified "Course" tab. UNIFIED_COURSE_EXPERIENCE_FLAG = 'unified_course_experience' + +# Waffle flag to enable the full screen course content view +# along with a unified course home page. UNIFIED_COURSE_VIEW_FLAG = 'unified_course_view' 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 6373b447b2..fdb0967e99 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 @@ -65,15 +65,23 @@ from openedx.features.course_experience import UNIFIED_COURSE_EXPERIENCE_FLAG ${HTML(outline_fragment.body_html())}
% else: diff --git a/openedx/features/course_experience/views/course_home.py b/openedx/features/course_experience/views/course_home.py index 752d1fd169..6be37fd451 100644 --- a/openedx/features/course_experience/views/course_home.py +++ b/openedx/features/course_experience/views/course_home.py @@ -9,7 +9,7 @@ from django.utils.decorators import method_decorator from django.views.decorators.cache import cache_control from django.views.decorators.csrf import ensure_csrf_cookie -from courseware.courses import get_course_with_access, get_last_accessed_courseware +from courseware.courses import get_course_info_section, get_course_with_access, get_last_accessed_courseware from lms.djangoapps.courseware.views.views import CourseTabView from opaque_keys.edx.keys import CourseKey from openedx.core.djangoapps.plugin_api.views import EdxFragmentView @@ -56,11 +56,15 @@ class CourseHomeFragmentView(EdxFragmentView): # Get the last accessed courseware last_accessed_url, __ = get_last_accessed_courseware(course, request, request.user) + # Get the handouts + handouts_html = get_course_info_section(request, request.user, course, 'handouts') + # Render the course home fragment context = { 'csrf': csrf(request)['csrf_token'], 'course': course, 'outline_fragment': outline_fragment, + 'handouts_html': handouts_html, 'has_visited_course': last_accessed_url is not None, 'disable_courseware_js': True, 'uses_pattern_library': True,