Skip to content

Commit 718ea6b

Browse files
author
Marius Cramer
committed
Layout fix: wrong dom elements
1 parent 3647964 commit 718ea6b

File tree

10 files changed

+40
-86
lines changed

10 files changed

+40
-86
lines changed

‎interface/web/admin/templates/language_import.htm‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ <h1><tmpl_var name="list_head_txt"></h1>
1111
</div>
1212
<div class="form-group">
1313
<label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
14-
<div class="col-sm-9">
15-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/></div></div>
14+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/></div>
1615
</div>
1716
<div class="form-group">
1817
<label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
19-
<div class="col-sm-9">
20-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/></div></div>
18+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/></div>
2119
</div>
2220

2321

‎interface/web/admin/templates/server_config_mail_edit.htm‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,21 @@ <h1><tmpl_var name="list_head_txt"></h1>
2222
<div class="col-sm-9"><input type="text" name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" class="form-control" /></div></div>
2323
<div class="form-group">
2424
<label class="col-sm-3 control-label">{tmpl_var name='dkim_strength_txt'}</label>
25-
<div class="col-sm-9">
26-
<div class="col-sm-9"><select name="dkim_strength" id="dkim_strength" class="form-control">
25+
<div class="col-sm-9"><select name="dkim_strength" id="dkim_strength" class="form-control">
2726
{tmpl_var name='dkim_strength'}
2827
</select></div>
29-
</div>
3028
</div>
3129
<div class="form-group">
3230
<label class="col-sm-3 control-label">{tmpl_var name='pop3_imap_daemon_txt'}</label>
33-
<div class="col-sm-9">
34-
<div class="col-sm-9"><select name="pop3_imap_daemon" id="pop3_imap_daemon" class="form-control">
31+
<div class="col-sm-9"><select name="pop3_imap_daemon" id="pop3_imap_daemon" class="form-control">
3532
{tmpl_var name='pop3_imap_daemon'}
3633
</select></div>
37-
</div>
3834
</div>
3935
<div class="form-group">
4036
<label class="col-sm-3 control-label">{tmpl_var name='mail_filter_syntax_txt'}</label>
41-
<div class="col-sm-9">
42-
<div class="col-sm-9"><select name="mail_filter_syntax" id="mail_filter_syntax" class="form-control">
37+
<div class="col-sm-9"><select name="mail_filter_syntax" id="mail_filter_syntax" class="form-control">
4338
{tmpl_var name='mail_filter_syntax'}
4439
</select></div>
45-
</div>
4640
</div>
4741
<div class="form-group">
4842
<label for="mailuser_uid" class="col-sm-3 control-label">{tmpl_var name='mailuser_uid_txt'}</label>

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +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='server_type_txt'}</label>
10-
<div class="col-sm-9">
11-
<div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
10+
<div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
1211
{tmpl_var name='server_type'}
1312
</select></div>
14-
</div>
1513
</div>
1614
<div class="form-group">
1715
<label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
@@ -58,11 +56,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
5856
<div class="col-sm-9"><input type="text" name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" class="form-control" /></div></div>
5957
<div class="form-group">
6058
<label class="col-sm-3 control-label">{tmpl_var name='security_level_txt'}</label>
61-
<div class="col-sm-9">
62-
<div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
59+
<div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
6360
{tmpl_var name='security_level'}
6461
</select></div>
65-
</div>
6662
</div>
6763
<div class="form-group apache">
6864
<label class="col-sm-3 control-label">{tmpl_var name='check_apache_config_txt'}</label>
@@ -225,11 +221,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
225221
</div></div>
226222
<div class="form-group">
227223
<label for="php_handler" class="col-sm-3 control-label">{tmpl_var name='php_handler_txt'}</label>
228-
<div class="col-sm-9">
229-
<div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
224+
<div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
230225
{tmpl_var name='php_handler'}
231226
</select></div>
232-
</div>
233227
</div>
234228
</div>
235229
<div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>

‎interface/web/admin/templates/system_config_domains_edit.htm‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
1616
</div>
1717
<div class="form-group">
1818
<label class="col-sm-3 control-label">{tmpl_var name='new_domain_txt'}</label>
19-
<div class="col-sm-9">
20-
<div class="col-sm-9"><textarea class="form-control" name="new_domain_html" id="new_domain_html" height: 250px">{tmpl_var name='new_domain_html'}</textarea></div>
21-
</div>
19+
<div class="col-sm-9"><textarea class="form-control" name="new_domain_html" id="new_domain_html" height: 250px">{tmpl_var name='new_domain_html'}</textarea></div>
2220
</div>
2321

2422

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ <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">
26-
<div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} /></div></div>
25+
<div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} /></div>
2726
</div>
2827
<div class="form-group">
2928
<label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>

‎interface/web/tools/templates/dns_import_tupa.htm‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,19 @@ <h2><tmpl_var name="list_head_txt">Import DNS records from Tupa PowerDNS control
55
<legend>PowerDNS Tupa import</legend>
66
<div class="form-group">
77
<label class="col-sm-3 control-label">Tupa database hostname</label>
8-
<div class="col-sm-9">
9-
<div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div></div>
8+
<div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div>
109
</div>
1110
<div class="form-group">
1211
<label class="col-sm-3 control-label">Tupa database name</label>
13-
<div class="col-sm-9">
14-
<div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div></div>
12+
<div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div>
1513
</div>
1614
<div class="form-group">
1715
<label class="col-sm-3 control-label">Tupa database user</label>
18-
<div class="col-sm-9">
19-
<div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div></div>
16+
<div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div>
2017
</div>
2118
<div class="form-group">
2219
<label class="col-sm-3 control-label">Tupa database password</label>
23-
<div class="col-sm-9">
24-
<div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div></div>
20+
<div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div>
2521
</div>
2622

2723

‎interface/web/tools/templates/import_ispconfig.htm‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ <h1><tmpl_var name="head_txt"></h1>
1515
</div>
1616
<div class="form-group">
1717
<label class="col-sm-3 control-label">Remote User</label>
18-
<div class="col-sm-9">
19-
<div class="col-sm-9"><input class="form-control" type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" /></div></div>
18+
<div class="col-sm-9"><input class="form-control" type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" /></div>
2019
</div>
2120
<div class="form-group">
2221
<label class="col-sm-3 control-label">Remote password</label>
23-
<div class="col-sm-9">
24-
<div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div></div>
22+
<div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div>
2523
</div>
2624

2725
</div>
@@ -42,33 +40,27 @@ <h1><tmpl_var name="head_txt"></h1>
4240
</div>
4341
<div class="form-group">
4442
<label class="col-sm-3 control-label">{tmpl_var name="import_mailbox_txt"}</label>
45-
<div class="col-sm-9">
46-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" /></div></div>
43+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" /></div>
4744
</div>
4845
<div class="form-group">
4946
<label class="col-sm-3 control-label">{tmpl_var name="import_user_filter_txt"}</label>
50-
<div class="col-sm-9">
51-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" /></div></div>
47+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" /></div>
5248
</div>
5349
<div class="form-group">
5450
<label class="col-sm-3 control-label">{tmpl_var name="import_spamfilter_txt"}</label>
55-
<div class="col-sm-9">
56-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" /></div></div>
51+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" /></div>
5752
</div>
5853
<div class="form-group">
5954
<label class="col-sm-3 control-label">{tmpl_var name="import_alias_txt"}</label>
60-
<div class="col-sm-9">
61-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" /></div></div>
55+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" /></div>
6256
</div>
6357
<div class="form-group">
6458
<label class="col-sm-3 control-label">{tmpl_var name="import_forward_txt"}</label>
65-
<div class="col-sm-9">
66-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" /></div></div>
59+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" /></div>
6760
</div>
6861
<div class="form-group">
6962
<label class="col-sm-3 control-label">{tmpl_var name="import_aliasdomain_txt"}</label>
70-
<div class="col-sm-9">
71-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div></div>
63+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div>
7264
</div>
7365

7466
</div>

‎interface/web/tools/templates/import_plesk.htm‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,36 @@ <h2><tmpl_var name="list_head_txt">Import plesk panel data</h2>
55
<legend>Plesk data import</legend>
66
<div class="form-group">
77
<label class="col-sm-3 control-label">Plesk database hostname</label>
8-
<div class="col-sm-9">
9-
<div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div></div>
8+
<div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div>
109
</div>
1110
<div class="form-group">
1211
<label class="col-sm-3 control-label">Plesk database name</label>
13-
<div class="col-sm-9">
14-
<div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div></div>
12+
<div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div>
1513
</div>
1614
<div class="form-group">
1715
<label class="col-sm-3 control-label">Plesk database user</label>
18-
<div class="col-sm-9">
19-
<div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div></div>
16+
<div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div>
2017
</div>
2118
<div class="form-group">
2219
<label class="col-sm-3 control-label">Plesk database password</label>
23-
<div class="col-sm-9">
24-
<div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div></div>
20+
<div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div>
2521
</div>
2622
<div class="form-group">
2723
<label class="col-sm-3 control-label">Web content backup file (on this server, optional)</label>
28-
<div class="col-sm-9">
29-
<div class="col-sm-9"><input class="form-control" type="text" id="webcontent" value="{tmpl_var name='webcontent'}" name="webcontent" /></div></div>
24+
<div class="col-sm-9"><input class="form-control" type="text" id="webcontent" value="{tmpl_var name='webcontent'}" name="webcontent" /></div>
3025
</div>
3126
<div class="form-group">
3227
<label class="col-sm-3 control-label">Maildir content backup file (on this server, optional)</label>
33-
<div class="col-sm-9">
34-
<div class="col-sm-9"><input class="form-control" type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" /></div></div>
28+
<div class="col-sm-9"><input class="form-control" type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" /></div>
3529
</div>
3630

3731
<div class="form-group">
3832
<label class="col-sm-3 control-label">Import all data (that can be imported)</label>
39-
<div class="col-sm-9">
40-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="start" value="1" name="start" checked/></div></div>
33+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="start" value="1" name="start" checked/></div>
4134
</div>
4235
<div class="form-group">
4336
<label class="col-sm-3 control-label">Import database contents (make sure the database user has the rights to do so)</label>
44-
<div class="col-sm-9">
45-
<div class="col-sm-9"><input class="form-control" type="checkbox" id="dbdata" value="1" name="dbdata" checked/></div></div>
37+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="dbdata" value="1" name="dbdata" checked/></div>
4638
</div>
4739

4840

0 commit comments

Comments
 (0)