diff --git a/lms/djangoapps/lti_provider/tests/test_views.py b/lms/djangoapps/lti_provider/tests/test_views.py index 2127807897..2dfa8da53f 100644 --- a/lms/djangoapps/lti_provider/tests/test_views.py +++ b/lms/djangoapps/lti_provider/tests/test_views.py @@ -269,11 +269,9 @@ class RenderCoursewareTest(TestCase): 'disable_accordion': True, 'allow_iframing': True, 'disable_header': True, - 'disable_footer': True, - 'disable_tabs': True, 'staff_access': 'StaffAccess', 'xqa_server': 'http://example.com/xqa', } request = build_run_request() views.render_courseware(request, ALL_PARAMS.copy()) - self.render_mock.assert_called_with('courseware/courseware.html', expected_context) + self.render_mock.assert_called_with('courseware/courseware-chromeless.html', expected_context) diff --git a/lms/djangoapps/lti_provider/views.py b/lms/djangoapps/lti_provider/views.py index 8e0cb0925c..a959a92513 100644 --- a/lms/djangoapps/lti_provider/views.py +++ b/lms/djangoapps/lti_provider/views.py @@ -189,13 +189,11 @@ def render_courseware(request, lti_params): 'disable_accordion': True, 'allow_iframing': True, 'disable_header': True, - 'disable_footer': True, - 'disable_tabs': True, 'staff_access': staff, 'xqa_server': settings.FEATURES.get('XQA_SERVER', 'http://example.com/xqa'), } - return render_to_response('courseware/courseware.html', context) + return render_to_response('courseware/courseware-chromeless.html', context) def parse_course_and_usage_keys(course_id, usage_id): diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html new file mode 100644 index 0000000000..831b063704 --- /dev/null +++ b/lms/templates/courseware/courseware-chromeless.html @@ -0,0 +1,159 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! from django.template.defaultfilters import escapejs %> +<%! from microsite_configuration import page_title_breadcrumbs %> +<%! from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled %> +<%inherit file="/main.html" /> +<%namespace name='static' file='/static_content.html'/> +<%def name="course_name()"> + <% return _("{course_number} Courseware").format(course_number=course.display_number_with_default) %> + + +<%block name="bodyclass">courseware ${course.css_class or ''} +<%block name="title"> + % if section_title: +${page_title_breadcrumbs(section_title, course_name())} + % else: +${page_title_breadcrumbs(course_name())} + %endif + + +<%block name="header_extras"> +% for template_name in ["image-modal"]: + +% endfor +<% + header_file = None +%> + + +<%block name="headextra"> +<%static:css group='style-course-vendor'/> +<%static:css group='style-course'/> +## Utility: Notes +% if is_edxnotes_enabled(course): +<%static:css group='style-student-notes'/> +% endif + +<%block name="nav_skip">${"#seq_content" if section_title else "#course-content"} + +<%include file="../discussion/_js_head_dependencies.html" /> + + % if show_chat: + + ## It'd be better to have this in a place like lms/css/vendor/candy, + ## but the candy_res/ folder contains images and other junk, and it + ## all needs to stay together for the Candy.js plugin to work. + + % endif + ${fragment.head_html()} + + +<%block name="js_extra"> + + + + ## codemirror + + + <%static:js group='courseware'/> + <%static:js group='discussion'/> + + <%include file="../discussion/_js_body_dependencies.html" /> + % if staff_access: + <%include file="xqa_interface.html"/> + % endif + + + +% if show_chat: + + + + +% endif + +${fragment.foot_html()} + + + +
+
+
+ ${fragment.body_html()} +
+
+
+ + + +<%include file="../modal/accessible_confirm.html" /> + +## No footer in chromeless +<%block name="footer">