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

admin_edit-domain.tpl create-alias-domain.tpl, edit-vacation.tpl,

Browse Source 
list-virtual_alias_domain.tpl, password.tpl:
- replaced <h3> with <th>
- marked labels with <label>
- marked non-editable fields with <em>
- align buttons with input fields
- note: removal of tMessage intentionally postponed

password.tpl:
- move error message formatting to template (language changes will follow
  in a later commit)
  - difference to Dale's patch: use <td class="error_msg"> instead of 
    <td><span class="error_msg">

edit-vacation.tpl:
- added language="JavaScript to <script> tags
- removed reference to calendar.css (now @import'ed in default.css)
- added class="flat" to activefrom and activeuntil input fields

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1095 a1433add-5e2c-0410-b055-b7f2511e0802
pull/2/head
Christian Boltz 14 years ago
parent f0a153f0fc
commit b648510548
5 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -2,61 +2,62 @@
<form name="edit_domain" method="post" action=""> <form name="edit_domain" method="post" action="">
<table> <table>
<tr> <tr>
<td colspan="3"><h3>{$PALANG.pAdminEdit_domain_welcome}</h3></td> <th colspan="3">{$PALANG.pAdminEdit_domain_welcome}</th>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_domain}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_domain}:</label></td>
<td>{$domain}</td> <td><em>{$domain}</em></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_description}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_description}:</label></td>
<td><input class="flat" type="text" name="fDescription" value="{$tDescription}" /></td> <td><input class="flat" type="text" name="fDescription" value="{$tDescription}" /></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_aliases}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_aliases}:</label></td>
<td><input class="flat" type="text" name="fAliases" value="{$tAliases}" /></td> <td><input class="flat" type="text" name="fAliases" value="{$tAliases}" /></td>
<td>{$PALANG.pAdminEdit_domain_aliases_text}</td> <td>{$PALANG.pAdminEdit_domain_aliases_text}</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_mailboxes}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_mailboxes}:</label></td>
<td><input class="flat" type="text" name="fMailboxes" value="{$tMailboxes}" /></td> <td><input class="flat" type="text" name="fMailboxes" value="{$tMailboxes}" /></td>
<td>{$PALANG.pAdminEdit_domain_mailboxes_text}</td> <td>{$PALANG.pAdminEdit_domain_mailboxes_text}</td>
</tr> </tr>
{if $CONF.domain_quota===YES} {if $CONF.domain_quota===YES}
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_quota}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_quota}:</label></td>
<td><input class="flat" type="text" name="fDomainquota" value="{$tDomainquota}" /></td> <td><input class="flat" type="text" name="fDomainquota" value="{$tDomainquota}" /></td>
<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td> <td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
</tr> </tr>
{/if} {/if}
{if $CONF.quota===YES} {if $CONF.quota===YES}
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_maxquota}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_maxquota}:</label></td>
<td><input class="flat" type="text" name="fMaxquota" value="{$tMaxquota}" /></td> <td><input class="flat" type="text" name="fMaxquota" value="{$tMaxquota}" /></td>
<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td> <td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
</tr> </tr>
{/if} {/if}
{if $CONF.transport===YES} {if $CONF.transport===YES}
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_transport}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_transport}:</label></td>
<td><select class="flat" name="fTransport">{$select_options}</select></td> <td><select class="flat" name="fTransport">{$select_options}</select></td>
<td>{$PALANG.pAdminEdit_domain_transport_text}</td> <td>{$PALANG.pAdminEdit_domain_transport_text}</td>
</tr> </tr>
{/if} {/if}
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_backupmx}:</td> <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" name="fBackupmx"{$tBackupmx}/></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pAdminEdit_domain_active}:</td> <td class="label"><label>{$PALANG.pAdminEdit_domain_active}:</label></td>
<td><input class="flat" type="checkbox" name="fActive"{$tActive}/></td> <td><input class="flat" type="checkbox" name="fActive"{$tActive}/></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td colspan="3" class="hlp_center"><input type="submit" class="button" name="submit" value="{$PALANG.save}" /></td> <td>&nbsp;</td>
<td colspan="2"><input type="submit" class="button" name="submit" value="{$PALANG.save}" /></td>
</tr> </tr>
<tr> <tr>
<td colspan="3" class="standout">{$tMessage}</td> <td colspan="3" class="standout">{$tMessage}</td>

5
templates/create-alias-domain.tpl
Unescape Escape View File

@ -2,7 +2,7 @@
<form name="alias_domain" method="post" action=""> <form name="alias_domain" method="post" action="">
<table> <table>
<tr> <tr>
<td colspan="3"><h3>{$PALANG.pCreate_alias_domain_welcome}</h3></td> <th colspan="3">{$PALANG.pCreate_alias_domain_welcome}</th>
</tr> </tr>
{if $alias_domains} {if $alias_domains}
<tr> <tr>
@ -26,7 +26,8 @@
</tr> </tr>
{if $alias_domains} {if $alias_domains}
<tr> <tr>
<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_alias_domain_button}" /></td> <td>&nbsp;</td>
<td colspan="2"><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_alias_domain_button}" /></td>
</tr> </tr>
{/if} {/if}
</table> </table>

30
templates/edit-vacation.tpl
Unescape Escape View File

@ -1,28 +1,27 @@
{literal} {literal}
<script type="text/javascript"> <script language="JavaScript" type="text/javascript">
function newLocation() { function newLocation() {
window.location="{/literal}{$fCanceltarget}{literal}" window.location="{/literal}{$fCanceltarget}{literal}"
} }
</script> </script>
<script language="JavaScript" src="calendar.js"></script> <script language="JavaScript" src="calendar.js" type="text/javascript"></script>
<link rel="stylesheet" href="css/calendar.css">
{/literal} {/literal}
<div id="edit_form"> <div id="edit_form">
<form name="edit-vacation" method="post" action=''> <form name="edit-vacation" method="post" action=''>
<table> <table>
<tr> <tr>
<td colspan="3"><h3>{$PALANG.pUsersVacation_welcome}</h3></td> <th colspan="3">{$PALANG.pUsersVacation_welcome}</th>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pUsersLogin_username}:</td> <td class="label"><label>{$PALANG.pUsersLogin_username}:</label></td>
<td>{$tUseremail}</td> <td><em>{$tUseremail}</em></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pUsersVacation_activefrom}:</td> <td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
<td><input name="activefrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/> <td><input class="flat" name="activefrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/>
{literal} {literal}
<script language="JavaScript"> <script language="JavaScript" type="text/javascript">
new tcal ({ new tcal ({
'formname': 'edit-vacation', 'formname': 'edit-vacation',
'controlname': 'activefrom' 'controlname': 'activefrom'
@ -33,10 +32,10 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pUsersVacation_activeuntil}:</td> <td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
<td><input name="activeuntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/> <td><input class="flat" name="activeuntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/>
{literal} {literal}
<script language="JavaScript"> <script language="JavaScript" type="text/javascript">
new tcal ({ new tcal ({
'formname': 'edit-vacation', 'formname': 'edit-vacation',
'controlname': 'activeuntil' 'controlname': 'activeuntil'
@ -47,17 +46,18 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pUsersVacation_subject}:</td> <td class="label"><label>{$PALANG.pUsersVacation_subject}:</label></td>
<td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td> <td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pUsersVacation_body}:</td> <td class="label"><label>{$PALANG.pUsersVacation_body}:</label></td>
<td><textarea class="flat" rows="10" cols="60" name="fBody" >{$tBody}</textarea></td> <td><textarea class="flat" rows="10" cols="60" name="fBody" >{$tBody}</textarea></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td colspan="3" class="hlp_center"> <td>&nbsp;</td>
<td colspan="2">
<input class="button" type="submit" name="fChange" value="{$PALANG.pEdit_vacation_set}" /> <input class="button" type="submit" name="fChange" value="{$PALANG.pEdit_vacation_set}" />
<input class="button" type="submit" name="fBack" value="{$PALANG.pEdit_vacation_remove}" /> <input class="button" type="submit" name="fBack" value="{$PALANG.pEdit_vacation_remove}" />
<input class="button" type="button" name="fCancel" value="{$PALANG.exit}" onclick="newLocation()" /> <input class="button" type="button" name="fCancel" value="{$PALANG.exit}" onclick="newLocation()" />

2
templates/list-virtual_alias_domain.tpl
Unescape Escape View File

@ -1,7 +1,7 @@
{*** Domain Aliases ***} {*** Domain Aliases ***}
<table id="alias_domain_table"> <table id="alias_domain_table">
<tr> <tr>
<td colspan="5"><h3>{$PALANG.pOverview_alias_domain_title}</h3></td> <th colspan="5">{$PALANG.pOverview_alias_domain_title}</th>
</tr> </tr>
{if $tAliasDomains|@count>0 || $tTargetDomain|@count>1} {if $tAliasDomains|@count>0 || $tTargetDomain|@count>1}
{if $tAliasDomains|@count>0} {* -> HAT alias-domains *} {if $tAliasDomains|@count>0} {* -> HAT alias-domains *}

20
templates/password.tpl
Unescape Escape View File

@ -2,30 +2,32 @@
<form name="mailbox" method="post" action=""> <form name="mailbox" method="post" action="">
<table> <table>
<tr> <tr>
<td colspan="3"><h3>{$PALANG.pPassword_welcome}</h3></td> <th colspan="3">{$PALANG.pPassword_welcome}</th>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pPassword_admin}:</td> <td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
<td>{$SESSID_USERNAME}</td> <td><em>{$SESSID_USERNAME}</em></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pPassword_password_current}</td> <td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
<td><input class="flat" type="password" name="fPassword_current" /></td> <td><input class="flat" type="password" name="fPassword_current" /></td>
<td>{$pPassword_password_current_text}</td> <td class="error_msg">{$pPassword_password_current_text}</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pPassword_password}:</td> <td class="label"><label>{$PALANG.pPassword_password}:</label></td>
<td><input class="flat" type="password" name="fPassword" /></td> <td><input class="flat" type="password" name="fPassword" /></td>
<td>{$pPassword_password_text}</td> <td class="error_msg">{$pPassword_password_text}</td>
</tr> </tr>
<tr> <tr>
<td>{$PALANG.pPassword_password2}:</td> <td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
<td><input class="flat" type="password" name="fPassword2" /></td> <td><input class="flat" type="password" name="fPassword2" /></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td> <td class="label">&nbsp;</td>
<td><input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
<td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td colspan="3" class="standout">{$tMessage}</td> <td colspan="3" class="standout">{$tMessage}</td>

Write Preview
Loading…
Cancel
Save