From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/mail/templates/mail_domain_catchall_edit.htm | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
index 38a9246..63c4405 100644
--- a/interface/web/mail/templates/mail_domain_catchall_edit.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -2,15 +2,14 @@
<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">{tmpl_var name='source_txt'}</label>
+ <div class="form-group">
+ <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
<div class="col-sm-9">
- <label for="email_at" class="col-sm-3 control-label"> <span id="email_at" name="email_at" />@</label>
- <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
- </div>
+ <div class="input-group">
+ <span class="input-group-addon" id="domain-desc">* @</span>
+ <select name="email_domain" id="email_domain" class="form-control" aria-describedby="domain-desc">{tmpl_var name='email_domain'}</select>
+ </div>
+ </div>
</div>
<div class="form-group">
<label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
@@ -22,7 +21,6 @@
</div>
</div>
-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="catchall">
--
Gitblit v1.9.1