Skip to content

Commit b36a233

Browse files
author
Marius Burkard
committed
- fixed mailuser interface layout
1 parent b2ba0d7 commit b36a233

File tree

12 files changed

+44
-27
lines changed

12 files changed

+44
-27
lines changed

‎interface/web/mailuser/lib/lang/de_mail_user_filter.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $wb['searchterm_is_empty'] = 'Suchbegriff ist leer.';
88
$wb['source_txt'] = 'Quelle';
99
$wb['target_error_regex'] = 'Das Ziel darf nur die folgenden Zeichen enthalten: a-z, 0-9, -, ., _, und {space}';
1010
$wb['limit_mailfilter_txt'] = 'Die max. Anzahl an E-Mailfiltern ist erreicht.';
11+
$wb['mailbox_filter_txt'] = 'E-Mailfilter';
1112
$wb['subject_txt'] = 'Betreff';
1213
$wb['from_txt'] = 'Von';
1314
$wb['to_txt'] = 'An';

‎interface/web/mailuser/lib/lang/en_mail_user_filter.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $wb["searchterm_is_empty"] = 'Search term is empty.';
88
$wb["source_txt"] = 'Source';
99
$wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
1010
$wb["limit_mailfilter_txt"] = 'The max. number of mailfilters is reached.';
11+
$wb['mailbox_filter_txt'] = 'Mailbox filter';
1112
$wb['subject_txt'] = 'Subject';
1213
$wb['from_txt'] = 'From';
1314
$wb['to_txt'] = 'To';

‎interface/web/mailuser/templates/index.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ <h1><tmpl_var name="page_head_txt"></h1>
99

1010
<div class="form-group">
1111
<label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
12-
<p class="value">{tmpl_var name='email'}</p>
12+
<div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
1313
</div>
1414
<div class="form-group">
1515
<label class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>
16-
<p class="value">{tmpl_var name='login'}</p>
16+
<div class="col-sm-9"><div class="checkbox">{tmpl_var name='login'}</div></div>
1717
</div>
1818
<div class="form-group">
1919
<label class="col-sm-3 control-label">{tmpl_var name='server_address_txt'}</label>
20-
<p class="value">{tmpl_var name='server_name'}</p>
20+
<div class="col-sm-9"><div class="checkbox">{tmpl_var name='server_name'}</div></div>
2121
</div>
2222
<div class="form-group">
2323
<label class="col-sm-3 control-label">{tmpl_var name='quota_txt'}</label>
24-
<p class="value">{tmpl_var name='quota'}</p>
24+
<div class="col-sm-9"><div class="checkbox">{tmpl_var name='quota'}</div></div>
2525
</div>
2626
<div class="form-group">
2727
<label class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
28-
<p class="value">{tmpl_var name='cc'}</p>
28+
<div class="col-sm-9"><div class="checkbox">{tmpl_var name='cc'}</div></div>
2929
</div>
3030
<div class="clear"><div class="right">
3131
&nbsp;

‎interface/web/mailuser/templates/mail_user_autoresponder_edit.htm‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
1414
</div>
1515
<div class="form-group">
1616
<label for="autoresponder" class="col-sm-3 control-label">{tmpl_var name='autoresponder_active'}</label>
17-
<div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div></div>
17+
<div class="col-sm-9"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div>
18+
</div>
1819
<div class="form-group">
1920
<label for="autoresponder_start_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_start_date_txt'}</label>
20-
{tmpl_var name='autoresponder_start_date'}&nbsp;
21-
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
21+
<div class="col-sm-9">{tmpl_var name='autoresponder_start_date'}</div>
2222
</div>
2323
<div class="form-group">
2424
<label for="autoresponder_end_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_end_date_txt'}</label>
25-
{tmpl_var name='autoresponder_end_date'}
25+
<div class="col-sm-9">{tmpl_var name='autoresponder_end_date'}</div>
2626
</div>
2727

2828
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2929
<div class="clear"><div class="right">
30-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mailuser/mail_user_autoresponder_edit.php">{tmpl_var name='btn_save_txt'}</button>
31-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php">{tmpl_var name='btn_cancel_txt'}</button>
30+
<button class="btn btn-default formbutton-success" type="button"
31+
value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
32+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
3233
</div></div>

‎interface/web/mailuser/templates/mail_user_cc_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
77

88
<div class="form-group">
99
<label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
10-
<p class="value">{tmpl_var name='email'}</p>
10+
<div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
1111
</div>
1212
<div class="form-group">
1313
<label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>

‎interface/web/mailuser/templates/mail_user_filter_edit.htm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
1010
<div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div></div>
1111
<div class="form-group">
1212
<label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
13-
<div class="col-sm-9"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
14-
<div class="col-sm-9"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
15-
<div class="col-sm-9"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div></div>
13+
<div class="col-sm-3"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
14+
<div class="col-sm-3"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
15+
<div class="col-sm-3"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div></div>
1616
<div class="form-group">
1717
<label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
18-
<div class="col-sm-9"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
19-
<div class="col-sm-9"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div></div>
18+
<div class="col-sm-3"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
19+
<div class="col-sm-3"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div></div>
2020
<div class="form-group">
2121
<label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
22-
<span class="">{tmpl_var name='active'}</span>
22+
<div class="col-sm-9"><div class="checkbox"><label>{tmpl_var name='active'}</label></div></div>
2323
</div>
2424

2525

‎interface/web/mailuser/templates/mail_user_filter_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4343

4444
<tfoot>
4545
<tr>
46-
<td colspan="3"><tmpl_var name="paging"></td>
46+
<td colspan="2"><tmpl_var name="paging"></td>
4747
</tr>
4848
</tfoot>
4949
</table>

‎interface/web/mailuser/templates/mail_user_password_edit.htm‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,20 @@ <h1><tmpl_var name="list_head_txt"></h1>
77

88
<div class="form-group">
99
<label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
10-
<p class="value">{tmpl_var name='email'}</p>
10+
<div class="col-sm-9">
11+
<div class="checkbox">{tmpl_var name='email'}</div>
12+
</div>
1113
</div>
1214
<div class="form-group">
1315
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
14-
<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>
16+
<div class="col-sm-9">
17+
<div class="input-group">
18+
<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');" />
19+
<span class="input-group-btn">
20+
<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
21+
</span>
22+
</div>
23+
</div>
1524
</div>
1625
<div class="form-group">
1726
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
@@ -23,7 +32,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
2332
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
2433
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
2534
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
26-
2735

2836
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2937

‎interface/web/mailuser/templates/mail_user_spamfilter_edit.htm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
77

88
<div class="form-group">
99
<label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
10-
<p class="value">{tmpl_var name='email'}</p>
10+
<div class="col-sm-9">
11+
<div class="checkbox">{tmpl_var name='email'}</div>
12+
</div>
1113
</div>
1214
<div class="form-group">
1315
<label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>

‎interface/web/sites/templates/web_vhost_domain_advanced.htm‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
2323
<div class="col-sm-9"><input type="text" name="added_by" id="added_by" value="{tmpl_var name='added_by'}" class="form-control" /></div></div>
2424
<div class="form-group">
2525
<label for="system_user" class="col-sm-3 control-label">{tmpl_var name='system_user_txt'}</label>
26-
<p class="value">&nbsp; &nbsp;{tmpl_var name='system_user'}</p>
26+
<div class="col-sm-9">
27+
<div class="checkbox">&nbsp; &nbsp;{tmpl_var name='system_user'}</div>
28+
</div>
2729
<input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
2830
</div>
2931
<div class="form-group">
3032
<label for="system_group" class="col-sm-3 control-label">{tmpl_var name='system_group_txt'}</label>
31-
<p class="value">&nbsp; &nbsp;{tmpl_var name='system_group'}</p>
33+
<div class="col-sm-9">
34+
<div class="checkbox">&nbsp; &nbsp;{tmpl_var name='system_group'}</div>
35+
</div>
3236
<input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
3337
</div>
3438
<div class="form-group apache">

0 commit comments

Comments
 (0)