Skip to content

Commit a076c24

Browse files
author
Till Brehm
committed
Improved several forms in mail module.
1 parent 046563e commit a076c24

7 files changed

Lines changed: 57 additions & 42 deletions

File tree

‎interface/web/mail/templates/mail_alias_edit.htm‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ <h1><tmpl_var name="list_head_txt"></h1>
33
</div>
44
<p><tmpl_var name="list_desc_txt"></p>
55

6-
7-
8-
<div class="form-group">
6+
<div class="form-group">
97
<label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
108
<div class="col-sm-9">
11-
<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>
12-
<label for="email_at" class="col-sm-3 control-label">&nbsp;<span id="email_at" name="email_at" />@</label>
13-
<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>
14-
</div>
9+
<div class='input-group'>
10+
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
11+
<span class='input-group-addon'>@</span>
12+
<div class='input-group-field'>
13+
<select name="email_domain" id="email_domain" class="form-control" style="height:50px;">{tmpl_var name='email_domain'}</select>
14+
</div>
15+
</div>
16+
</div>
1517
</div>
1618
<div class="form-group">
1719
<label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>

‎interface/web/mail/templates/mail_domain_catchall_edit.htm‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<h1><tmpl_var name="list_head_txt"></h1>
33
</div>
44
<p><tmpl_var name="list_desc_txt"></p>
5-
6-
7-
8-
<div class="form-group">
9-
<label class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
5+
<div class="form-group">
6+
<label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
107
<div class="col-sm-9">
11-
<label for="email_at" class="col-sm-3 control-label">&nbsp;<span id="email_at" name="email_at" />@</label>
12-
<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>
13-
</div>
8+
<div class="input-group">
9+
<span class="input-group-addon" id="domain-desc">* @</span>
10+
<select name="email_domain" id="email_domain" class="form-control" aria-describedby="domain-desc">{tmpl_var name='email_domain'}</select>
11+
</div>
12+
</div>
1413
</div>
1514
<div class="form-group">
1615
<label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
@@ -22,7 +21,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
2221
</div>
2322
</div>
2423

25-
2624
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2725
<input type="hidden" name="type" value="catchall">
2826

‎interface/web/mail/templates/mail_forward_edit.htm‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ <h1><tmpl_var name="list_head_txt"></h1>
33
</div>
44
<p><tmpl_var name="list_desc_txt"></p>
55

6-
7-
86
<div class="form-group">
97
<label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
108
<div class="col-sm-9">
11-
<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>
12-
<label for="email_at" class="col-sm-3 control-label">&nbsp;<span id="email_at" name="email_at" />@</label>
13-
<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>
14-
</div>
9+
<div class='input-group'>
10+
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
11+
<span class='input-group-addon'>@</span>
12+
<div class='input-group-field'>
13+
<select name="email_domain" id="email_domain" class="form-control" style="height:50px;">{tmpl_var name='email_domain'}</select>
14+
</div>
15+
</div>
16+
</div>
1517
</div>
1618
<div class="form-group">
1719
<label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>

‎interface/web/mail/templates/mail_mailinglist_edit.htm‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@ <h1><tmpl_var name="list_head_txt"></h1>
5656
</tmpl_if>
5757
<div class="form-group">
5858
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
59-
<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">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
59+
<div class="col-sm-9">
60+
<div class="input-group">
61+
<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');" />
62+
<span class="input-group-btn">
63+
<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
64+
</span>
65+
</div>
66+
</div>
6067
</div>
6168
<div class="form-group">
6269
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>

‎interface/web/mail/templates/mail_transport_edit.htm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
2222
</div>
2323
<div class="form-group">
2424
<label class="col-sm-3 control-label">{tmpl_var name='mx_txt'}</label>
25-
<div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} /></div>
25+
<div class="col-sm-9">
26+
<input type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} />
27+
</div>
2628
</div>
2729
<div class="form-group">
2830
<label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>

‎interface/web/mail/templates/spamfilter_other_edit.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
5050
<div class="form-group">
5151
<label for="spam_admin" class="col-sm-3 control-label">{tmpl_var name='spam_admin_txt'}</label>
5252
<div class="col-sm-9"><input type="text" name="spam_admin" id="spam_admin" value="{tmpl_var name='spam_admin'}" class="form-control" /></div></div>
53-
<div class="form-group">
53+
<div class="form-group">
5454
<label for="message_size_limit" class="col-sm-3 control-label">{tmpl_var name='message_size_limit_txt'}</label>
55-
<div class="col-sm-6"><input type="text" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;Bytes
56-
</div></div>
55+
<div class="col-sm-9"><div class="input-group"><input type="text" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" aria-describedby="message_size_limit-desc" /><span class="input-group-addon" id="message_size_limit-desc">Bytes</span></div></div>
56+
</div>
5757
<div class="form-group">
5858
<label for="banned_rulenames" class="col-sm-3 control-label">{tmpl_var name='banned_rulenames_txt'}</label>
5959
<div class="col-sm-9"><input type="text" name="banned_rulenames" id="banned_rulenames" value="{tmpl_var name='banned_rulenames'}" class="form-control" /></div></div>

‎interface/web/mail/templates/xmpp_user_edit.htm‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,28 @@
22
<h1><tmpl_var name="list_head_txt"></h1>
33
</div>
44
<p><tmpl_var name="list_desc_txt"></p>
5-
6-
7-
8-
9-
<div class="form-group">
5+
<div class="form-group">
106
<label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='jid_txt'}</label>
11-
<div class="col-sm-4">
12-
<input type="text" id="jid_local_part" name="jid_local_part" value="{tmpl_var name='jid_local_part'}" class="form-control" />
13-
</div>
14-
<div class="col-sm-1 text-center">@</div>
15-
<div class="col-sm-4">
16-
<select name="jid_domain" id="jid_domain" class="form-control">{tmpl_var name='jid_domain'}</select>
17-
</div>
7+
<div class="col-sm-9">
8+
<div class='input-group'>
9+
<input type="text" id="jid_local_part" name="jid_local_part" value="{tmpl_var name='jid_local_part'}" class="form-control" />
10+
<span class='input-group-addon'>@</span>
11+
<div class='input-group-field'>
12+
<select name="jid_domain" id="jid_domain" class="form-control" style="height:50px;">{tmpl_var name='jid_domain'}</select>
13+
</div>
14+
</div>
15+
</div>
1816
</div>
19-
20-
<div class="form-group">
17+
<div class="form-group">
2118
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
22-
<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">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
19+
<div class="col-sm-9">
20+
<div class="input-group">
21+
<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');" />
22+
<span class="input-group-btn">
23+
<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
24+
</span>
25+
</div>
26+
</div>
2327
</div>
2428
<div class="form-group">
2529
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>

0 commit comments

Comments
 (0)