From 29add223d26b0a00d41896c2b7427d4cdb35f910 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 14 Nov 2015 07:59:24 -0500
Subject: [PATCH] Improved mailbox form.
---
interface/web/mail/templates/mail_user_mailbox_edit.htm | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index c8f1883..8609ee9 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -9,13 +9,17 @@
<label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
<div class="col-sm-6"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div><div class="col-sm-3 input-sm"> {tmpl_var name='name_optional_txt'}
</div></div>
- <div class="form-group">
+ <div class="form-group">
<label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
<div class="col-sm-9">
- <label for="email_local_part" class="col-sm-3 control-label">Alias<div class="col-sm-9"><input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" /></div></label>
- <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'>
+ <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;">{tmpl_var name='email_domain'}</select>
+ </div>
+ </div>
+ </div>
</div>
<tmpl_if name="enable_custom_login"><div class="form-group">
<label for="login" class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>
@@ -23,7 +27,14 @@
</div></tmpl_if>
<div class="form-group">
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
- <div class="col-sm-6"><input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /></div><div class="col-sm-3 input-sm"> </div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+ <div class="col-sm-9">
+ <div class="input-group">
+ <input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
+ </span>
+ </div>
+ </div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
@@ -37,7 +48,7 @@
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
<div class="form-group">
<label for="quota" class="col-sm-3 control-label">{tmpl_var name='quota_txt'}</label>
- <div class="col-sm-9"><input type="text" name="quota" id="quota" value="{tmpl_var name='quota'}" class="form-control" /></div><label class="col-sm-3 control-label">MB</label>
+ <div class="col-sm-9"><div class="input-group"><input type="text" name="quota" id="quota" value="{tmpl_var name='quota'}" class="form-control" aria-describedby="quota-desc" /><span class="input-group-addon" id="quota-desc">MB</span></div></div>
</div>
<div class="form-group">
<label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
@@ -83,7 +94,6 @@
{tmpl_var name='disablepop3'}
</div>
</div>
-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
--
Gitblit v1.9.1