From: <bbu...@us...> - 2004-03-18 17:20:56
|
Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17513/templates Modified Files: Tag: BRANCH-1-8 tiki-admin_mailin.tpl tiki-admin-include-wiki.tpl Added Files: Tag: BRANCH-1-8 tiki-mailin.tpl Log Message: changes so that mail-in feature reflect http://doc.tikiwiki.org/tiki-index.php?page=Mail-in --- NEW FILE: tiki-mailin.tpl --- <a href="tiki-mailin.php" class="pagetitle">{tr}Mail-in feature{/tr}</a> {$content} Index: tiki-admin_mailin.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_mailin.tpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -d -r1.7.2.1 -r1.7.2.2 --- tiki-admin_mailin.tpl 8 Dec 2003 12:06:58 -0000 1.7.2.1 +++ tiki-admin_mailin.tpl 18 Mar 2004 17:11:08 -0000 1.7.2.2 @@ -1,65 +1,140 @@ -<a href="tiki-admin_mailin.php" class="pagetitle">{tr}WebMail accounts{/tr}</a> +<a href="tiki-admin_mailin.php" class="pagetitle">{tr}Mail-in accounts{/tr}</a> -<!-- the help link info --> - {if $feature_help eq 'y'} -<a href="http://tikiwiki.org/tiki-index.php?page=Webmail" target="tikihelp" class="tikihelp" title="{tr}Tikiwiki.org help{/tr}: {tr}admin Webmail{/tr}"> -<img border='0' src='img/icons/help.gif' alt='help' /></a>{/if} -<!-- There are definite disconnects between the tpl and php and what people call this--> -<!-- link to tpl --> +<!-- the help link info --> +{if $feature_help eq 'y'} + <a href="http://tikiwiki.org/tiki-index.php?page=Webmail" target="tikihelp" class="tikihelp" title="{tr}Tikiwiki.org help{/tr}: {tr}admin Webmail{/tr}"> + <img border='0' src='img/icons/help.gif' alt="{tr}help{/tr}" /></a> +{/if} - {if $feature_view_tpl eq 'y'} -<a href="tiki-edit_templates.php?template=templates/tiki-admin_mailin.tpl" target="tikihelp" class="tikihelp" title="{tr}View tpl{/tr}: {tr}admin mailin tpl{/tr}"> -<img border='0' src='img/icons/info.gif' alt='edit tpl' /></a>{/if} +<!-- link to tpl --> +{if $feature_view_tpl eq 'y'} + <a href="tiki-edit_templates.php?template=templates/tiki-admin_mailin.tpl" target="tikihelp" class="tikihelp" title="{tr}View template{/tr}: {tr}admin mailin template{/tr}"> + <img border='0' src='img/icons/info.gif' alt='{tr}edit{/tr}' /></a> +{/if} <!-- begin --> +<br /><br /> - +<table class="normal"> + <tr> + <td class="heading"> + {tr}Account{/tr} + [<a class="tablename" href="tiki-admin_mailin.php">{tr}add new{/tr}</a>] + </td> + <td class="heading">{tr}type{/tr}</td> + </tr> + {cycle values="even,odd" print=false} + {section name=ix loop=$accounts} + <tr> + <td class="{cycle advance=false}"> + <a href="tiki-admin_mailin.php" class="{if $accounts[ix].current eq 'y'}tablename{else}link{/if}">{$accounts[ix].account}</a> + [<a href="tiki-admin_mailin.php?remove={$accounts[ix].accountId}" class="link">x</a>|<a href="tiki-admin_mailin.php?accountId={$accounts[ix].accountId}" class="tablename">edit</a>] + </td> + <td class="{cycle}">{$accounts[ix].type}</td> + </tr> + {/section} +</table> <br /><br /> -<a class="linkbut" href="tiki-mailin.php">Mailin</a> -<!-- What is this link? What does it do? --> +<h3>{tr}Edit{/tr}/{tr}Add new mail account{/tr}</h3> +<form action="tiki-admin_mailin.php" method="post"> + <input type="hidden" name="accountId" value="{$accountId|escape}" /> + <table class="normal"> + <tr> + <td class="formcolor">{tr}Account name{/tr}</td> + <td class="formcolor" colspan="3"><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 class="formcolor" colspan="3"> + {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 class="formcolor" colspan="3"><input type="text" name="username" value="{$info.username|escape}" /></td> + </tr> + <tr> + <td class="formcolor">{tr}Password{/tr}</td> + <td class="formcolor" colspan="3"><input type="text" name="pass" value="{$info.pass|escape}" /></td> + </tr> + <tr> + <td class="formcolor">{tr}Type{/tr}</td> + <td class="formcolor" colspan="3"> + <select name="type"> + <option value="wiki-get" {if $info.type eq 'wiki-get'}selected="selected"{/if}>{tr}wiki-get{/tr}</option> + <option value="wiki-put" {if $info.type eq 'wiki-put'}selected="selected"{/if}>{tr}wiki-put{/tr}</option> + <option value="wiki-append" {if $info.type eq 'wiki-append'}selected="selected"{/if}>{tr}wiki-append{/tr}</option> + <option value="wiki" {if $info.type eq 'wiki'}selected="selected"{/if}>{tr}wiki{/tr}</option> + </select> + </td> + </tr> + <tr> + <td class="formcolor">{tr}Active{/tr}</td> + <td class="formcolor" colspan="3"> + {tr}Yes{/tr} + <input type="radio" name="active" {if $info.active eq 'y'}checked="checked"{/if} value="y" /> + {tr}No{/tr} + <input type="radio" name="active" {if $info.active eq 'n'}checked="checked"{/if} value="n" /> + </td> + </tr> + <tr> + <td class="formcolor">{tr}Allow anonymous acces{/tr}</td> + <td class="formcolor" colspan="3"> + {tr}Yes{/tr} + <input type="radio" name="anonymous" {if $info.anonymous eq 'y'}checked="checked"{/if} value="y" /> + {tr}No{/tr} + <input type="radio" name="anonymous" {if $info.anonymous eq 'n'}checked="checked"{/if} value="n" /> + </td> + </tr> + <tr> + <td class="formcolor"> </td> + <td class="formcolor" colspan="3"><input type="submit" name="new_acc" value="{tr}add{/tr}" /></td> + </tr> + </table> +</form> + +<br /><br /><br /> +<b><a class="readlink" href="tiki-mailin.php">{tr}Check Mail-in accounts{/tr}</a></b> <br /><br /> -<h3>{tr}Add new mail account{/tr}</h3> <form action="tiki-admin_mailin.php" method="post"> -<input type="hidden" name="accountId" value="{$accountId|escape}" /> -<table class="normal"> -<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}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="text" name="pass" value="{$info.pass|escape}" /></td></tr> -<tr><td class="formcolor">{tr}Type{/tr}</td><td colspan="3" class="formcolor"> -<select name="type"> -<option value="wiki-get" {if $info.type eq 'wiki-get'}selected="selected"{/if}>{tr}wiki-get{/tr}</option> -<option value="wiki-put" {if $info.type eq 'wiki-put'}selected="selected"{/if}>{tr}wiki-put{/tr}</option> -<option value="wiki-append" {if $info.type eq 'wiki-append'}selected="selected"{/if}>{tr}wiki-append{/tr}</option> -<option value="wiki" {if $info.type eq 'wiki'}selected="selected"{/if}>{tr}wiki{/tr}</option> -</select> -</td></tr> -<tr><td class="formcolor">{tr}Active{/tr}</td><td colspan="3" class="formcolor"> -{tr}Yes{/tr}<input type="radio" name="active" {if $info.active eq 'y'}checked="checked"{/if} value="y" /> <input type="radio" {if $info.active eq 'n'}checked="checked"{/if} name="active" value="n" />{tr}No{/tr} -</td></tr> -<tr><td class="formcolor"> </td><td colspan="3" class="formcolor"><input type="submit" name="new_acc" value="{tr}add{/tr}" /></td></tr> -</table> + <table class="normal"> + <tr> + <td class="formcolor">{tr}Check automatically{/tr}</td> + <td class="formcolor"> + {tr}Yes{/tr} + <input type="radio" name="mailin_autocheck" {if $mailin_autocheck eq 'y'}checked="checked"{/if} value="y" /> + {tr}No{/tr} + <input type="radio" name="mailin_autocheck" {if $mailin_autocheck eq 'n'}checked="checked"{/if} value="n" /> + </td> + </tr> + <tr> + <td class="formcolor">{tr}Frequency{/tr}</td> + <td class="formcolor"><input type="text" name="mailin_autocheckFreq" size="6" value="{$mailin_autocheckFreq}" /> mn</td> + </tr> + <tr> + <td class="formcolor"> </td> + <td class="formcolor"><input type="submit" name="set_auto" value="{tr}set{/tr}" /></td> + </tr> + </table> </form> -<h3>{tr}User accounts{/tr}</h3> -<table class="normal"> -<tr> -<td class="heading">{tr}account{/tr}</td> -<td class="heading">{tr}type{/tr}</td> -</tr> -{cycle values="odd,even" print=false} -{section name=ix loop=$accounts} -<tr><td class="{cycle advance=false}"><a href="tiki-admin_mailin.php" class="{if $accounts[ix].current eq 'y'}tablename{else}link{/if}">{$accounts[ix].account}</a> -[<a href="tiki-admin_mailin.php?remove={$accounts[ix].accountId}" class="link">x</a>|<a href="tiki-admin_mailin.php?accountId={$accounts[ix].accountId}" class="tablename">edit</a>] -</td> -<td class="{cycle}">{$accounts[ix].type}</td> -</tr> -{/section} -</table> <br /><br /> Index: tiki-admin-include-wiki.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin-include-wiki.tpl,v retrieving revision 1.30.2.4 retrieving revision 1.30.2.5 diff -u -d -r1.30.2.4 -r1.30.2.5 --- tiki-admin-include-wiki.tpl 9 Feb 2004 13:27:25 -0000 1.30.2.4 +++ tiki-admin-include-wiki.tpl 18 Mar 2004 17:11:08 -0000 1.30.2.5 @@ -231,6 +231,7 @@ {tr}Wiki Features{/tr}:<br /> <form action="tiki-admin.php?page=wiki" method="post"> <table class="admin"> + <tr><td class="form">{tr}Mail-in{/tr}:</td><td><input type="checkbox" name="feature_mailin" {if $feature_mailin eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Sandbox{/tr}:</td><td><input type="checkbox" name="feature_sandbox" {if $feature_sandbox eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Last changes{/tr}:</td><td><input type="checkbox" name="feature_lastChanges" {if $feature_lastChanges eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Dump{/tr}:</td><td><input type="checkbox" name="feature_dump" {if $feature_dump eq 'y'}checked="checked"{/if}/></td></tr> |