Skip to content

Commit

Permalink
Version 1.5.4 (18-Jun-2013 13:16)
Browse files Browse the repository at this point in the history
  • Loading branch information
LWT Project committed Jun 18, 2013
1 parent 13b1d2d commit 9f27c15
Show file tree
Hide file tree
Showing 7 changed files with 181 additions and 296 deletions.
9 changes: 6 additions & 3 deletions css/jplayer_skin/jplayer.blue.monday.modified.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ div.jp-interface {
background-color:#eee;
/* width:418px; */
width:100%;
border:1px solid #009be3;
/* border:1px solid #009be3; */
border:1px solid #eee;
}
div.jp-audio div.jp-type-single div.jp-interface {
height:50px; /* 80 */
Expand Down Expand Up @@ -352,7 +353,8 @@ div.jp-playlist {
/* width:418px; */
width:100%;
background-color:#ccc;
border:1px solid #009be3;
/* border:1px solid #009be3; */
border:1px solid #eee;
border-top:none;
}
div.jp-playlist ul {
Expand Down Expand Up @@ -431,7 +433,8 @@ div.jp-jplayer {
height:0px;
}
div.jp-video div.jp-jplayer {
border:1px solid #009be3;
border:1px solid #eee;
/* border:1px solid #009be3; */
border-bottom:none;
z-index:1;
}
Expand Down
17 changes: 17 additions & 0 deletions css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,23 @@ dt {
white-space: nowrap;
margin-left: 20pt;
}
.borderleft {
border-left: 1px solid black;
border-top: 1px solid black;
border-bottom: 1px solid black;
background-color: #EEEEEE;
}
.bordermiddle {
border-top: 1px solid black;
border-bottom: 1px solid black;
background-color: #EEEEEE;
}
.borderright {
border-right: 1px solid black;
border-top: 1px solid black;
border-bottom: 1px solid black;
background-color: #EEEEEE;
}

/**************************************************************
Additional styles for printing
Expand Down
146 changes: 1 addition & 145 deletions display_impr_text_header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,151 +76,7 @@ function do_show_a() {
echo getPreviousAndNextTextLinks($textid, 'display_impr_text.php?text=', TRUE, '     ');
echo ' <img class="click" src="icn/cross.png" title="Close Window" alt="Close Window" onclick="top.close();" /></span></h2>';

if ($audio != '') {
$playerskin = getSettingWithDefault('set-player-skin-name');
?>
<link type="text/css" href="css/jplayer_skin/<?php echo $playerskin; ?>.css" rel="stylesheet" />
<script type="text/javascript" src="js/jquery.jplayer.min.js"><!-- jPlayer © Happyworm ** http://www.jplayer.org/about/ --></script>
<table class="width99pc">
<tr>
<td class="width45pc">&nbsp;</td>
<td class="center">
<span id="do-single" class="click hide"><img src="icn/arrow-repeat.png" alt="Toggle Repeat (Now ON)" title="Toogle Repeat (Now ON)" style="width:24px;height:24px;" /></span><span id="do-repeat" class="click"><img src="icn/arrow-norepeat.png" alt="Toggle Repeat (Now OFF)" title="Toggle Repeat (Now OFF)" style="width:24px;height:24px;" /></span>
</td>
<td class="center">&nbsp;</td>
<td>
<div id="jquery_jplayer_1" class="jp-jplayer">
</div>
<div class="jp-audio-container">
<div class="jp-audio">
<div class="jp-type-single">
<div id="jp_interface_1" class="jp-interface">
<ul class="jp-controls">
<li><a href="#" class="jp-play" tabindex="1">play</a></li>
<li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
<?php if (substr($playerskin,0,13) != 'jplayer-black') { ?>
<li><a href="#" class="jp-stop" tabindex="1">stop</a></li>
<?php } ?>
<li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
<li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
</ul>
<div class="jp-progress-container">
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar">
</div>
</div>
</div>
</div>
<div class="jp-volume-bar-container">
<div class="jp-volume-bar">
<div class="jp-volume-bar-value">
</div>
</div>
</div>
<?php if (substr($playerskin,0,13) != 'jplayer-black') { ?>
<div class="jp-current-time">
</div>
<div class="jp-duration">
</div>
<?php } ?>
</div>
<?php if (substr($playerskin,0,13) != 'jplayer-black') { ?>
<div id="jp_playlist_1" class="jp-playlist">
</div>
<?php } ?>
</div>
</div>
</div>
</td>
<td class="center">&nbsp;</td>
<td class="center">
<?php
$currentplayerseconds = getSetting('currentplayerseconds');
if($currentplayerseconds == '') $currentplayerseconds = 5;
?>
<select id="backtime" name="backtime" onchange="{do_ajax_save_setting('currentplayerseconds',document.getElementById('backtime').options[document.getElementById('backtime').selectedIndex].value);}"><?php echo get_seconds_selectoptions($currentplayerseconds); ?></select><br />
<span id="backbutt" class="click"><img src="icn/arrow-circle-225-left.png" alt="Rewind n seconds" title="Rewind n seconds" /></span>&nbsp;&nbsp;<span id="forwbutt" class="click"><img src="icn/arrow-circle-315.png" alt="Forward n seconds" title="Forward n seconds" /></span>
<span id="playTime" class="hide"></span>
</td>
<td class="width45pc">&nbsp;</td>
</tr>
<script type="text/javascript">
//<![CDATA[

function new_pos(p) {
$("#jquery_jplayer_1").jPlayer("playHead", p);
}

function click_single() {
$("#jquery_jplayer_1").unbind($.jPlayer.event.ended + ".jp-repeat");
$("#do-single").addClass('hide');
$("#do-repeat").removeClass('hide');
return false;
}

function click_repeat() {
$("#jquery_jplayer_1").bind($.jPlayer.event.ended + ".jp-repeat", function(event) {
$(this).jPlayer("play");
});
$("#do-repeat").addClass('hide');
$("#do-single").removeClass('hide');
return false;
}

function click_back() {
var t = parseInt($("#playTime").text(),10);
var b = parseInt($("#backtime").val(),10);
var nt = t - b;
if (nt < 0) nt = 0;
$("#jquery_jplayer_1").jPlayer("play", nt);
}

function click_forw() {
var t = parseInt($("#playTime").text(),10);
var b = parseInt($("#backtime").val(),10);
var nt = t + b;
$("#jquery_jplayer_1").jPlayer("play", nt);
}

$(document).ready(function(){
$("#jquery_jplayer_1").jPlayer({
ready: function () {
$(this).jPlayer("setMedia", {
<?php
$audio = trim($audio);
if (strcasecmp(substr($audio,-4), '.mp3') == 0) {
echo 'mp3: ' . prepare_textdata_js(encodeURI($audio));
} elseif (strcasecmp(substr($audio,-4), '.ogg') == 0) {
echo 'oga: ' . prepare_textdata_js(encodeURI($audio)) . ",\n" .
'mp3: ' . prepare_textdata_js(encodeURI($audio));
} elseif (strcasecmp(substr($audio,-4), '.wav') == 0) {
echo 'wav: ' . prepare_textdata_js(encodeURI($audio)) . ",\n" .
'mp3: ' . prepare_textdata_js(encodeURI($audio));
} else {
echo 'mp3: ' . prepare_textdata_js(encodeURI($audio));
}
?>
});
},
swfPath: "js",
});

$("#jquery_jplayer_1").bind($.jPlayer.event.timeupdate, function(event) {
$("#playTime").text(Math.floor(event.jPlayer.status.currentTime));
});

$("#backbutt").click(click_back);
$("#forwbutt").click(click_forw);
$("#do-single").click(click_single);
$("#do-repeat").click(click_repeat);
});
//]]>
</script>
<?php
} // if (isset($audio))

// END AUDIO
makeAudioPlayer($audio);

?>
</table>
Expand Down
149 changes: 2 additions & 147 deletions do_text_header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,157 +50,12 @@
$showAll = ($showAll == '' ? 1 : (((int) $showAll != 0) ? 1 : 0));

?>
<table class="width99pc"><tr><td class="center" colspan="7" style="padding:2px 5px 5px 5px;" nowrap="nowrap">TO DO: <span id="learnstatus"><?php echo texttodocount2($_REQUEST['text']); ?></span>&nbsp;&nbsp;&nbsp;&nbsp;<span title="[Show All] = ON: ALL terms are shown, and all multi-word terms are shown as superscripts before the first word. The superscript indicates the number of words in the multi-word term.
<table class="width99pc" cellspacing="0" cellpadding="3"><tr><td class="center" colspan="7" style="padding:2px 5px 5px 5px;" nowrap="nowrap">TO DO: <span id="learnstatus"><?php echo texttodocount2($_REQUEST['text']); ?></span>&nbsp;&nbsp;&nbsp;&nbsp;<span title="[Show All] = ON: ALL terms are shown, and all multi-word terms are shown as superscripts before the first word. The superscript indicates the number of words in the multi-word term.
[Show All] = OFF: Multi-word terms now hide single words and shorter or overlapping multi-word terms.">Show All&nbsp;<input type="checkbox" id="showallwords" <?php echo get_checked($showAll); ?> /></span><span id="thetextid" class="hide"><?php echo $textid; ?></span></td></tr>

<?php

// AUDIO PLAYER

if ($audio != '') {
$playerskin = getSettingWithDefault('set-player-skin-name');
?>
<link type="text/css" href="css/jplayer_skin/<?php echo $playerskin; ?>.css" rel="stylesheet" />
<script type="text/javascript" src="js/jquery.jplayer.min.js"><!-- jPlayer © Happyworm ** http://www.jplayer.org/about/ --></script>
<tr>
<td class="width45pc">&nbsp;</td>
<td class="center">
<span id="do-single" class="click hide"><img src="icn/arrow-repeat.png" alt="Toggle Repeat (Now ON)" title="Toogle Repeat (Now ON)" style="width:24px;height:24px;" /></span><span id="do-repeat" class="click"><img src="icn/arrow-norepeat.png" alt="Toggle Repeat (Now OFF)" title="Toggle Repeat (Now OFF)" style="width:24px;height:24px;" /></span>
</td>
<td class="center">&nbsp;</td>
<td>
<div id="jquery_jplayer_1" class="jp-jplayer">
</div>
<div class="jp-audio-container">
<div class="jp-audio">
<div class="jp-type-single">
<div id="jp_interface_1" class="jp-interface">
<ul class="jp-controls">
<li><a href="#" class="jp-play" tabindex="1">play</a></li>
<li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
<?php if (substr($playerskin,0,13) != 'jplayer-black') { ?>
<li><a href="#" class="jp-stop" tabindex="1">stop</a></li>
<?php } ?>
<li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
<li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
</ul>
<div class="jp-progress-container">
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar">
</div>
</div>
</div>
</div>
<div class="jp-volume-bar-container">
<div class="jp-volume-bar">
<div class="jp-volume-bar-value">
</div>
</div>
</div>
<?php if (substr($playerskin,0,13) != 'jplayer-black') { ?>
<div class="jp-current-time">
</div>
<div class="jp-duration">
</div>
<?php } ?>
</div>
<?php if (substr($playerskin,0,13) != 'jplayer-black') { ?>
<div id="jp_playlist_1" class="jp-playlist">
</div>
<?php } ?>
</div>
</div>
</div>
</td>
<td class="center">&nbsp;</td>
<td class="center">
<?php
$currentplayerseconds = getSetting('currentplayerseconds');
if($currentplayerseconds == '') $currentplayerseconds = 5;
?>
<select id="backtime" name="backtime" onchange="{do_ajax_save_setting('currentplayerseconds',document.getElementById('backtime').options[document.getElementById('backtime').selectedIndex].value);}"><?php echo get_seconds_selectoptions($currentplayerseconds); ?></select><br />
<span id="backbutt" class="click"><img src="icn/arrow-circle-225-left.png" alt="Rewind n seconds" title="Rewind n seconds" /></span>&nbsp;&nbsp;<span id="forwbutt" class="click"><img src="icn/arrow-circle-315.png" alt="Forward n seconds" title="Forward n seconds" /></span>
<span id="playTime" class="hide"></span>
</td>
<td class="width45pc">&nbsp;</td>
</tr>
<script type="text/javascript">
//<![CDATA[

function new_pos(p) {
$("#jquery_jplayer_1").jPlayer("playHead", p);
}

function click_single() {
$("#jquery_jplayer_1").unbind($.jPlayer.event.ended + ".jp-repeat");
$("#do-single").addClass('hide');
$("#do-repeat").removeClass('hide');
return false;
}

function click_repeat() {
$("#jquery_jplayer_1").bind($.jPlayer.event.ended + ".jp-repeat", function(event) {
$(this).jPlayer("play");
});
$("#do-repeat").addClass('hide');
$("#do-single").removeClass('hide');
return false;
}

function click_back() {
var t = parseInt($("#playTime").text(),10);
var b = parseInt($("#backtime").val(),10);
var nt = t - b;
if (nt < 0) nt = 0;
$("#jquery_jplayer_1").jPlayer("play", nt);
}

function click_forw() {
var t = parseInt($("#playTime").text(),10);
var b = parseInt($("#backtime").val(),10);
var nt = t + b;
$("#jquery_jplayer_1").jPlayer("play", nt);
}

$(document).ready(function(){
$("#jquery_jplayer_1").jPlayer({
ready: function () {
$(this).jPlayer("setMedia", {
<?php
$audio = trim($audio);
if (strcasecmp(substr($audio,-4), '.mp3') == 0) {
echo 'mp3: ' . prepare_textdata_js(encodeURI($audio));
} elseif (strcasecmp(substr($audio,-4), '.ogg') == 0) {
echo 'oga: ' . prepare_textdata_js(encodeURI($audio)) . ",\n" .
'mp3: ' . prepare_textdata_js(encodeURI($audio));
} elseif (strcasecmp(substr($audio,-4), '.wav') == 0) {
echo 'wav: ' . prepare_textdata_js(encodeURI($audio)) . ",\n" .
'mp3: ' . prepare_textdata_js(encodeURI($audio));
} else {
echo 'mp3: ' . prepare_textdata_js(encodeURI($audio));
}
?>
});
},
swfPath: "js",
});

$("#jquery_jplayer_1").bind($.jPlayer.event.timeupdate, function(event) {
$("#playTime").text(Math.floor(event.jPlayer.status.currentTime));
});

$("#backbutt").click(click_back);
$("#forwbutt").click(click_forw);
$("#do-single").click(click_single);
$("#do-repeat").click(click_repeat);
});
//]]>
</script>
<?php
} // if (isset($audio))

// END AUDIO
makeAudioPlayer($audio);

?>
</table>
Expand Down
Binary file modified icn/arrow-norepeat.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion info.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2318,7 +2318,7 @@ <h4>
<br />
A new test/review type "Table" has been added in the testing area. Words, translations, romanizations, sentences and status are presented in a table. You may hide and/or sort columns. After testing yourself, you can reveal the hidden information by clicking into the table cell, and change your status.
<br />
Documentation updated.
Player appearance improved. Some settings that were not saved until now, are now automatically saved. Documentation updated.
<br /><br />
</li>

Expand Down
Loading

0 comments on commit 9f27c15

Please sign in to comment.