From 72695f0356210b5ca68d33d09e91c00ed9d6c2b6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 12 Feb 2013 04:55:44 -0500
Subject: [PATCH] Merged Revisions 3771-3801 from stable branch.
---
interface/web/mail/templates/mail_alias_edit.htm | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index 8ce690a..c2a6e95 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -1,30 +1,39 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_mail_alias">
-
- <div class="pnl_formsarea">
- <fieldset id="wf_area_mail_alias"><legend>Email Alias</legend>
- <span class="wf_oneField">
- <label for="email_local_part" class="wf_preField">{tmpl_var name='email_txt'}</label>
- <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" size="10" maxlength="50"> @ <select id="email_domain" name="email_domain">{tmpl_var name="email_domain"}</select>
- </span>
- <span class="wf_oneField">
- <label for="destination" class="wf_preField">{tmpl_var name='destination_txt'}</label>
- <select id="destination" name="destination">{tmpl_var name='destination'}</select>
- </span>
- <span class="wf_oneField">
- <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
- <span class="">{tmpl_var name='active'}</span>
- </span>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
- <input type="hidden" name="type" value="alias">
-
- <div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_alias_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_alias">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <div class="ctrlHolder">
+ <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
+ <div class="multiField">
+ <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+ <label for="email_at" class="blockLabel email_at"> <span id="email_at" name="email_at" />@</label>
+ <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="destination">{tmpl_var name='destination_txt'}</label>
+ <select name="destination" id="destination" class="selectInput">
+ {tmpl_var name='destination'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='active_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='active'}
+ </div>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+ <input type="hidden" name="type" value="alias">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_alias_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
--
Gitblit v1.9.1