Menu
▾
▴
[Tikiwiki-cvs] tiki/templates header.tpl,1.30,1.31 tiki-admin-include-features.tpl,1.41,1.42 tiki-directory_admin.tpl,1.11,1.12 tiki-my_tiki.tpl,1.10,1.11 tiki-view_tracker_item.tpl,1.68,1.69 tiki-webmail.tpl,1.25,1.26
Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1633/templates Modified Files: header.tpl tiki-admin-include-features.tpl tiki-directory_admin.tpl tiki-my_tiki.tpl tiki-view_tracker_item.tpl tiki-webmail.tpl Log Message: Instant-Auto-Merge from BRANCH to HEAD Index: header.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/header.tpl,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- header.tpl 15 Mar 2004 21:27:34 -0000 1.30 +++ header.tpl 8 Apr 2004 22:55:12 -0000 1.31 @@ -66,30 +66,14 @@ {* --- tabs block (for myTiki, calendar, and more to come) --- *} {if $uses_tabs eq 'y'} -<script src="lib/tabs/utils.js" type="text/javascript"></script> -<script src="lib/tabs/viewport.js" type="text/javascript"></script> -<script src="lib/tabs/global.js" type="text/javascript"></script> -<script src="lib/tabs/cookie.js" type="text/javascript"></script> -<script src="lib/tabs/tabs.js" type="text/javascript"></script> -<script language='Javascript' type='text/javascript'> -// <![CDATA[ -TabParams = {literal}{{/literal} - useClone : false, - alwaysShowClone : false, - eventType : "click", - tabTagName : "span" - {literal}}{/literal}; -// ]]> -</script> +{* tabs lib removed because non-free *} {/if} {$trl} </head> -<body {if $uses_tabs eq 'y'}onload="tabInit()"{/if} -{if $user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'}ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} > - +<body {if $user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'}ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if}> {if $minical_reminders>100} <iframe width='0' height='0' frameborder="0" src="tiki-minical_reminders.php"></iframe> {/if} Index: tiki-admin-include-features.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin-include-features.tpl,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- tiki-admin-include-features.tpl 27 Mar 2004 21:24:58 -0000 1.41 +++ tiki-admin-include-features.tpl 8 Apr 2004 22:55:12 -0000 1.42 @@ -438,12 +438,12 @@ :</td> <td><input type="checkbox" name="feature_jscalendar" {if $feature_jscalendar eq 'y'}checked="checked"{/if}/></td> - <td> </td> - <td class="form"> - </td> - <td> - </td> - </tr> + {if $feature_help eq 'y'}<a href="http://tikiwiki.org/tiki-index.php?page=Tabs" target="tikihelp" class="tikihelp" title="{tr}Tikiwiki.org help{/tr}: +{tr}TikiTabs{/tr}">{/if} + {tr}Use Tabs{/tr} + {if $feature_help eq 'y'}</a>{/if} + :</td> + <td><input type="checkbox" name="feature_tabs" {if $feature_tabs eq 'y'}checked="checked"{/if}/></td> <tr> @@ -462,6 +462,8 @@ :</td> <td><input type="checkbox" name="feature_jukebox" {if $feature_jukebox eq 'y'}checked="checked"{/if} /></td> + + </tr> Index: tiki-directory_admin.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-directory_admin.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- tiki-directory_admin.tpl 3 Mar 2004 22:42:19 -0000 1.11 +++ tiki-directory_admin.tpl 8 Apr 2004 22:55:12 -0000 1.12 @@ -38,6 +38,6 @@ {if $tiki_p_admin_directory_sites eq 'y'}<li><a class="link" href="tiki-directory_admin_sites.php">{tr}Admin sites{/tr}</a></li>{/if} {if $tiki_p_admin_directory_cats eq 'y'}<li><a class="link" href="tiki-directory_admin_related.php">{tr}Admin category relationships{/tr}</a></li>{/if} {if $tiki_p_validate_links eq 'y'}<li><a class="link" href="tiki-directory_validate_sites.php">{tr}Validate links{/tr}</a></li>{/if} - {if $tiki_p_admin eq 'y'}<li><a class="link" href="tiki-admin.php#directory">{tr}Settings{/tr}</a></li>{/if} + {if $tiki_p_admin eq 'y'}<li><a class="link" href="tiki-admin.php?page=directory">{tr}Settings{/tr}</a></li>{/if} </ul> Index: tiki-my_tiki.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-my_tiki.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- tiki-my_tiki.tpl 15 Mar 2004 21:27:34 -0000 1.10 +++ tiki-my_tiki.tpl 8 Apr 2004 22:55:12 -0000 1.11 @@ -18,36 +18,6 @@ {include file=tiki-mytiki_bar.tpl} <br /><br /> - - -<div class="tabs"> - {if $mytiki_pages eq 'y'} - <span id="tab1" class="tab tabActive">{tr}My Pages{/tr}</span> - {/if} - {if $mytiki_gals eq 'y'} - <span id="tab2" class="tab">{tr}My galleries{/tr}</span> - {/if} - {if $mytiki_items eq 'y'} - <span id="tab3" class="tab">{tr}My items{/tr}</span> - {/if} - {if $mytiki_msgs eq 'y'} - <span id="tab4" class="tab">{tr}My messages{/tr}</span> - {/if} - {if $mytiki_tasks eq 'y'} - <span id="tab5" class="tab">{tr}My tasks{/tr}</span> - {/if} - {if $mytiki_blogs eq 'y'} - <span id="tab6" class="tab">{tr}My blogs{/tr}</span> - {/if} - {if $feature_workflow eq 'y'} - {if $tiki_p_use_workflow eq 'y'} - {if $mytiki_workflow eq 'y'} - <span id="tab7" class="tab">{tr}My workflow{/tr}</span> - {/if} - {/if} - {/if} -</div> - {if $mytiki_pages eq 'y'} <div id="content1" class="content"> <div class="cbox"> Index: tiki-view_tracker_item.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-view_tracker_item.tpl,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- tiki-view_tracker_item.tpl 31 Mar 2004 07:38:44 -0000 1.68 +++ tiki-view_tracker_item.tpl 8 Apr 2004 22:55:12 -0000 1.69 @@ -15,24 +15,25 @@ </div> <br /><br /> - +{if $feature_tabs eq 'y'} {cycle name=tabs values="1,2,3,4,5" print=false advance=false} -<div class="tabs"> -<span id="tab{cycle name=tabs}" class="tab tabActive">{tr}View{/tr}</span> +<div id="page-bar"> +<span id="tab{cycle name=tabs advance=false}" class="button2"><a href="javascript:tikitabs({cycle name=tabs},5);" class="linkbut">{tr}View{/tr}</a></span> {if $tracker_info.useComments eq 'y'} -<span id="tab{cycle name=tabs}" class="tab">{tr}Comments{/tr}</span> +<span id="tab{cycle name=tabs advance=false}" class="button2"><a href="javascript:tikitabs({cycle name=tabs},5);" class="linkbut">{tr}Comments{/tr}</a></span> {/if} {if $tracker_info.useAttachments eq 'y'} -<span id="tab{cycle name=tabs}" class="tab">{tr}Attachments{/tr}</span> +<span id="tab{cycle name=tabs advance=false}" class="button2"><a href="javascript:tikitabs({cycle name=tabs},5);" class="linkbut">{tr}Attachments{/tr}</a></span> {/if} {if $tiki_p_modify_tracker_items eq 'y'} -<span id="tab{cycle name=tabs}" class="tab">{tr}Edit{/tr}</span> +<span id="tab{cycle name=tabs advance=false}" class="button2"><a href="javascript:tikitabs({cycle name=tabs},5);" class="linkbut">{tr}Edit{/tr}</a></span> {/if} </div> +{/if} -{cycle name=content values="1,2,3,4,5" print=false advance=false} -{* ---------------------------------------------------- tab with view --- *} -<div id="content{cycle name=content}" class="content"> +{cycle name=content values="1,2,3,4,5" print=false advance=false assign=focustab} +{* --- tab with view --- *} +<div id="content{cycle name=content}" class="wikitext"{if $features_tabs eq 'y'} style="display:{if $focustab eq $smarty.cookies.tab}block{else}none{/if};"{/if}> <h3>{tr}View item{/tr}</h3> <table class="normal"> {if $tracker_info.showStatus eq 'y' and ($tracker_info.showStatusAdminOnly ne 'y' or $tiki_p_admin_trackers eq 'y')} @@ -127,7 +128,7 @@ {* -------------------------------------------------- tab with comments --- *} {if $tracker_info.useComments eq 'y'} -<div id="content{cycle name=content}" class="content"> +<div id="content{cycle name=content}" class="wikitext"{if $features_tabs eq 'y'} style="display:{if $focustab eq $smarty.cookies.tab}block{else}none{/if};"{/if}> {if $tiki_p_comment_tracker_items eq 'y'} <h3>{tr}Add a comment{/tr}</h3> <form action="tiki-view_tracker_item.php" method="post"> @@ -156,7 +157,7 @@ {* ---------------------------------------- tab with attachements --- *} {if $tracker_info.useAttachments eq 'y'} -<div id="content{cycle name=content}" class="content"> +<div id="content{cycle name=content}" class="wikitext"{if $feature_tabs eq 'y'} style="display:{if $focustab eq $smarty.cookies.tab}block{else}none{/if};" {/if}> {if $tiki_p_attach_trackers eq 'y'} <h3>{tr}Attach a file to this item{/tr}</h3> <form enctype="multipart/form-data" action="tiki-view_tracker_item.php" method="post"> @@ -221,7 +222,7 @@ {* --------------------------------------------------------------- tab with edit --- *} {if $tiki_p_modify_tracker_items eq 'y'} -<div id="content{cycle name=content}" class="content"> +<div id="content{cycle name=content}" class="wikitext"{if $feature_tabs eq 'y'} style="display:{if $focustab eq $smarty.cookies.tab}block{else}none{/if};"{/if}> <h3>{tr}Edit item{/tr}</h3> <form action="tiki-view_tracker_item.php" method="post"> <input type="hidden" name="trackerId" value="{$trackerId|escape}" /> Index: tiki-webmail.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-webmail.tpl,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- tiki-webmail.tpl 31 Mar 2004 07:38:44 -0000 1.25 +++ tiki-webmail.tpl 8 Apr 2004 22:55:12 -0000 1.26 @@ -50,7 +50,7 @@ <tr><td class="formcolor">{tr}Account name{/tr}</td><td colspan="3" class="formcolor"><input type="text" name="account" value="{$info.account|escape}" /></td></tr> <tr><td class="formcolor">{tr}POP server{/tr}</td><td class="formcolor"><input type="text" name="pop" value="{$info.pop|escape}" /></td><td class="formcolor">{tr}Port{/tr}</td><td class="formcolor"><input type="text" name="port" size="7" value="{$info.port}" /></td></tr> <tr><td class="formcolor">{tr}SMTP server{/tr}</td><td class="formcolor"><input type="text" name="smtp" value="{$info.smtp|escape}" /></td><td class="formcolor">{tr}Port{/tr}</td><td class="formcolor"><input type="text" name="smtpPort" size="7" value="{$info.smtpPort}" /></td></tr> -<tr><td class="formcolor">{tr}SMTP requires authentication{/tr}</td><td colspan="3" class="formcolor">{tr}Yes{/tr}<input type="radio" name="useAuth" value="yes" {if $info.useAuth eq 'y'}checked="checked"{/if} /> {tr}No{/tr}<input type="radio" name="useAuth" value="no" {if $info.useAuth eq 'n'}checked="checked"{/if} /></td></tr> +<tr><td class="formcolor">{tr}SMTP requires authentication{/tr}</td><td colspan="3" class="formcolor">{tr}Yes{/tr}<input type="radio" name="useAuth" value="y" {if $info.useAuth eq 'y'}checked="checked"{/if} /> {tr}No{/tr}<input type="radio" name="useAuth" value="n" {if $info.useAuth eq 'n'}checked="checked"{/if} /></td></tr> <tr><td class="formcolor">{tr}Username{/tr}</td><td colspan="3" class="formcolor"><input type="text" name="username" value="{$info.username|escape}" /></td></tr> <tr><td class="formcolor">{tr}Password{/tr}</td><td colspan="3" class="formcolor"><input type="password" name="pass" value="{$info.pass|escape}" /></td></tr> <tr><td class="formcolor">{tr}Messages per page{/tr}</td><td colspan="3" class="formcolor"><input type="text" name="msgs" size="7" value="{$info.msgs|escape}" /></td></tr> |