banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge admin_edit-domain.tpl and admin_create-domain.tpl

Browse Source 
admin_edit-domain.tpl:
- merged with admin_create-domain.tpl
- added various {if $mode = ...}
- added 4th column for error messages

admin_create-domain.tpl:
- deleted

edit-domain.php:
- added mode = edit smarty variable
- added pAdminCreate_domain_domain_text_error smarty variable to avoid
  "undefined variable" warning

create-domain.php
- added mode = create smarty variable
- switch to admin_edit-domain template


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1152 a1433add-5e2c-0410-b055-b7f2511e0802
pull/2/head
Christian Boltz 15 years ago
parent 0fe45bca8a
commit 6c35590eb7
4 changed files with 40 additions and 80 deletions
Show Stats Download Patch File Download Diff File

3
create-domain.php
Unescape Escape View File

@ -156,6 +156,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
}
$smarty->assign ('mode', 'create');
$smarty->assign ('tDomain', $tDomain);
$smarty->assign ('pAdminCreate_domain_domain_text', $pAdminCreate_domain_domain_text, false);
$smarty->assign ('pAdminCreate_domain_domain_text_error', $pAdminCreate_domain_domain_text_error, false);
@ -167,7 +168,7 @@ $smarty->assign ('tMaxquota', $tMaxquota,false); # TODO: why is sanitize disable
$smarty->assign ('select_options', select_options ($CONF ['transport_options'], array ($tTransport)),false);
$smarty->assign ('tDefaultaliases', ($tDefaultaliases == 'on') ? ' checked="checked"' : '');
$smarty->assign ('tBackupmx', ($tBackupmx == 'on') ? ' checked="checked"' : '');
$smarty->assign ('smarty_template', 'admin_create-domain');
$smarty->assign ('smarty_template', 'admin_edit-domain');
$smarty->display ('index.tpl');
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */

2
edit-domain.php
Unescape Escape View File

@ -119,6 +119,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
}
}
$smarty->assign ('mode', 'edit');
$smarty->assign ('pAdminCreate_domain_domain_text_error', '');
$smarty->assign ('domain', $domain);
$smarty->assign ('tDescription', $tDescription);
$smarty->assign ('tAliases', $tAliases);

73
templates/admin_create-domain.tpl
Unescape Escape View File

@ -1,73 +0,0 @@
<div id="edit_form">
<form name="create_domain" method="post" action="">
<table>
<tr>
<th colspan="4">{$PALANG.pAdminCreate_domain_welcome}</th>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_domain}:</label></td>
<td><input class="flat" type="text" name="fDomain" value="{$tDomain}" /></td>
<td>&nbsp;</td>
<td><span class="error_msg">{$pAdminCreate_domain_domain_text_error}</span></td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_description}:</label></td>
<td><input class="flat" type="text" name="fDescription" value="{$tDescription}" /></td>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_aliases}:</label></td>
<td><input class="flat" type="text" name="fAliases" value="{$tAliases}" /></td>
<td>{$PALANG.pAdminEdit_domain_aliases_text}</td>
<td>&nbsp;</td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_mailboxes}:</label></td>
<td><input class="flat" type="text" name="fMailboxes" value="{$tMailboxes}" /></td>
<td>{$PALANG.pAdminEdit_domain_mailboxes_text}</td>
<td>&nbsp;</td>
</tr>
{if $CONF.domain_quota===YES}
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_quota}:</label></td>
<td><input class="flat" type="text" name="fDomainquota" value="{$tDomainquota}" /></td>
<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
<td>&nbsp;</td>
</tr>
{/if}
{if $CONF.quota===YES}
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_maxquota}:</label></td>
<td><input class="flat" type="text" name="fMaxquota" value="{$tMaxquota}" /></td>
<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
<td>&nbsp;</td>
</tr>
{/if}
{if $CONF.transport===YES}
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_transport}:</label></td>
<td><select class="flat" name="fTransport">{$select_options}</select></td>
<td>{$PALANG.pAdminEdit_domain_transport_text}</td>
<td>&nbsp;</td>
</tr>
{/if}
<tr>
<td class="label"><label>{$PALANG.pAdminCreate_domain_defaultaliases}:</label></td>
<td><input class="flat" type="checkbox" value='on' name="fDefaultaliases"{$tDefaultaliases}/></td>
<td>{$PALANG.pAdminCreate_domain_defaultaliases_text}</td>
<td>&nbsp;</td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_backupmx}:</label></td>
<td><input class="flat" type="checkbox" value='on' name="fBackupmx"{$tBackupmx}/></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_domain_button}" /></td>
<td colspan="2">&nbsp;</td>
</tr>
</table>
</form>
</div>

42
templates/admin_edit-domain.tpl
Unescape Escape View File

@ -2,33 +2,49 @@
<form name="edit_domain" method="post" action="">
<table>
<tr>
<th colspan="3">{$PALANG.pAdminEdit_domain_welcome}</th>
<th colspan="4">
{if $mode == 'edit'}
{$PALANG.pAdminEdit_domain_welcome}
{else}
{$PALANG.pAdminCreate_domain_welcome}
{/if}
</th>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_domain}:</label></td>
<td><em>{$domain}</em></td>
<td>
{if $mode == 'edit'}
<em>{$domain}</em>
{else}
<input class="flat" type="text" name="fDomain" value="{$tDomain}" />
{/if}
</td>
<td>&nbsp;</td>
<td><span class="error_msg">{$pAdminCreate_domain_domain_text_error}</span></td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_description}:</label></td>
<td><input class="flat" type="text" name="fDescription" value="{$tDescription}" /></td>
<td>&nbsp;</td>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_aliases}:</label></td>
<td><input class="flat" type="text" name="fAliases" value="{$tAliases}" /></td>
<td>{$PALANG.pAdminEdit_domain_aliases_text}</td>
<td>&nbsp;</td>
</tr>
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_mailboxes}:</label></td>
<td><input class="flat" type="text" name="fMailboxes" value="{$tMailboxes}" /></td>
<td>{$PALANG.pAdminEdit_domain_mailboxes_text}</td>
<td>&nbsp;</td>
</tr>
{if $CONF.domain_quota===YES}
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_quota}:</label></td>
<td><input class="flat" type="text" name="fDomainquota" value="{$tDomainquota}" /></td>
<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
<td>&nbsp;</td>
</tr>
{/if}
{if $CONF.quota===YES}
@ -36,6 +52,7 @@
<td class="label"><label>{$PALANG.pAdminEdit_domain_maxquota}:</label></td>
<td><input class="flat" type="text" name="fMaxquota" value="{$tMaxquota}" /></td>
<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
<td>&nbsp;</td>
</tr>
{/if}
{if $CONF.transport===YES}
@ -43,21 +60,34 @@
<td class="label"><label>{$PALANG.pAdminEdit_domain_transport}:</label></td>
<td><select class="flat" name="fTransport">{$select_options}</select></td>
<td>{$PALANG.pAdminEdit_domain_transport_text}</td>
<td>&nbsp;</td>
</tr>
{/if}
{if $mode == 'create'}
<tr>
<td class="label"><label>{$PALANG.pAdminCreate_domain_defaultaliases}:</label></td>
<td><input class="flat" type="checkbox" value='on' name="fDefaultaliases"{$tDefaultaliases}/></td>
<td>{$PALANG.pAdminCreate_domain_defaultaliases_text}</td>
<td>&nbsp;</td>
</tr>
{/if}
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_backupmx}:</label></td>
<td><input class="flat" type="checkbox" name="fBackupmx"{$tBackupmx}/></td>
<td><input class="flat" type="checkbox" value='on' name="fBackupmx"{$tBackupmx}/></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
{if $mode == 'edit'}
<!-- TODO: create should also offer the 'active' option -->
<tr>
<td class="label"><label>{$PALANG.pAdminEdit_domain_active}:</label></td>
<td><input class="flat" type="checkbox" name="fActive"{$tActive}/></td>
<td>&nbsp;</td>
<td colspan="2">&nbsp;</td>
</tr>
{/if}
<tr>
<td>&nbsp;</td>
<td colspan="2"><input type="submit" class="button" name="submit" value="{$PALANG.save}" /></td>
<td colspan="3"><input class="button" type="submit" name="submit" value="{if $mode == 'edit'}{$PALANG.save}{else}{$PALANG.pAdminCreate_domain_button}{/if}" /></td>
</tr>
</table>
</form>

Write Preview
Loading…
Cancel
Save