From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/mail/templates/mail_alias_edit.htm | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 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..6a67887 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -1,30 +1,49 @@
-<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>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
+<p><tmpl_var name="list_desc_txt"></p>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9">
+ <div class='input-group'>
+ <input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
+ <span class='input-group-addon'>@</span>
+ <div class='input-group-field'>
+ <select name="email_domain" id="email_domain" class="form-control" style="height:50px;min-width:170px;">{tmpl_var name='email_domain'}</select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
+ <div class="col-sm-9"><select name="destination" id="destination" class="form-control">
+ {tmpl_var name='destination'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='active'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='allow_send_as'} <small>{tmpl_var name='send_as_exp'}</small>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='greylisting'}
+ </div>
+ </div>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+ <input type="hidden" name="type" value="alias">
+
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_alias_edit.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_alias_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
--
Gitblit v1.9.1