From: <jon...@us...> - 2010-01-31 17:13:44
|
Revision: 24767 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24767&view=rev Author: jonnybradley Date: 2010-01-31 17:13:37 +0000 (Sun, 31 Jan 2010) Log Message: ----------- [INDENT] No code changes Modified Paths: -------------- trunk/templates/tiki-pagehistory.tpl Modified: trunk/templates/tiki-pagehistory.tpl =================================================================== --- trunk/templates/tiki-pagehistory.tpl 2010-01-31 15:24:51 UTC (rev 24766) +++ trunk/templates/tiki-pagehistory.tpl 2010-01-31 17:13:37 UTC (rev 24767) @@ -8,186 +8,210 @@ </div> {if $preview} - <h2>{tr}Preview of version:{/tr} {$preview} - {if $info.version eq $preview}<small><small>{tr}(current){/tr}</small></small>{/if} - </h2> - {if $info.version ne $preview and $tiki_p_rollback eq 'y'} - <div class="navbar"> - <a href="tiki-rollback.php?page={$page|escape:"url"}&version={$preview}" title="{tr}Rollback{/tr}">{tr}Rollback to this version{/tr}</a> - </div> - {/if} + <h2>{tr}Preview of version:{/tr} {$preview} + {if $info.version eq $preview}<small><small>{tr}(current){/tr}</small></small>{/if} + </h2> + {if $info.version ne $preview and $tiki_p_rollback eq 'y'} + <div class="navbar"> + <a href="tiki-rollback.php?page={$page|escape:"url"}&version={$preview}" title="{tr}Rollback{/tr}">{tr}Rollback to this version{/tr}</a> + </div> + {/if} <div class="wikitext">{$previewd}</div> {/if} {if $source} -<h2>{tr}Source of version:{/tr} {$source} -{if $info.version eq $source}<small><small>{tr}(current){/tr}</small></small>{/if} -</h2> -{if $info.version ne $source and $tiki_p_rollback eq 'y'} -<div class="navbar"><a href="tiki-rollback.php?page={$page|escape:"url"}&version={$source}" title="{tr}Rollback{/tr}">{tr}Rollback to this version{/tr}</a></div> + <h2> + {tr}Source of version:{/tr} {$source} + {if $info.version eq $source}<small><small>{tr}(current){/tr}</small></small>{/if} + </h2> + {if $info.version ne $source and $tiki_p_rollback eq 'y'} + <div class="navbar"><a href="tiki-rollback.php?page={$page|escape:"url"}&version={$source}" title="{tr}Rollback{/tr}">{tr}Rollback to this version{/tr}</a></div> + {/if} + <div class="wikitext">{$sourced}</div> {/if} -<div class="wikitext">{$sourced}</div> -{/if} {include file='pagehistory.tpl'} <br /> {if (!isset($noHistory))} -{if $preview || $source || $diff_style}<h2>{tr}History{/tr}</h2>{/if} -<form action="tiki-pagehistory.php" method="get"> -<input type="hidden" name="page" value="{$page|escape}" /> -<div style="text-align:center;"> -<div class="simplebox"><b>{tr}Legend:{/tr}</b> {tr}v=view{/tr}{if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"}, {tr}s=source{/tr} {/if}{if $prefs.default_wiki_diff_style eq "old"}, {tr}c=compare{/tr}, {tr}d=diff{/tr}{/if}{if $tiki_p_rollback eq 'y'}, {tr}b=rollback{/tr}{/if}</div> -{if ($prefs.default_wiki_diff_style ne "old") and $history} -<div style=" text-align:right;"><select name="diff_style"> - <option value="htmldiff" {if $diff_style == "htmldiff"}selected="selected"{/if}>{tr}HTML diff{/tr}</option> - <option value="sidediff" {if $diff_style == "sidediff"}selected="selected"{/if}>{tr}Side-by-side diff{/tr}</option> - <option value="sidediff-char" {if $diff_style == "sidediff-char"}selected="selected"{/if}>{tr}Side-by-side diff by characters{/tr}</option> - <option value="inlinediff" {if $diff_style == "inlinediff"}selected="selected"{/if}>{tr}Inline diff{/tr}</option> - <option value="inlinediff-char" {if $diff_style == "inlinediff-char"}selected="selected"{/if}>{tr}Inline diff by characters{/tr}</option> - <option value="sidediff-full" {if $diff_style == "sidediff-full"}selected="selected"{/if}>{tr}Full side-by-side diff{/tr}</option> - <option value="sidediff-full-char" {if $diff_style == "sidediff-full-char"}selected="selected"{/if}>{tr}Full side-by-side diff by characters{/tr}</option> - <option value="inlinediff-full" {if $diff_style == "inlinediff-full"}selected="selected"{/if}>{tr}Full inline diff{/tr}</option> - <option value="inlinediff-full-char" {if $diff_style == "inlinediff-full-char"}selected="selected"{/if}>{tr}Full inline diff by characters{/tr}</option> - <option value="unidiff" {if $diff_style == "unidiff"}selected="selected"{/if}>{tr}Unified diff{/tr}</option> - <option value="sideview" {if $diff_style == "sideview"}selected="selected"{/if}>{tr}Side-by-side view{/tr}</option> -</select> -</div> -{/if} - -<table class="normal"> -<tr> -{if $tiki_p_remove eq 'y'}<th><input type="submit" name="delete" value="{tr}Del{/tr}" /></th>{/if} -<th>{tr}Date{/tr}</th> -{if $tiki_p_wiki_view_author ne 'n'}<th>{tr}User{/tr}</th>{/if} -{if $prefs.feature_wiki_history_ip ne 'n'}<th>{tr}IP{/tr}</th>{/if} -<th>{tr}Edit Comment{/tr}</th> -{if $prefs.feature_contribution eq 'y'}<th>{tr}Contribution{/tr}</th>{/if} -{if $prefs.feature_contribution eq 'y' and $prefs.feature_contributor_wiki eq 'y'}<th>{tr}Contributors{/tr}</th>{/if} -<th>{tr}Version{/tr}</th> -<th>{tr}Action{/tr}</th> -{if $prefs.default_wiki_diff_style != "old" and $history} -<th colspan="2"> -<input type="submit" name="compare" value="{tr}Compare{/tr}" /><br /> -</th> -{/if} -</tr> -<tr> -{if $tiki_p_remove eq 'y'} -<td class="odd"> </td> -{/if} -<td class="odd">{$info.lastModif|tiki_short_datetime}</td> -{if $tiki_p_wiki_view_author ne 'n'}<td class="odd">{$info.user|userlink}</td>{/if} -{if $prefs.feature_wiki_history_ip ne 'n'}<td class="odd">{$info.ip}</td>{/if} -<td class="odd"> - {if $info.comment}{$info.comment|escape}{else} {/if} - {if $translation_sources[$info.version]} - {foreach item=source from=$translation_sources[$info.version]} - <div> - {tr}Updated from:{/tr} <a href="tiki-index.php?page={$source.page|escape}">{$source.page}</a> at version {$source.version} - </div> - {/foreach} - {/if} - {if $translation_targets[$info.version]} - {foreach item=target from=$translation_targets[$info.version]} - <div> - {tr}Used to update:{/tr} <a href="tiki-index.php?page={$target.page|escape}">{$target.page}</a> to version {$target.version} - </div> - {/foreach} - {/if} -</td> -{if $prefs.feature_contribution eq 'y'}<td class="odd">{section name=ix loop=$contributions}{if !$smarty.section.ix.first},{/if}{$contributions[ix].name|escape}{/section}</td>{/if} -{if $prefs.feature_contribution eq 'y' and $prefs.feature_contributor_wiki eq 'y'}<td class="odd">{section name=ix loop=$contributors}{if !$smarty.section.ix.first},{/if}{$contributors[ix].login|username}{/section}</td>{/if} -<td class="odd button">{$info.version}<br />{tr}Current{/tr}</td> -<td class="odd button"> <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&preview={$info.version}" title="{tr}View{/tr}">v</a> -{if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"} - <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&source={$info.version}" title="{tr}Source{/tr}">s</a> -{/if} -</td> -{if $prefs.default_wiki_diff_style ne "old" and $history} -<td class="odd button"><input type="radio" name="oldver" value="0" title="{tr}Compare{/tr}" {if $old.version == $info.version}checked="checked"{/if} /></td> -<td class="odd button"><input type="radio" name="newver" value="0" title="{tr}Compare{/tr}" {if $new.version == $info.version or !$smarty.request.diff_style}checked="checked"{/if} /></td> -{/if} -</tr> -{cycle values="odd,even" print=false} -{foreach name=hist item=element from=$history} -<tr> -{if $tiki_p_remove eq 'y'} -<td class="{cycle advance=false} button"><input type="checkbox" name="hist[{$element.version}]" /></td> -{/if} -<td class="{cycle advance=false}">{$element.lastModif|tiki_short_datetime}</td> -{if $tiki_p_wiki_view_author ne 'n'}<td class="{cycle advance=false}">{$element.user|userlink}</td>{/if} -{if $prefs.feature_wiki_history_ip ne 'n'}<td class="{cycle advance=false}">{$element.ip}</td>{/if} -<td class="{cycle advance=false}"> - {if $element.comment}{$element.comment|escape}{else} {/if} - {if $translation_sources[$element.version]} - {foreach item=source from=$translation_sources[$element.version]} - <div> - {tr}Updated from:{/tr} <a href="tiki-index.php?page={$source.page|escape}">{$source.page}</a> at version {$source.version} - </div> - {/foreach} - {/if} - {if $translation_targets[$element.version]} - {foreach item=target from=$translation_targets[$element.version]} - <div> - {tr}Used to update:{/tr} <a href="tiki-index.php?page={$target.page|escape}">{$target.page}</a> to version {$target.version} - </div> - {/foreach} - {/if} -</td> -{if $prefs.feature_contribution eq 'y'}<td class="{cycle advance=false}">{section name=ix loop=$element.contributions}{if !$smarty.section.ix.first} {/if}{$element.contributions[ix].name|escape}{/section}</td>{/if} -{if $prefs.feature_contribution eq 'y' and $prefs.feature_contributor_wiki eq 'y'}<td class="{cycle advance=false}">{section name=ix loop=$element.contributors}{if !$smarty.section.ix.first},{/if}{$element.contributors[ix].login|username}{/section}</td>{/if} -<td class="{cycle advance=false} button">{$element.version}</td> -<td class="{cycle advance=false} button"> - <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&preview={$element.version}" title="{tr}View{/tr}">v</a> -{if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"} - <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&source={$element.version}" title="{tr}Source{/tr}">s</a> -{/if} -{if $prefs.default_wiki_diff_style eq "old"} - <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&diff2={$element.version}&diff_style=sideview" title="{tr}Compare{/tr}">c</a> - <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&diff2={$element.version}&diff_style=unidiff" title="{tr}Diff{/tr}">d</a> -{/if} -{if $tiki_p_rollback eq 'y' && $lock neq true} - <a class="link" href="tiki-rollback.php?page={$page|escape:"url"}&version={$element.version}" title="{tr}Rollback{/tr}">b</a> -{/if} - -</td> -{if $prefs.default_wiki_diff_style ne "old"} -<td class="{cycle advance=false} button"> -<input type="radio" name="oldver" value="{$element.version}" title="{tr}Older Version{/tr}" {if $old.version == $element.version or (!$smarty.request.diff_style and $smarty.foreach.hist.first)}checked="checked"{/if} /> -</td> -<td class="{cycle} button"> -{* if $smarty.foreach.hist.last *} -<input type="radio" name="newver" value="{$element.version}" title="Select a newer version for comparison" {if $new.version == $element.version}checked="checked"{/if} /> -</td> -{/if} -</tr> -{/foreach} -{if $prefs.feature_multilingual eq 'y' and $tiki_p_edit eq 'y'} -<tr> - <td colspan="9" class="right"> - <select name="tra_lang"> - {section name=ix loop=$languages} - <option value="{$languages[ix].value|escape}"{if $lang eq $languages[ix].value} selected="selected"{/if}>{$languages[ix].name}</option> - {/section} - </select> - <input type="submit" name="update_translation" value="{tr}Update Translation{/tr}"/> - <div> - {if $show_translation_history} - <input type="hidden" name="show_translation_history" value="1"/> - <a href="tiki-pagehistory.php?page={$page|escape}">{tr}Hide translation history{/tr}</a> - {else} - <a href="tiki-pagehistory.php?page={$page|escape}&show_translation_history=1">{tr}Show translation history{/tr}</a> + {if $preview || $source || $diff_style}<h2>{tr}History{/tr}</h2>{/if} + <form action="tiki-pagehistory.php" method="get"> + <input type="hidden" name="page" value="{$page|escape}" /> + <div style="text-align:center;"> + <div class="simplebox"> + <b>{tr}Legend:{/tr}</b> {tr}v=view{/tr} + {if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"}, {tr}s=source{/tr} {/if} + {if $prefs.default_wiki_diff_style eq "old"}, {tr}c=compare{/tr}, {tr}d=diff{/tr}{/if} + {if $tiki_p_rollback eq 'y'}, {tr}b=rollback{/tr}{/if} + </div> + {if ($prefs.default_wiki_diff_style ne "old") and $history} + <div style=" text-align:right;"> + <select name="diff_style"> + <option value="htmldiff" {if $diff_style == "htmldiff"}selected="selected"{/if}>{tr}HTML diff{/tr}</option> + <option value="sidediff" {if $diff_style == "sidediff"}selected="selected"{/if}>{tr}Side-by-side diff{/tr}</option> + <option value="sidediff-char" {if $diff_style == "sidediff-char"}selected="selected"{/if}>{tr}Side-by-side diff by characters{/tr}</option> + <option value="inlinediff" {if $diff_style == "inlinediff"}selected="selected"{/if}>{tr}Inline diff{/tr}</option> + <option value="inlinediff-char" {if $diff_style == "inlinediff-char"}selected="selected"{/if}>{tr}Inline diff by characters{/tr}</option> + <option value="sidediff-full" {if $diff_style == "sidediff-full"}selected="selected"{/if}>{tr}Full side-by-side diff{/tr}</option> + <option value="sidediff-full-char" {if $diff_style == "sidediff-full-char"}selected="selected"{/if}>{tr}Full side-by-side diff by characters{/tr}</option> + <option value="inlinediff-full" {if $diff_style == "inlinediff-full"}selected="selected"{/if}>{tr}Full inline diff{/tr}</option> + <option value="inlinediff-full-char" {if $diff_style == "inlinediff-full-char"}selected="selected"{/if}>{tr}Full inline diff by characters{/tr}</option> + <option value="unidiff" {if $diff_style == "unidiff"}selected="selected"{/if}>{tr}Unified diff{/tr}</option> + <option value="sideview" {if $diff_style == "sideview"}selected="selected"{/if}>{tr}Side-by-side view{/tr}</option> + </select> + </div> {/if} + <table class="normal"> + <tr> + {if $tiki_p_remove eq 'y'}<th><input type="submit" name="delete" value="{tr}Del{/tr}" /></th>{/if} + <th>{tr}Date{/tr}</th> + {if $tiki_p_wiki_view_author ne 'n'}<th>{tr}User{/tr}</th>{/if} + {if $prefs.feature_wiki_history_ip ne 'n'}<th>{tr}IP{/tr}</th>{/if} + <th>{tr}Edit Comment{/tr}</th> + {if $prefs.feature_contribution eq 'y'}<th>{tr}Contribution{/tr}</th>{/if} + {if $prefs.feature_contribution eq 'y' and $prefs.feature_contributor_wiki eq 'y'}<th>{tr}Contributors{/tr}</th>{/if} + <th>{tr}Version{/tr}</th> + <th>{tr}Action{/tr}</th> + {if $prefs.default_wiki_diff_style != "old" and $history} + <th colspan="2"> + <input type="submit" name="compare" value="{tr}Compare{/tr}" /><br /> + </th> + {/if} + </tr> + <tr> + {if $tiki_p_remove eq 'y'} + <td class="odd"> </td> + {/if} + <td class="odd">{$info.lastModif|tiki_short_datetime}</td> + {if $tiki_p_wiki_view_author ne 'n'}<td class="odd">{$info.user|userlink}</td>{/if} + {if $prefs.feature_wiki_history_ip ne 'n'}<td class="odd">{$info.ip}</td>{/if} + <td class="odd"> + {if $info.comment}{$info.comment|escape}{else} {/if} + {if $translation_sources[$info.version]} + {foreach item=source from=$translation_sources[$info.version]} + <div> + {tr}Updated from:{/tr} <a href="tiki-index.php?page={$source.page|escape}">{$source.page}</a> at version {$source.version} + </div> + {/foreach} + {/if} + {if $translation_targets[$info.version]} + {foreach item=target from=$translation_targets[$info.version]} + <div> + {tr}Used to update:{/tr} <a href="tiki-index.php?page={$target.page|escape}">{$target.page}</a> to version {$target.version} + </div> + {/foreach} + {/if} + </td> + {if $prefs.feature_contribution eq 'y'} + <td class="odd">{section name=ix loop=$contributions}{if !$smarty.section.ix.first},{/if}{$contributions[ix].name|escape}{/section}</td> + {/if} + {if $prefs.feature_contribution eq 'y' and $prefs.feature_contributor_wiki eq 'y'} + <td class="odd"> + {section name=ix loop=$contributors}{if !$smarty.section.ix.first},{/if}{$contributors[ix].login|username}{/section} + </td> + {/if} + <td class="odd button">{$info.version}<br />{tr}Current{/tr}</td> + <td class="odd button"> <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&preview={$info.version}" title="{tr}View{/tr}">v</a> + {if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"} + <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&source={$info.version}" title="{tr}Source{/tr}">s</a> + {/if} + </td> + {if $prefs.default_wiki_diff_style ne "old" and $history} + <td class="odd button"> + <input type="radio" name="oldver" value="0" title="{tr}Compare{/tr}" {if $old.version == $info.version}checked="checked"{/if} /> + </td> + <td class="odd button"> + <input type="radio" name="newver" value="0" title="{tr}Compare{/tr}" {if $new.version == $info.version or !$smarty.request.diff_style}checked="checked"{/if} /> + </td> + {/if} + </tr> + {cycle values="odd,even" print=false} + {foreach name=hist item=element from=$history} + <tr> + {if $tiki_p_remove eq 'y'} + <td class="{cycle advance=false} button"><input type="checkbox" name="hist[{$element.version}]" /></td> + {/if} + <td class="{cycle advance=false}">{$element.lastModif|tiki_short_datetime}</td> + {if $tiki_p_wiki_view_author ne 'n'}<td class="{cycle advance=false}">{$element.user|userlink}</td>{/if} + {if $prefs.feature_wiki_history_ip ne 'n'}<td class="{cycle advance=false}">{$element.ip}</td>{/if} + <td class="{cycle advance=false}"> + {if $element.comment}{$element.comment|escape}{else} {/if} + {if $translation_sources[$element.version]} + {foreach item=source from=$translation_sources[$element.version]} + <div> + {tr}Updated from:{/tr} <a href="tiki-index.php?page={$source.page|escape}">{$source.page}</a> at version {$source.version} + </div> + {/foreach} + {/if} + {if $translation_targets[$element.version]} + {foreach item=target from=$translation_targets[$element.version]} + <div> + {tr}Used to update:{/tr} <a href="tiki-index.php?page={$target.page|escape}">{$target.page}</a> to version {$target.version} + </div> + {/foreach} + {/if} + </td> + {if $prefs.feature_contribution eq 'y'} + <td class="{cycle advance=false}"> + {section name=ix loop=$element.contributions}{if !$smarty.section.ix.first} {/if}{$element.contributions[ix].name|escape}{/section} + </td> + {/if} + {if $prefs.feature_contribution eq 'y' and $prefs.feature_contributor_wiki eq 'y'} + <td class="{cycle advance=false}"> + {section name=ix loop=$element.contributors}{if !$smarty.section.ix.first},{/if}{$element.contributors[ix].login|username}{/section} + </td> + {/if} + <td class="{cycle advance=false} button">{$element.version}</td> + <td class="{cycle advance=false} button"> + <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&preview={$element.version}" title="{tr}View{/tr}">v</a> + {if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"} + <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&source={$element.version}" title="{tr}Source{/tr}">s</a> + {/if} + {if $prefs.default_wiki_diff_style eq "old"} + <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&diff2={$element.version}&diff_style=sideview" title="{tr}Compare{/tr}">c</a> + <a class="link" href="tiki-pagehistory.php?page={$page|escape:"url"}&diff2={$element.version}&diff_style=unidiff" title="{tr}Diff{/tr}">d</a> + {/if} + {if $tiki_p_rollback eq 'y' && $lock neq true} + <a class="link" href="tiki-rollback.php?page={$page|escape:"url"}&version={$element.version}" title="{tr}Rollback{/tr}">b</a> + {/if} + + </td> + {if $prefs.default_wiki_diff_style ne "old"} + <td class="{cycle advance=false} button"> + <input type="radio" name="oldver" value="{$element.version}" title="{tr}Older Version{/tr}" {if $old.version == $element.version or (!$smarty.request.diff_style and $smarty.foreach.hist.first)}checked="checked"{/if} /> + </td> + <td class="{cycle} button"> + {* if $smarty.foreach.hist.last *} + <input type="radio" name="newver" value="{$element.version}" title="Select a newer version for comparison" {if $new.version == $element.version}checked="checked"{/if} /> + </td> + {/if} + </tr> + {/foreach} + {if $prefs.feature_multilingual eq 'y' and $tiki_p_edit eq 'y'} + <tr> + <td colspan="9" class="right"> + <select name="tra_lang"> + {section name=ix loop=$languages} + <option value="{$languages[ix].value|escape}"{if $lang eq $languages[ix].value} selected="selected"{/if}>{$languages[ix].name}</option> + {/section} + </select> + <input type="submit" name="update_translation" value="{tr}Update Translation{/tr}"/> + <div> + {if $show_translation_history} + <input type="hidden" name="show_translation_history" value="1"/> + <a href="tiki-pagehistory.php?page={$page|escape}">{tr}Hide translation history{/tr}</a> + {else} + <a href="tiki-pagehistory.php?page={$page|escape}&show_translation_history=1">{tr}Show translation history{/tr}</a> + {/if} + </div> + </td> + </tr> + {/if} + </table> </div> - </td> -</tr> + </form> {/if} -</table> -</div> -</form> -{/if} {include file='tiki-page_bar.tpl'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |