4f555f6480
Conflicts: cms/djangoapps/contentstore/course_info_model.py cms/djangoapps/contentstore/module_info_model.py cms/djangoapps/contentstore/tests/factories.py cms/djangoapps/contentstore/tests/test_course_settings.py cms/djangoapps/contentstore/views.py cms/djangoapps/models/settings/course_details.py cms/djangoapps/models/settings/course_grading.py cms/templates/edit_subsection.html common/djangoapps/mitxmako/shortcuts.py common/djangoapps/static_replace.py common/djangoapps/util/converters.py common/djangoapps/xmodule_modifiers.py common/lib/xmodule/setup.py common/lib/xmodule/xmodule/abtest_module.py common/lib/xmodule/xmodule/capa_module.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/discussion_module.py common/lib/xmodule/xmodule/error_module.py common/lib/xmodule/xmodule/html_module.py common/lib/xmodule/xmodule/js/src/video/display.coffee common/lib/xmodule/xmodule/mako_module.py common/lib/xmodule/xmodule/modulestore/mongo.py common/lib/xmodule/xmodule/modulestore/store_utilities.py common/lib/xmodule/xmodule/modulestore/xml.py common/lib/xmodule/xmodule/modulestore/xml_importer.py common/lib/xmodule/xmodule/raw_module.py common/lib/xmodule/xmodule/self_assessment_module.py common/lib/xmodule/xmodule/seq_module.py common/lib/xmodule/xmodule/template_module.py common/lib/xmodule/xmodule/tests/__init__.py common/lib/xmodule/xmodule/tests/test_export.py common/lib/xmodule/xmodule/tests/test_import.py common/lib/xmodule/xmodule/video_module.py common/lib/xmodule/xmodule/x_module.py common/lib/xmodule/xmodule/xml_module.py lms/djangoapps/courseware/access.py lms/djangoapps/courseware/courses.py lms/djangoapps/courseware/grades.py lms/djangoapps/courseware/models.py lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/tests/tests.py lms/djangoapps/courseware/views.py lms/djangoapps/django_comment_client/utils.py lms/templates/staff_problem_info.html lms/templates/video.html rakefile
42 lines
1.4 KiB
HTML
42 lines
1.4 KiB
HTML
% if display_name is not UNDEFINED and display_name is not None:
|
|
<h2> ${display_name} </h2>
|
|
% endif
|
|
|
|
%if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
|
|
<div id="stub_out_video_for_testing"></div>
|
|
|
|
%elif settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and normal_speed_video_id:
|
|
<object width="640" height="390">
|
|
<param name="movie"
|
|
value="https://www.youtube.com/v/${normal_speed_video_id}?version=3&autoplay=1&rel=0"></param>
|
|
<param name="allowScriptAccess" value="always"></param>
|
|
<embed src="https://www.youtube.com/v/${normal_speed_video_id}?version=3&autoplay=1&rel=0"
|
|
type="application/x-shockwave-flash"
|
|
allowscriptaccess="always"
|
|
width="640" height="390"></embed>
|
|
</object>
|
|
%else:
|
|
<div id="video_${id}" class="video" data-streams="${streams}" data-show-captions="${show_captions}" data-start="${start}" data-end="${end}" data-caption-asset-path="${caption_asset_path}">
|
|
<div class="tc-wrapper">
|
|
<article class="video-wrapper">
|
|
<section class="video-player">
|
|
<div id="${id}"></div>
|
|
</section>
|
|
<section class="video-controls"></section>
|
|
</article>
|
|
</div>
|
|
</div>
|
|
%endif
|
|
|
|
% if source:
|
|
<div class="video-sources">
|
|
<p>Download video <a href="${source}">here</a>.</p>
|
|
</div>
|
|
% endif
|
|
|
|
% if track:
|
|
<div class="video-tracks">
|
|
<p>Download subtitles <a href="${track}">here</a>.</p>
|
|
</div>
|
|
% endif
|