From: <sam...@us...> - 2010-10-08 21:09:15
|
Revision: 29909 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=29909&view=rev Author: sampaioprimo Date: 2010-10-08 21:09:08 +0000 (Fri, 08 Oct 2010) Log Message: ----------- [ENH] interface improvements to tiki-edit_languages.php: - translate all button - change modes (add, edit and edit untranslated) just by selecting the respective radio button Modified Paths: -------------- trunk/templates/tiki-edit_languages.tpl trunk/tiki-edit_languages.php Added Paths: ----------- trunk/lib/language/tiki-edit_languages.js Added: trunk/lib/language/tiki-edit_languages.js =================================================================== --- trunk/lib/language/tiki-edit_languages.js (rev 0) +++ trunk/lib/language/tiki-edit_languages.js 2010-10-08 21:09:08 UTC (rev 29909) @@ -0,0 +1,9 @@ +//$Id$ + +$(document).ready(function() { + $('form#edit_translations .edit_translations').each(function() { + $(this).change(function() { + $('form#edit_translations').submit(); + }); + }); +}); Property changes on: trunk/lib/language/tiki-edit_languages.js ___________________________________________________________________ Added: svn:keywords + Id Modified: trunk/templates/tiki-edit_languages.tpl =================================================================== --- trunk/templates/tiki-edit_languages.tpl 2010-10-08 17:53:31 UTC (rev 29908) +++ trunk/templates/tiki-edit_languages.tpl 2010-10-08 21:09:08 UTC (rev 29909) @@ -10,41 +10,38 @@ {tabset} {tab name="{tr}Edit languages{/tr}"} - <form action="tiki-edit_languages.php" method="post"> + <form action="tiki-edit_languages.php" id="edit_translations" method="post"> <div class="adminoptionbox"> <label for="edit_language">{tr}Select the language to edit{/tr}:</label> - <select id="edit_language" name="edit_language"> + <select id="edit_language" class="edit_translations "name="edit_language"> {section name=ix loop=$languages} <option value="{$languages[ix].value|escape}" {if $edit_language eq $languages[ix].value}selected="selected"{/if}>{$languages[ix].name}</option> {/section} </select> </div> <div class="adminoptionbox"> - <input id="add_tran_sw" align="right" type="radio" name="whataction" value="add_tran_sw" {if $whataction eq 'add_tran_sw'}checked="checked"{/if}/> + <input id="add_tran_sw" class="edit_translations" align="right" type="radio" name="whataction" value="add_tran_sw" {if $whataction eq 'add_tran_sw'}checked="checked"{/if}/> <label for="add_tran_sw">{tr}Add a translation{/tr}</label> </div> <div class="adminoptionbox"> - <input id="edit_tran_sw" align="right" type="radio" name="whataction" value="edit_tran_sw" {if $whataction eq 'edit_tran_sw'}checked="checked"{/if}/> + <input id="edit_tran_sw" class="edit_translations" align="right" type="radio" name="whataction" value="edit_tran_sw" {if $whataction eq 'edit_tran_sw'}checked="checked"{/if}/> <label for="edit_tran_sw">{tr}Edit translations{/tr}</label> <div class="adminoptionboxchild"> - <input id="only_db_translations" type="checkbox" name="only_db_translations" {if $only_db_translations eq 'y'}checked="checked"{/if}> + <input id="only_db_translations" class="edit_translations" type="checkbox" name="only_db_translations" {if $only_db_translations eq 'y'}checked="checked"{/if}> <label for="only_db_translations">{tr}Show only database stored translations{/tr}</label> </div> </div> {if $prefs.record_untranslated eq 'y'} <div class="adminoptionbox"> - <input id="edit_rec_sw" align="right" type="radio" name="whataction" value="edit_rec_sw" {if $whataction eq 'edit_rec_sw'}checked="checked"{/if}/> + <input id="edit_rec_sw" class="edit_translations" align="right" type="radio" name="whataction" value="edit_rec_sw" {if $whataction eq 'edit_rec_sw'}checked="checked"{/if}/> <label for="edit_rec_sw">{tr}Translate recorded{/tr}</label> </div> {/if} - <div class="adminoptionbox"> - <input type="submit" name="langaction" value="{tr}Set{/tr}" /> - </div> {if $whataction eq 'add_tran_sw'} <div class="simplebox"> - {tr}Add a translation{/tr}:<br /> + <h4>{tr}Add a translation{/tr}:</h4> <table class="formcolor"> <tr> <td>{tr}Original{/tr}:</td> @@ -58,7 +55,7 @@ {/if} {if $whataction eq 'edit_rec_sw'} <div class="simplebox"> - {tr}Translate recorded{/tr}:<br /> + <h4>{tr}Translate recorded{/tr}:</h4> <table class="formcolor"> <tr> <td align="right"><input name="tran_search" value="{$tran_search|escape}" size=10 maxlength=255></td> @@ -86,7 +83,7 @@ {/if} {if $whataction eq 'edit_tran_sw'} <div class="simplebox"> - {tr}Edit translations{/tr}:<br /> + <h4>{tr}Edit translations{/tr}:</h4> <table class="formcolor"> <tr> <td align="left" colspan=4> @@ -111,6 +108,8 @@ {if $untr_numrows > $tr_recnum+$maxRecords} <input type="submit" name="morerec" value="{tr}next page{/tr}" /> {/if} + <br /> + <input type="submit" name="translate_all" value="{tr}Translate all{/tr}" /> <input type="hidden" name="tr_recnum" value="{$tr_recnum|escape}" /> </div> {/if} Modified: trunk/tiki-edit_languages.php =================================================================== --- trunk/tiki-edit_languages.php 2010-10-08 17:53:31 UTC (rev 29908) +++ trunk/tiki-edit_languages.php 2010-10-08 21:09:08 UTC (rev 29909) @@ -48,11 +48,10 @@ $edit_language = $prefs['language']; } -if (isset($_REQUEST["whataction"])) { - $smarty->assign('whataction', $_REQUEST["whataction"]); -} else { - $smarty->assign('whataction', ''); +if (!isset($_REQUEST["whataction"])) { + $_REQUEST['whataction'] = 'edit_tran_sw'; } +$smarty->assign('whataction', $_REQUEST["whataction"]); if (isset($_REQUEST['only_db_translations'])) { $smarty->assign('only_db_translations', 'y'); @@ -90,7 +89,7 @@ if (strlen($_REQUEST["edit_rec_tran_$i"]) > 0 && strlen($_REQUEST["edit_rec_source_$i"]) > 0) { $language->updateTrans($_REQUEST["edit_rec_source_$i"], $_REQUEST["edit_rec_tran_$i"]); } - } elseif (isset($_REQUEST["edt_tran_$i"])) { + } elseif (isset($_REQUEST["edt_tran_$i"]) || $_REQUEST['translate_all']) { // Handle edits in edit translations if (strlen($_REQUEST["edit_edt_tran_$i"]) > 0 && strlen($_REQUEST["edit_edt_source_$i"]) > 0) { $language->updateTrans($_REQUEST["edit_edt_source_$i"], $_REQUEST["edit_edt_tran_$i"]); @@ -108,6 +107,14 @@ $query = "delete from `tiki_untranslated`"; $result = $tikilib->query($query); } + + // update language array with new translations + $query = "select `source`, `tran` from `tiki_language` where `lang`=?"; + $result = $tikilib->fetchAll($query, array($edit_language)); + + foreach( $result as $row ) { + ${"lang_$edit_language"}[ $row['source'] ] = $row['tran']; + } } //show only a selection of maxRecords records @@ -258,6 +265,7 @@ $smarty->assign('metatag_robots', 'NOINDEX, NOFOLLOW'); $headerlib->add_cssfile('css/admin.css'); +$headerlib->add_jsfile('lib/language/tiki-edit_languages.js'); $headtitle = tra('Edit languages'); $description = tra('Edit or export/import languages'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |