Skip to content

E
edx-platform
Commit 9d418755 by jmclaus
Options

Added changes made to video.html to fixtures. Addressed latest PR comments

parent d201ce10
Showing with 34 additions and 46 deletions
common/lib/xmodule/xmodule/js/fixtures/video.html
...@@ -26,26 +26,26 @@ ...@@ -26,26 +26,26 @@
<div class="slider"></div> <div class="slider"></div>
<div> <div>
<ul class="vcr"> <ul class="vcr">
<li><a class="video_control" href="#" title="Play"></a></li> <li><a class="video_control" href="#" title="Play" role="button" aria-disabled="false"></a></li>
<li><div class="vidtime">0:00 / 0:00</div></li> <li><div class="vidtime">0:00 / 0:00</div></li>
</ul> </ul>
<div class="secondary-controls"> <div class="secondary-controls">
<div class="speeds"> <div class="speeds">
<a href="#"> <a href="#" title="Speeds" role="button" aria-disabled="false">
<h3>Speed</h3> <h3>Speed</h3>
<p class="active"></p> <p class="active"></p>
</a> </a>
<ol class="video_speeds"></ol> <ol class="video_speeds"></ol>
</div> </div>
<div class="volume"> <div class="volume">
<a href="#"></a> <a href="#" title="Volume" role="button" aria-disabled="false"></a>
<div class="volume-slider-container"> <div class="volume-slider-container">
<div class="volume-slider"></div> <div class="volume-slider"></div>
</div> </div>
</div> </div>
<a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a> <a href="#" class="add-fullscreen" title="Fill browser" role="button" aria-disabled="false">Fill Browser</a>
<a href="#" class="quality_control" title="HD">HD</a> <a href="#" class="quality_control" title="HD" role="button" aria-disabled="false">HD</a>
<a href="#" class="hide-subtitles" title="Turn off captions">Captions</a> <a href="#" class="hide-subtitles" title="Turn off captions" role="button" aria-disabled="false">Captions</a>
</div> </div>
</div> </div>
</section> </section>
......
common/lib/xmodule/xmodule/js/fixtures/video_all.html
...@@ -29,26 +29,26 @@ ...@@ -29,26 +29,26 @@
<div class="slider"></div> <div class="slider"></div>
<div> <div>
<ul class="vcr"> <ul class="vcr">
<li><a class="video_control" href="#" title="Play"></a></li> <li><a class="video_control" href="#" title="Play" role="button" aria-disabled="false"></a></li>
<li><div class="vidtime">0:00 / 0:00</div></li> <li><div class="vidtime">0:00 / 0:00</div></li>
</ul> </ul>
<div class="secondary-controls"> <div class="secondary-controls">
<div class="speeds"> <div class="speeds">
<a href="#"> <a href="#" title="Speeds" role="button" aria-disabled="false">>
<h3>Speed</h3> <h3>Speed</h3>
<p class="active"></p> <p class="active"></p>
</a> </a>
<ol class="video_speeds"></ol> <ol class="video_speeds"></ol>
</div> </div>
<div class="volume"> <div class="volume">
<a href="#"></a> <a href="#" title="Volume" role="button" aria-disabled="false"></a>
<div class="volume-slider-container"> <div class="volume-slider-container">
<div class="volume-slider"></div> <div class="volume-slider"></div>
</div> </div>
</div> </div>
<a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a> <a href="#" class="add-fullscreen" title="Fill browser" role="button" aria-disabled="false">Fill Browser</a>
<a href="#" class="quality_control" title="HD">HD</a> <a href="#" class="quality_control" title="HD" role="button" aria-disabled="false">HD</a>
<a href="#" class="hide-subtitles" title="Turn off captions">Captions</a> <a href="#" class="hide-subtitles" title="Turn off captions" role="button" aria-disabled="false">Captions</a>
</div> </div>
</div> </div>
</section> </section>
......
common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html
...@@ -26,26 +26,26 @@ ...@@ -26,26 +26,26 @@
<div class="slider"></div> <div class="slider"></div>
<div> <div>
<ul class="vcr"> <ul class="vcr">
<li><a class="video_control" href="#" title="Play"></a></li> <li><a class="video_control" href="#" title="Play" role="button" aria-disabled="false"></a></li>
<li><div class="vidtime">0:00 / 0:00</div></li> <li><div class="vidtime">0:00 / 0:00</div></li>
</ul> </ul>
<div class="secondary-controls"> <div class="secondary-controls">
<div class="speeds"> <div class="speeds">
<a href="#"> <a href="#" title="Speeds" role="button" aria-disabled="false">
<h3>Speed</h3> <h3>Speed</h3>
<p class="active"></p> <p class="active"></p>
</a> </a>
<ol class="video_speeds"></ol> <ol class="video_speeds"></ol>
</div> </div>
<div class="volume"> <div class="volume">
<a href="#"></a> <a href="#" title="Volume" role="button" aria-disabled="false"></a>
<div class="volume-slider-container"> <div class="volume-slider-container">
<div class="volume-slider"></div> <div class="volume-slider"></div>
</div> </div>
</div> </div>
<a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a> <a href="#" class="add-fullscreen" title="Fill browser" role="button" aria-disabled="false">Fill Browser</a>
<a href="#" class="quality_control" title="HD">HD</a> <a href="#" class="quality_control" title="HD" role="button" aria-disabled="false">HD</a>
<a href="#" class="hide-subtitles" title="Turn off captions">Captions</a> <a href="#" class="hide-subtitles" title="Turn off captions" role="button" aria-disabled="false">Captions</a>
</div> </div>
</div> </div>
</section> </section>
......
common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
...@@ -138,35 +138,29 @@ function () { ...@@ -138,35 +138,29 @@ function () {
hrStr += (hours < 2 ? ' hour ' : ' hours '); hrStr += (hours < 2 ? ' hour ' : ' hours ');
if (minutes) { if (minutes) {
minStr += (minutes < 2 ? ' minute ' : ' minutes '); minStr += (minutes < 2 ? ' minute ' : ' minutes ');
} } else {
else {
minStr += ' 0 minutes '; minStr += ' 0 minutes ';
} }
if (seconds) { if (seconds) {
secStr += (seconds < 2 ? ' second ' : ' seconds '); secStr += (seconds < 2 ? ' second ' : ' seconds ');
} } else {
else {
secStr += ' 0 seconds '; secStr += ' 0 seconds ';
} }
return hrStr + minStr + secStr; return hrStr + minStr + secStr;
} } else if (minutes) {
else if (minutes) {
minStr += (minutes < 2 ? ' minute ' : ' minutes '); minStr += (minutes < 2 ? ' minute ' : ' minutes ');
if (seconds) { if (seconds) {
secStr += (seconds < 2 ? ' second ' : ' seconds '); secStr += (seconds < 2 ? ' second ' : ' seconds ');
} } else {
else {
secStr += ' 0 seconds '; secStr += ' 0 seconds ';
} }
return minStr + secStr; return minStr + secStr;
} } else if (seconds) {
else if (seconds) {
secStr += (seconds < 2 ? ' second ' : ' seconds '); secStr += (seconds < 2 ? ' second ' : ' seconds ');
return secStr; return secStr;
} }
else {
return '0 seconds'; return '0 seconds';
}
} }
}); });
......
common/lib/xmodule/xmodule/js/src/video/07_video_volume_control.js
...@@ -216,25 +216,19 @@ function () { ...@@ -216,25 +216,19 @@ function () {
function getVolumeDescription(vol) { function getVolumeDescription(vol) {
if (vol === 0) { if (vol === 0) {
return 'muted'; return 'muted';
} } else if (vol <= 20) {
else if (vol <= 20) {
return 'very low'; return 'very low';
} } else if (vol <= 40) {
else if (vol <= 40) {
return 'low'; return 'low';
} } else if (vol <= 60) {
else if (vol <= 60) {
return 'average'; return 'average';
} } else if (vol <= 80) {
else if (vol <= 80) {
return 'loud'; return 'loud';
} } else if (vol <= 99) {
else if (vol <= 99) {
return 'very loud'; return 'very loud';
} }
else {
return 'maximum'; return 'maximum';
}
} }
}); });
......
lms/templates/video.html
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
</ul> </ul>
<div class="secondary-controls"> <div class="secondary-controls">
<div class="speeds"> <div class="speeds">
<a href="#" title="Speeds" role="button" aria-disabled="false"> <a href="#" title="${_('Speeds')}" role="button" aria-disabled="false">
<h3>${_('Speed')}</h3> <h3>${_('Speed')}</h3>
<p class="active"></p> <p class="active"></p>
</a> </a>
<ol class="video_speeds"></ol> <ol class="video_speeds"></ol>
</div> </div>
<div class="volume"> <div class="volume">
<a href="#" title="Volume" role="button" aria-disabled="false"></a> <a href="#" title="${_('Volume')}" role="button" aria-disabled="false"></a>
<div class="volume-slider-container"> <div class="volume-slider-container">
<div class="volume-slider"></div> <div class="volume-slider"></div>
</div> </div>
......
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