Skip to content

E
edx-platform
Commit b3a9689d by Andy Armstrong Committed by GitHub
Options

Merge pull request #14949 from edx/andya/course-sidebar 

Add a sidebar to the new course home page
parents 8e1b9e17 25229a74
Showing with 60 additions and 11 deletions
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(
......
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'
......
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,
......
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;
}
......
lms/static/sass/shared-v2/_components.scss
......@@ -149,3 +149,7 @@
}
}
}
.section:not(:first-child) {
margin-top: $baseline;
}
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())}
<main id="main" tabindex="-1" aria-label="Content">
<div
class="path"
data-unified-course-view="${'true' if waffle.flag_is_active(request, 'unified_course_view') else 'false'}"
data-unified-course-view="${'true' if waffle.flag_is_active(request, UNIFIED_COURSE_VIEW_FLAG) else 'false'}"
></div>
% if getattr(course, 'entrance_exam_enabled') and \
getattr(course, 'entrance_exam_minimum_score_pct') and \
......
openedx/features/course_experience/__init__.py
# 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'
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
</div>
<div class="page-header-secondary">
<div class="form-actions">
<a class="btn action-show-bookmarks" href="${reverse('openedx.course_bookmarks.home', args=[course.id])}">
${_("Bookmarks")}
</a>
% if not waffle.flag_is_active(request, UNIFIED_COURSE_EXPERIENCE_FLAG):
<a class="btn action-show-bookmarks" href="${reverse('openedx.course_bookmarks.home', args=[course.id])}">
${_("Bookmarks")}
</a>
% endif
<a class="btn btn-brand action-resume-course" href="${reverse('courseware', kwargs={'course_id': unicode(course.id.to_deprecated_string())})}">
% if has_visited_course:
${_("Resume Course")}
......@@ -54,7 +59,34 @@ from openedx.core.djangolib.markup import HTML
</div>
</header>
<div class="page-content">
${HTML(outline_fragment.body_html())}
% if waffle.flag_is_active(request, UNIFIED_COURSE_EXPERIENCE_FLAG):
<div class="layout layout-1q3q">
<main class="layout-col layout-col-b">
${HTML(outline_fragment.body_html())}
</main>
<aside class="layout-col layout-col-a">
<div class="section section-tools">
<h3 class="hd-6">${_("Course Tools")}</h3>
<ul class="list-unstyled">
<li>
<a class="action-show-bookmarks" href="${reverse('openedx.course_bookmarks.home', args=[course.id])}">
<span class="icon fa fa-bookmark" aria-hidden="true"></span>
${_("Bookmarks")}
</a>
</li>
</ul>
</div>
% if handouts_html:
<div class="section section-handouts">
<h3 class="hd-6">${_("Course Handouts")}</h3>
${HTML(handouts_html)}
</div>
% endif
</aside>
</div>
% else:
${HTML(outline_fragment.body_html())}
% endif
</div>
</div>
</%block>
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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment