From: <jon...@us...> - 2010-01-23 02:19:40
|
Revision: 24620 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24620&view=rev Author: jonnybradley Date: 2010-01-23 02:19:33 +0000 (Sat, 23 Jan 2010) Log Message: ----------- [ENH] Translation diff now side by side in fullscreen mode. More to come... Modified Paths: -------------- trunk/lib/jquery_tiki/tiki-jquery.js trunk/templates/tiki-editpage.tpl Modified: trunk/lib/jquery_tiki/tiki-jquery.js =================================================================== --- trunk/lib/jquery_tiki/tiki-jquery.js 2010-01-23 00:35:09 UTC (rev 24619) +++ trunk/lib/jquery_tiki/tiki-jquery.js 2010-01-23 02:19:33 UTC (rev 24620) @@ -548,13 +548,19 @@ function toggleFullScreen(area_name) { var $ta = $jq("#" + area_name); + var $diff = $jq("#diff_outer"); + if (!$ta.length) { $ta = $jq(getElementById(area_name)); } if (fullScreenState[area_name]) { // leave full screen - - $ta.width(fullScreenState[area_name]["ta"]["width"]).height(fullScreenState[area_name]["ta"]["height"]); + if ($diff.length) { + $diff.css("float", fullScreenState[area_name]["diff"]["float"]).width(fullScreenState[area_name]["diff"]["width"]).height(fullScreenState[area_name]["diff"]["height"]); + $jq("#diff_history").height(fullScreenState[area_name]["diff_history"]["height"]) + .width(fullScreenState[area_name]["diff_history"]["width"]); + } + $ta.css("float", fullScreenState[area_name]["ta"]["float"]).width(fullScreenState[area_name]["ta"]["width"]).height(fullScreenState[area_name]["ta"]["height"]); $ta.resizable({minWidth: fullScreenState[area_name]["resizable"]["minWidth"], minHeight: fullScreenState[area_name]["resizable"]["minHeight"]}); for(var i = 0; i < fullScreenState[area_name]["hidden"].length; i++) { @@ -595,6 +601,10 @@ var h = $jq(window).height(); var w = $jq(window).width(); + if ($diff.length) { // translation diff there so split the screen down the middle (for now) + w = Math.floor(w / 2) - 5; + } + fullScreenState[area_name]["hidden"].push($jq("#header, #col2, #col3, #footer")); $jq("#header, #col2, #col3, #footer").hide(); @@ -615,15 +625,33 @@ fullScreenState[area_name]["changed"].push(ob); }); $ta.parents().each(function() { - $jq(this).siblings(":visible").hide(); + $jq(this).siblings(":visible:not(#diff_outer)").hide(); $jq(this).css("margin", 0).css("padding", 0).width(w).height(h); }); + if ($diff.length) { + fullScreenState[area_name]["diff"] = []; + fullScreenState[area_name]["diff"]["width"] = $diff.width(); + fullScreenState[area_name]["diff"]["height"] = $diff.height(); + fullScreenState[area_name]["diff"]["float"] = $diff.css("float"); + fullScreenState[area_name]["diff_history"] = []; + fullScreenState[area_name]["diff_history"]["height"] = $jq("#diff_history").height(); + fullScreenState[area_name]["diff_history"]["width"] = $jq("#diff_history").width(); + $diff.parents().each(function() { // shares some parents with the textarea + $jq(this).width($jq(window).width()); // so make room for both + }); + } + fullScreenState[area_name]["ta"] = []; fullScreenState[area_name]["ta"]["width"] = $ta.width(); fullScreenState[area_name]["ta"]["height"] = $ta.height(); + fullScreenState[area_name]["ta"]["float"] = $ta.css("float"); $ta.width(w).height($ta.parent().height() - $jq(".textarea-toolbar").height() - 60); + if ($diff.length) { + $diff.width(w).height(h).css("float", "left").next().css("float", "right"); + $jq("#diff_history").height(h * 0.9).width(w); + } if ($jq("div.top_actions").length) { $ta.parent().append($jq("div.top_actions > .wikiaction").clone(true).addClass("fs_clones")); Modified: trunk/templates/tiki-editpage.tpl =================================================================== --- trunk/templates/tiki-editpage.tpl 2010-01-23 00:35:09 UTC (rev 24619) +++ trunk/templates/tiki-editpage.tpl 2010-01-23 02:19:33 UTC (rev 24620) @@ -97,18 +97,20 @@ {include file='tiki-preview.tpl'} {/if} {if $diff_style} - <div style="overflow:auto;height:200px;"> - {include file='pagehistory.tpl'} + <div id="diff_outer"> + <div style="overflow:auto;height:20ex;" id="diff_history"> + {include file='pagehistory.tpl'} + </div> + {if $diff_summaries} + <div class="wikitext" id="diff_versions"> + <ul> + {foreach item=diff from=$diff_summaries} + <li>{tr}Version:{/tr} {$diff.version|escape} - {$diff.comment|escape|default:"<em>{tr}No comment{/tr}</em>"}</li> + {/foreach} + </ul> + </div> + {/if} </div> - {if $diff_summaries} - <div class="wikitext"> - <ul> - {foreach item=diff from=$diff_summaries} - <li>{tr}Version:{/tr} {$diff.version|escape} - {$diff.comment|escape|default:"<em>{tr}No comment{/tr}</em>"}</li> - {/foreach} - </ul> - </div> - {/if} {/if} {if $prompt_for_edit_or_translate == 'y'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |