From: <mic...@us...> - 2005-03-23 15:34:51
|
Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14572/templates Modified Files: Tag: BRANCH-1-8 error.tpl Removed Files: Tag: BRANCH-1-8 error404.tpl Log Message: fold error404.tpl functionality into error.tpl; remove error404.tpl Index: error.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/error.tpl,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -u -d -r1.13.2.1 -r1.13.2.2 --- error.tpl 30 Mar 2004 07:20:10 -0000 1.13.2.1 +++ error.tpl 23 Mar 2005 15:34:42 -0000 1.13.2.2 @@ -24,11 +24,33 @@ <br /> <div class="cbox"> <div class="cbox-title"> - {tr}Error{/tr} + {$errortitle|default:"{tr}Error{/tr}"} </div> <div class="cbox-data"> - {$msg}<br /><br /> - {if $page and !$nocreate and ($tiki_p_admin eq 'y' or $tiki_p_admin_wiki eq 'y')}<a href="tiki-editpage.php?page={$page}" class="linkmenu">{tr}Create this page{/tr}</a><br /><br />{/if} + <br /> + {if ($errortype eq "404")} + Perhaps you were looking for: + <ul> + {section name=back loop=$likepages} + <li><a href="tiki-index.php?page={$likepages[back]|escape:"url"}" class="wiki">{$likepages[back]}</a></li> + {sectionelse} + <li>{tr}There are no wiki pages similar to '{$page}'{/tr}</li> + {/section} + </ul> + <br /> + {include + file="tiki-searchindex.tpl" + searchNoResults="true" + searchStyle="menu" + searchOrientation="horiz" + words="$page" + } + <br /> + {else} + {$msg} + <br /><br /> + {/if} + {if $page and !$nocreate and ($tiki_p_admin eq 'y' or $tiki_p_admin_wiki eq 'y' or $tiki_p_edit eq 'y')}<a href="tiki-editpage.php?page={$page}" class="linkmenu">{tr}Create this page{/tr}</a> {tr}(page will be orphaned){/tr}<br /><br />{/if} <a href="javascript:history.back()" class="linkmenu">{tr}Go back{/tr}</a><br /><br /> <a href="{$tikiIndex}" class="linkmenu">{tr}Return to home page{/tr}</a> </div> --- error404.tpl DELETED --- |