Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
b1c963ab
Commit
b1c963ab
authored
11 years ago
by
Will Daly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed stubbing behavior in video templates to exclude
only the sources (not the player)
parent
6ab5bb2f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
26 deletions
+26
-26
lms/templates/video.html
+22
-26
lms/templates/videoalpha.html
+4
-0
No files found.
lms/templates/video.html
View file @
b1c963ab
...
@@ -2,37 +2,33 @@
...
@@ -2,37 +2,33 @@
<h2>
${display_name}
</h2>
<h2>
${display_name}
</h2>
% endif
% endif
%if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
%if settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and normal_speed_video_id:
<div
id=
"stub_out_video_for_testing"
>
<div
class=
"video"
data-autoplay=
"${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}"
>
<section
class=
"video-controls"
>
<div
class=
"slider"
></div>
<div>
<ul
class=
"vcr"
>
<li><a
class=
"video_control"
href=
"#"
></a></li>
<li>
<div
class=
"vidtime"
>
0:00 / 0:00
</div>
</li>
</ul>
<div
class=
"secondary-controls"
>
<a
href=
"#"
class=
"add-fullscreen"
title=
"Fill browser"
>
Fill Browser
</a>
</div>
</div>
</section>
</div>
</div>
%elif settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and normal_speed_video_id:
<object
width=
"640"
height=
"390"
>
<object
width=
"640"
height=
"390"
>
<param
name=
"movie"
<param
name=
"movie"
value=
"https://www.youtube.com/v/${normal_speed_video_id}?version=3&autoplay=1&rel=0"
></param>
%
if
not
settings
.
MITX_FEATURES
['
STUB_VIDEO_FOR_TESTING
']
:
value=
"https://www.youtube.com/v/${normal_speed_video_id}?version=3&autoplay=1&rel=0"
>
% endif
</param>
<param
name=
"allowScriptAccess"
value=
"always"
></param>
<param
name=
"allowScriptAccess"
value=
"always"
></param>
<embed
src=
"https://www.youtube.com/v/${normal_speed_video_id}?version=3&autoplay=1&rel=0"
<embed
type=
"application/x-shockwave-flash"
%
if
not
settings
.
MITX_FEATURES
['
STUB_VIDEO_FOR_TESTING
']
:
allowscriptaccess=
"always"
src=
"https://www.youtube.com/v/${normal_speed_video_id}?version=3&autoplay=1&rel=0"
width=
"640"
height=
"390"
></embed>
%
endif
type=
"application/x-shockwave-flash"
allowscriptaccess=
"always"
width=
"640"
height=
"390"
></embed>
</object>
</object>
%else:
%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}"
data-autoplay=
"${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}"
>
<div
id=
"video_${id}"
class=
"video"
%
if
not
settings
.
MITX_FEATURES
['
STUB_VIDEO_FOR_TESTING
']
:
data-streams=
"${streams}"
%
endif
data-show-captions=
"${show_captions}"
data-start=
"${start}"
data-end=
"${end}"
data-caption-asset-path=
"${caption_asset_path}"
data-autoplay=
"${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}"
>
<div
class=
"tc-wrapper"
>
<div
class=
"tc-wrapper"
>
<article
class=
"video-wrapper"
>
<article
class=
"video-wrapper"
>
<section
class=
"video-player"
>
<section
class=
"video-player"
>
...
...
This diff is collapsed.
Click to expand it.
lms/templates/videoalpha.html
View file @
b1c963ab
...
@@ -5,7 +5,11 @@
...
@@ -5,7 +5,11 @@
<div
<div
id=
"video_${id}"
id=
"video_${id}"
class=
"video"
class=
"video"
%
if
not
settings
.
MITX_FEATURES
['
STUB_VIDEO_FOR_TESTING
']
:
data-streams=
"${youtube_streams}"
data-streams=
"${youtube_streams}"
%
endif
${'
data-sub=
"{}"
'.
format
(
sub
)
if
sub
else
''}
${'
data-sub=
"{}"
'.
format
(
sub
)
if
sub
else
''}
%
if
not
settings
.
MITX_FEATURES
['
STUB_VIDEO_FOR_TESTING
']
:
%
if
not
settings
.
MITX_FEATURES
['
STUB_VIDEO_FOR_TESTING
']
:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment