Merge branch 'redesign' of git.froxlor.org:froxlor into redesign
Conflicts: templates/Froxlor/customer/email/emails_add.tpl templates/Froxlor/customer/email/emails_edit.tpl templates/Froxlor/customer/email/forwarder_add.tpl
This commit is contained in:
@@ -1,57 +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" />
|
||||
<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="" /> {$lng['domains']['subdomain_add']}</b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domains']['domainname']}:</td>
|
||||
<td class="main_field_display" nowrap="nowrap"><input type="text" name="subdomain" value="" size="15" maxlength="50" /> <b>.</b> <select class="tendina_nobordo" name="domain">$domains</select></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
|
||||
<td class="main_field_display" nowrap="nowrap"><select name="alias">$aliasdomains</select></td>
|
||||
</tr>
|
||||
<if $settings['panel']['pathedit'] != 'Dropdown'>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
|
||||
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $settings['panel']['pathedit'] == 'Dropdown'>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['panel']['path']}:</td>
|
||||
<td class="main_field_display">{$pathSelect}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
|
||||
<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
|
||||
<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $settings['system']['use_ssl'] == '1'>
|
||||
<tr>
|
||||
<td class="main_field_name">SSL Redirect:</td>
|
||||
<td class="main_field_display" nowrap="nowrap">$ssl_redirect</td>
|
||||
</tr>
|
||||
</if>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domain']['openbasedirpath']}:</td>
|
||||
<td class="main_field_display" nowrap><select name="openbasedir_path">$openbasedir</select></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['domains']['subdomain_add']}" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<br />
|
||||
<br />
|
||||
$footer
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/{$image}" alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<table class="formtable">
|
||||
{$subdomain_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
|
||||
|
||||
@@ -1,76 +1,31 @@
|
||||
$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="" /> {$lng['domains']['subdomain_edit']}</b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domains']['domainname']}:</td>
|
||||
<td class="main_field_display" nowrap="nowrap">{$result['domain']}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['dns']['destinationip']}:</td>
|
||||
<td class="main_field_display" nowrap="nowrap">{$domainip}</td>
|
||||
</tr>
|
||||
<if $alias_check == '0'>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
|
||||
<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $settings['panel']['pathedit'] != 'Dropdown'>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
|
||||
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $settings['panel']['pathedit'] == 'Dropdown'>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['panel']['path']}:</td>
|
||||
<td class="main_field_display">{$pathSelect}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
|
||||
<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
|
||||
<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0' >
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domains']['wildcarddomain']}</td>
|
||||
<td class="main_field_display" nowrap="nowrap">$iswildcarddomain</td>
|
||||
</tr>
|
||||
</if>
|
||||
<if ( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0' >
|
||||
<tr>
|
||||
<td class="main_field_name">Emaildomain:</td>
|
||||
<td class="main_field_display" nowrap="nowrap">$isemaildomain</td>
|
||||
</tr>
|
||||
</if>
|
||||
<if $settings['system']['use_ssl'] == '1'>
|
||||
<tr>
|
||||
<td class="main_field_name">SSL Redirect:</td>
|
||||
<td class="main_field_display" nowrap="nowrap">$ssl_redirect</td>
|
||||
</tr>
|
||||
</if>
|
||||
<tr>
|
||||
<td class="main_field_name">{$lng['domain']['openbasedirpath']}:</td>
|
||||
<td class="main_field_display" nowrap="nowrap"><select name="openbasedir_path">$openbasedir</select></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['panel']['save']}" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<br />
|
||||
<br />
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/{$image}" alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<table class="formtable">
|
||||
{$subdomain_edit_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="id" value="$id" />
|
||||
<input type="hidden" name="send" value="send" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</form>
|
||||
</section>
|
||||
</article>
|
||||
$footer
|
||||
|
||||
@@ -1,30 +1,33 @@
|
||||
$header
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['account_add']}" />
|
||||
{$lng['emails']['account_add']}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/{$image}" alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$lng['emails']['emails_add']}</legend>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<table class="formtable">
|
||||
{$account_add_form}
|
||||
{$account_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="id" value="$id" />
|
||||
<input type="hidden" name="send" value="send" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</form>
|
||||
</section>
|
||||
</article>
|
||||
|
||||
</section>
|
||||
|
||||
</article>
|
||||
$footer
|
||||
|
||||
@@ -1,30 +1,33 @@
|
||||
$header
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/icons/email_add.png" alt="{$lng['menue']['main']['changepassword']}" />
|
||||
{$lng['menue']['main']['changepassword']}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/{$image}" alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$lng['menue']['main']['changepassword']}</legend>
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<table class="formtable">
|
||||
{$account_changepw}
|
||||
</table>
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<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
|
||||
<table class="formtable">
|
||||
{$account_changepw_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="id" value="$id" />
|
||||
<input type="hidden" name="send" value="send" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
</section>
|
||||
|
||||
</article>
|
||||
$footer
|
||||
|
||||
@@ -1,30 +1,33 @@
|
||||
$header
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['quota_edit']}" />
|
||||
{$lng['emails']['quota_edit']}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/{$image}" alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$lng['emails']['quota_edit']}</legend>
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<table class="formtable">
|
||||
{$quota_edit}
|
||||
</table>
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<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
|
||||
<table class="formtable">
|
||||
{$quota_edit_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="id" value="$id" />
|
||||
<input type="hidden" name="send" value="send" />
|
||||
</p>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
</section>
|
||||
|
||||
</article>
|
||||
$footer
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
$header
|
||||
<article>
|
||||
<if $domains == ''>
|
||||
<div class="messagewrapperfull">
|
||||
<div class="warningcontainer bradius">
|
||||
<div class="warningtitle">{$lng['admin']['warning']}</div>
|
||||
<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
|
||||
</div>
|
||||
</div>
|
||||
</if>
|
||||
<else>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/icons/{}$image alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<table class="formtable">
|
||||
{$email_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
|
||||
@@ -1,30 +0,0 @@
|
||||
$header
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/icons/{$title}" alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<table class="formtable">
|
||||
{$email_edit_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
|
||||
@@ -1,30 +0,0 @@
|
||||
$header
|
||||
<article>
|
||||
<header>
|
||||
<h2>
|
||||
<img src="images/Froxlor/icons/{$image}" alt="{$title}" />
|
||||
{$title}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<section class="fullform bradiusodd">
|
||||
|
||||
<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
|
||||
<fieldset>
|
||||
<legend>Froxlor - {$title}</legend>
|
||||
|
||||
<table class="formtable">
|
||||
{$forwarder_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
|
||||
Reference in New Issue
Block a user