Merge branch 'redesign' of git.froxlor.org:froxlor into redesign

This commit is contained in:
Michael Kaufmann (d00p)
2011-02-12 16:48:27 +01:00
8 changed files with 130 additions and 170 deletions

View File

@@ -14,29 +14,7 @@ $header
<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
<table class="formtable">
<tr>
<td>{$lng['emails']['emailaddress']}:</td>
<td>{$result['email_full']}</td>
</tr>
<tr>
<td>{$lng['login']['password']}:</td>
<td><input type="password" name="email_password" /></td>
</tr>
<if $settings['system']['mail_quota_enabled'] == 1>
<tr>
<td>{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):</td>
<td><input type="text" name="email_quota" value="{$quota}" /></td>
</tr>
</if>
<if $settings['panel']['sendalternativemail'] == 1>
<tr>
<td>{$lng['emails']['alternative_emailaddress']}:</td>
<td><input type="text" class="text" name="alternative_email" maxlength="255" /></td>
</tr>
</if>
<tr>
<td colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['emails']['account_add']}" /></td>
</tr>
{$account_add_form}
</table>
<p style="display: none;">

View File

@@ -1,26 +1,30 @@
$header
<form method="post" action="$filename">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="id" value="$id" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changepassword']}</b></td>
</tr>
<tr>
<td class="main_field_name">{$lng['emails']['emailaddress']}:</td>
<td class="main_field_display" nowrap="nowrap">{$result['email_full']}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['login']['password']}:</td>
<td class="main_field_display" nowrap="nowrap"><input type="password" name="email_password" maxlength="50" /></td>
</tr>
<tr>
<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['menue']['main']['changepassword']}" /></td>
</tr>
</table>
</form>
<br />
<br />
<article>
<header>
<h2>
<img src="images/Froxlor/icons/email_add.png" alt="{$lng['menue']['main']['changepassword']}" />&nbsp;
{$lng['menue']['main']['changepassword']}
</h2>
</header>
<section class="fullform bradiusodd">
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
<fieldset>
<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changepassword']}</legend>
<table class="formtable">
{$account_changepw}
</table>
<p style="display: none;">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="send" value="send" />
</p>
</fieldset>
</form>
</section>
</article>
$footer

View File

@@ -1,26 +1,30 @@
$header
<form method="post" action="$filename">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="id" value="$id" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['emails']['quota_edit']}</b></td>
</tr>
<tr>
<td class="main_field_name">{$lng['emails']['emailaddress']}:</td>
<td class="main_field_display" nowrap="nowrap">{$result['email_full']}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['emails']['quota']} ({$lng['panel']['megabyte']}):</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" name="email_quota" value="{$result['quota']}" maxlength="50" /></td>
</tr>
<tr>
<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['emails']['quota_edit']}" /></td>
</tr>
</table>
</form>
<br />
<br />
<article>
<header>
<h2>
<img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['quota_edit']}" />&nbsp;
{$lng['emails']['quota_edit']}
</h2>
</header>
<section class="fullform bradiusodd">
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
<fieldset>
<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['quota_edit']}</legend>
<table class="formtable">
{$quota_edit}
</table>
<p style="display: none;">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="send" value="send" />
</p>
</fieldset>
</form>
</section>
</article>
$footer

View File

@@ -1,42 +1,30 @@
$header
<form method="post" action="$filename">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="action" value="$action" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['autoresponder']['autoresponder_new']}</b></td>
</tr>
<tr>
<td class="main_field_name">{$lng['autoresponder']['account']}:</td>
<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="account">$accounts</select></td>
</tr>
<tr>
<td class="main_field_name">{$lng['autoresponder']['active']}:</td>
<td class="main_field_display" nowrap="nowrap"><input type="checkbox" name="active" value="1" checked="checked" /></td>
</tr>
<tr>
<td class="main_field_name">{$lng['autoresponder']['date_from']} (dd-mm-yyyy):</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" name="date_from" maxlength="10" />&nbsp;{$date_from_off}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['autoresponder']['date_until']} (dd-mm-yyyy):</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" name="date_until" maxlength="10" />&nbsp;{$date_until_off}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['autoresponder']['subject']}:</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" name="subject" maxlength="70" /></td>
</tr>
<tr>
<td class="main_field_name" colspan="2">{$lng['autoresponder']['message']}:</td>
</tr>
<tr>
<td class="main_field_display" colspan="2"><textarea class="textarea_border" rows="12" cols="60" name="message"></textarea></td>
</tr>
<tr>
<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['autoresponder']['autoresponder_new']}" /></td>
</tr>
</table>
</form>
<br />
<br />
<article>
<header>
<h2>
<img src="images/Froxlor/icons/add_autoresponder.png" alt="{$lng['autoresponder']['autoresponder_new']}" />&nbsp;
{$lng['autoresponder']['autoresponder_new']}
</h2>
</header>
<section class="fullform bradiusodd">
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
<fieldset>
<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['forwarder_add']}</legend>
<table class="formtable">
{$autoresponder_add_form}
</table>
<p style="display: none;">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="send" value="send" />
</p>
</fieldset>
</form>
</section>
</article>
$footer

View File

@@ -23,17 +23,7 @@ $header
<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
<table class="formtable">
<tr>
<td>{$lng['emails']['emailaddress']}:</td>
<td><input type="text" name="email_part" value="" size="15" /> @ <select name="domain">$domains</select></td>
</tr>
<tr>
<td>{$lng['emails']['iscatchall']}</td>
<td>$iscatchall</td>
</tr>
<tr>
<td colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['emails']['emails_add']}" /></td>
</tr>
{$email_add_form}
</table>
<p style="display: none;">

View File

@@ -14,43 +14,7 @@ $header
<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_edit']}</legend>
<table class="formtable">
<tr>
<td>{$lng['emails']['emailaddress']}:</td>
<td>{$result['email_full']}</td>
</tr>
<tr>
<td>{$lng['emails']['account']}:</td>
<td>
<if $result['popaccountid'] != 0>
{$lng['panel']['yes']} [<a href="$filename?page=accounts&amp;action=changepw&amp;id={$result['id']}&amp;s=$s">{$lng['menue']['main']['changepassword']}</a>] [<a href="$filename?page=accounts&amp;action=delete&amp;id={$result['id']}&amp;s=$s">{$lng['emails']['account_delete']}</a>]
</if>
<if $result['popaccountid'] == 0>
{$lng['panel']['no']} [<a href="$filename?page=accounts&amp;action=add&amp;id={$result['id']}&amp;s=$s">{$lng['emails']['account_add']}</a>]
</if>
</td>
</tr>
<if $result['popaccountid'] != 0 && $settings['system']['mail_quota_enabled']>
<tr>
<td>{$lng['customer']['email_quota']}:</td>
<td>{$result['quota']} {$lng['panel']['megabyte']} [<a href="$filename?page=accounts&amp;action=changequota&amp;id={$result['id']}&amp;s=$s">{$lng['emails']['quota_edit']}</a>]</td>
</tr>
</if>
<tr>
<td>{$lng['emails']['catchall']}:</td>
<td>
<if $result['iscatchall'] != 0>
{$lng['panel']['yes']}
</if>
<if $result['iscatchall'] == 0>
{$lng['panel']['no']}
</if>
[<a href="$filename?page=$page&amp;action=togglecatchall&amp;id={$result['id']}&amp;s=$s">{$lng['panel']['toggle']}</a>]
</td>
</tr>
<tr>
<td>{$lng['emails']['forwarders']} ({$forwarders_count}):</td>
<td class="field_name">$forwarders<a href="$filename?page=forwarders&amp;action=add&amp;id={$result['id']}&amp;s=$s">{$lng['emails']['forwarder_add']}</a></td>
</tr>
{$email_edit_form}
</table>
<p style="display: none;">

View File

@@ -14,17 +14,7 @@ $header
<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['forwarder_add']}</legend>
<table class="formtable">
<tr>
<td>{$lng['emails']['from']}:</td>
<td>{$result['email_full']}</td>
</tr>
<tr>
<td>{$lng['emails']['to']}:</td>
<td><input type="text" class="text" id="destination" name="destination" size="30" /></td>
</tr>
<tr>
<td colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['emails']['forwarder_add']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['abort']}" onclick="history.back();" /></td>
</tr>
{$forwarder_add_form}
</table>
<p style="display: none;">