Skip to content

Commit

Permalink
Version 1.4.5 (30-Sep-11 18:09)
Browse files Browse the repository at this point in the history
  • Loading branch information
LWT Project committed Sep 30, 2011
1 parent aba2b25 commit 7456395
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 8 deletions.
1 change: 0 additions & 1 deletion do_text_text.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
$showAll = ($showAll == '' ? 1 : (((int) $showAll != 0) ? 1 : 0));

?>
<script type="text/javascript" src="js/jquery.jplayer.min.js"><!-- jPlayer © Happyworm ** http://www.jplayer.org/about/ --></script>
<script type="text/javascript">
//<![CDATA[
TEXTPOS = -1;
Expand Down
6 changes: 3 additions & 3 deletions edit_words.php
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,9 @@
<?php

if ($currenttext == '') {
$sql = 'select WoID, WoText, WoTranslation, WoRomanization, ifnull(WoSentence,\'\') like concat(\'%{\',WoText,\'}%\') as SentOK, WoStatus, LgName, LgRightToLeft, DATEDIFF( NOW( ) , WoStatusChanged ) AS Days, WoTodayScore AS Score, WoTomorrowScore AS Score2, ifnull(concat(\'[\',group_concat(distinct TgText order by TgText separator \', \'),\']\'),\'\') as taglist from ((words left JOIN wordtags ON WoID = WtWoID) left join tags on TgID = WtTgID), languages where WoLgID = LgID ' . $wh_lang . $wh_stat . $wh_query . ' group by WoID ' . $wh_tag . ' order by ' . $sorts[$currentsort-1] . ' ' . $limit;
$sql = 'select WoID, WoText, WoTranslation, WoRomanization, WoSentence, ifnull(WoSentence,\'\') like concat(\'%{\',WoText,\'}%\') as SentOK, WoStatus, LgName, LgRightToLeft, DATEDIFF( NOW( ) , WoStatusChanged ) AS Days, WoTodayScore AS Score, WoTomorrowScore AS Score2, ifnull(concat(\'[\',group_concat(distinct TgText order by TgText separator \', \'),\']\'),\'\') as taglist from ((words left JOIN wordtags ON WoID = WtWoID) left join tags on TgID = WtTgID), languages where WoLgID = LgID ' . $wh_lang . $wh_stat . $wh_query . ' group by WoID ' . $wh_tag . ' order by ' . $sorts[$currentsort-1] . ' ' . $limit;
} else {
$sql = 'select distinct WoID, WoText, WoTranslation, WoRomanization, ifnull(WoSentence,\'\') like \'%{%}%\' as SentOK, WoStatus, LgName, LgRightToLeft, DATEDIFF( NOW( ) , WoStatusChanged ) AS Days, WoTodayScore AS Score, WoTomorrowScore AS Score2, ifnull(concat(\'[\',group_concat(distinct TgText order by TgText separator \', \'),\']\'),\'\') as taglist from ((words left JOIN wordtags ON WoID = WtWoID) left join tags on TgID = WtTgID), languages, textitems where TiLgID = WoLgID and TiTextLC = WoTextLC and TiTxID = ' . $currenttext . ' and WoLgID = LgID ' . $wh_lang . $wh_stat . $wh_query . ' group by WoID ' . $wh_tag . ' order by ' . $sorts[$currentsort-1] . ' ' . $limit;
$sql = 'select distinct WoID, WoText, WoTranslation, WoRomanization, WoSentence, ifnull(WoSentence,\'\') like \'%{%}%\' as SentOK, WoStatus, LgName, LgRightToLeft, DATEDIFF( NOW( ) , WoStatusChanged ) AS Days, WoTodayScore AS Score, WoTomorrowScore AS Score2, ifnull(concat(\'[\',group_concat(distinct TgText order by TgText separator \', \'),\']\'),\'\') as taglist from ((words left JOIN wordtags ON WoID = WtWoID) left join tags on TgID = WtTgID), languages, textitems where TiLgID = WoLgID and TiTextLC = WoTextLC and TiTxID = ' . $currenttext . ' and WoLgID = LgID ' . $wh_lang . $wh_stat . $wh_query . ' group by WoID ' . $wh_tag . ' order by ' . $sorts[$currentsort-1] . ' ' . $limit;
}
if ($debug) echo $sql;
flush();
Expand All @@ -614,7 +614,7 @@
if ($currentlang == '') echo '<td class="td1 center">' . tohtml($record['LgName']) . '</td>';
echo '<td class="td1 "><span' . ($record['LgRightToLeft'] ? ' dir="rtl" ' : '') . '>' . tohtml($record['WoText']) . '</span>' . tohtml($record['WoRomanization']!='' ? (' / ' . $record['WoRomanization']) : '') . '</td>';
echo '<td class="td1 ">' . tohtml(repl_tab_nl($record['WoTranslation'])) . ' <span class="smallgray2">' . tohtml($record['taglist']) . '</span></td>';
echo '<td class="td1 center"><b>' . ($record['SentOK']!=0 ? '<img src="icn/status.png" title="Yes" alt="Yes" />' : '<img src="icn/status-busy.png" title="No" alt="No" />') . '</b></td>';
echo '<td class="td1 center"><b>' . ($record['SentOK']!=0 ? '<img src="icn/status.png" title="' . tohtml($record['WoSentence']) . '" alt="Yes" />' : '<img src="icn/status-busy.png" title="(No valid sentence)" alt="No" />') . '</b></td>';
echo '<td class="td1 center" title="' . tohtml(get_status_name($record['WoStatus'])) . '">' . tohtml(get_status_abbr($record['WoStatus'])) . ($record['WoStatus'] < 98 ? '/' . $days : '') . '</td>';
echo '<td class="td1 center" nowrap="nowrap">' . $score . '</td>';
echo '</tr>';
Expand Down
10 changes: 8 additions & 2 deletions info.htm
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ <h4>

<dd>
<ul>
<li>The current version is <b>1.4.4 (September 23 2011)</b>.
<li>The current version is <b>1.4.5 (October 01 2011)</b>.
</li>

<li>
Expand Down Expand Up @@ -1202,7 +1202,7 @@ <h4>
<b>Read a Text</b>
<br />
<br />
This is your "working area": Reading (and listening to) a text, saving/editing words and expressions, looking up words, expressions, sentences in external dictionaries or Google Translate. To create an expression, click on the first word. You see "Exp: 2..xx 3..yy 4..zz ...". Just click on the number of words (2..9) of the desired expression you want to save. The dictionary links for multi word expressions are always in the edit frame! You can also use the Keyboard in the text frame, see <a href="#keybind">Key Bindings</a>.
This is your "working area": Reading (and listening to) a text, saving/editing words and expressions, looking up words, expressions, sentences in external dictionaries or Google Translate. To create an expression, click on the first word. You see "Exp: 2..xx 3..yy 4..zz ...". Just click on the number of words (2..9) of the desired expression you want to save. The dictionary links for multi word expressions are always in the edit frame! You can also use the Keyboard in the text frame, see <a href="#keybind">Key Bindings</a>. Double clicking on a word sets the audio position approximately to the text position, if an audio was defined. The other audio controls are self-explanatory: automatic repeat, rewind and move forward n seconds, etc.).
<br />
<br />
<img class="grayborder" src="img/06.png" alt="Image" />
Expand Down Expand Up @@ -1801,6 +1801,8 @@ <h4>
<td class="td1">Set status of marked term to "Well Known"</td></tr>
<tr class="tr1"><td class="td1">E</td>
<td class="td1">Edit marked term</td></tr>
<tr class="tr1"><td class="td1">A</td>
<td class="td1">Set audio position approcimately position of marked trem</td></tr>
<tr class="tr1"><td class="td1">ESC</td>
<td class="td1">Reset marked term(s)</td></tr>
</table>
Expand Down Expand Up @@ -2128,6 +2130,10 @@ <h4>
<dd>
<ul>

<li>1.4.5 (October 01 2011):
Double-Click on a term and "A" key (while going through non-blue terms via keyboard) sets audio position approximately to text position. Some updates and corrections in the documentation.<br /><br />
</li>

<li>1.4.4 (September 23 2011):
Changed the handling of backslash removal in posted data on servers with magic_quotes_gpc = Off.
Documentation updated.<br /><br />
Expand Down
15 changes: 14 additions & 1 deletion js/jq_pgm.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ function word_dblclick_event_do_text_text() {
if ( t == 0 ) return;
var p = 100 * ($(this).attr('data_pos')-5) / t;
if (p < 0) p = 0;
window.parent.frames['h'].new_pos(p);
if (typeof (window.parent.frames['h'].new_pos) == 'function')
window.parent.frames['h'].new_pos(p);
}

function word_click_event_do_text_text() {
Expand Down Expand Up @@ -326,6 +327,18 @@ function keydown_event_do_text_text(e) {
'set_word_status.php?wid=' + wid + '&tid=' + TID + '&ord=' + ord + '&status=99';
return false;
}
if (e.which == 65) { // A : set audio pos.
var p = curr.attr('data_pos');
var t = parseInt($("#totalcharcount").text(),10);
if ( t == 0 ) return true;
p = 100 * (p-5) / t;
if (p < 0) p = 0;
if (typeof (window.parent.frames['h'].new_pos) == 'function')
window.parent.frames['h'].new_pos(p);
else
return true;
return false;
}
if (e.which == 69) { // E : EDIT
if(curr.has('.mword'))
window.parent.frames['ro'].location.href =
Expand Down
2 changes: 1 addition & 1 deletion utilities.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

function get_version() {
global $debug;
return '1.4.4 (September 23 2011)' .
return '1.4.5 (October 01 2011)' .
($debug ? ' <span class="red">DEBUG</span>' : '');
}

Expand Down

0 comments on commit 7456395

Please sign in to comment.