Skip to content

Commit 799d11f

Browse files
author
redray
committed
template display fixes for sites
1 parent e9b7b16 commit 799d11f

14 files changed

+194
-192
lines changed

‎interface/web/sites/lib/lang/de_ftp_user.lng‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
<?php
2-
$wb['uid_txt'] = 'UID';
3-
$wb['gid_txt'] = 'GID';
4-
$wb['dir_txt'] = 'Verzeichnis';
5-
$wb['quota_files_txt'] = 'Dateiquota';
6-
$wb['ul_ratio_txt'] = 'Uploadrate';
7-
$wb['dl_ratio_txt'] = 'Downloadrate';
8-
$wb['ul_bandwidth_txt'] = 'Uploadbandbreite';
1+
<?php
2+
$wb['uid_txt'] = 'UID';
3+
$wb['gid_txt'] = 'GID';
4+
$wb['dir_txt'] = 'Verzeichnis';
5+
$wb['quota_files_txt'] = 'Dateiquota';
6+
$wb["quota_files_unity_txt"] = 'Dateien';
7+
$wb['ul_ratio_txt'] = 'Uploadrate';
8+
$wb['dl_ratio_txt'] = 'Downloadrate';
9+
$wb['ul_bandwidth_txt'] = 'Uploadbandbreite';
910
$wb['dl_bandwidth_txt'] = 'Downloadbandbreite';
10-
$wb['server_id_txt'] = 'Server';
11-
$wb['parent_domain_id_txt'] = 'Website';
12-
$wb['username_txt'] = 'Benutzername';
13-
$wb['password_txt'] = 'Passwort';
14-
$wb['quota_size_txt'] = 'Harddiskquota';
15-
$wb['active_txt'] = 'Aktiv';
16-
$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für ihr Konto wurde erreicht.';
11+
$wb['server_id_txt'] = 'Server';
12+
$wb['parent_domain_id_txt'] = 'Website';
13+
$wb['username_txt'] = 'Benutzername';
14+
$wb['password_txt'] = 'Passwort';
15+
$wb['quota_size_txt'] = 'Harddiskquota';
16+
$wb['active_txt'] = 'Aktiv';
17+
$wb['limit_ftp_user_txt'] = 'Die maximale Anzahl an FTP Benutzer für ihr Konto wurde erreicht.';
1718
$wb['username_error_empty'] = 'Benutzername ist leer.';
18-
$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
19-
$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
19+
$wb['username_error_unique'] = 'Der Benutzername muss eindeutig sein.';
20+
$wb['username_error_regex'] = 'Der Benutzername enthält nicht erlaubte Zeichen.';
2021
$wb['quota_size_error_empty'] = 'Quota ist leer.';
2122
$wb['uid_error_empty'] = 'GID ist leer.';
2223
$wb['directory_error_empty'] = 'Verzeichniss ist leer.';
2324
$wb['password_strength_txt'] = 'Passwortkomplexität';
24-
?>
25-
26-
25+
?>
26+
27+

‎interface/web/sites/lib/lang/en_ftp_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb["uid_txt"] = 'UID';
33
$wb["gid_txt"] = 'GID';
44
$wb["dir_txt"] = 'Directory';
55
$wb["quota_files_txt"] = 'Filequota';
6+
$wb["quota_files_unity_txt"] = 'Files';
67
$wb["ul_ratio_txt"] = 'Uploadratio';
78
$wb["dl_ratio_txt"] = 'Downloadratio';
89
$wb["ul_bandwidth_txt"] = 'Uploadbandwidth';

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
44
<div class="panel panel_database">
55

66
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Database</legend>
7+
<fieldset class="inlineLabels">
88
<tmpl_if name="is_admin">
99
<div class="ctrlHolder">
1010
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
@@ -15,37 +15,37 @@ <h2><tmpl_var name="list_head_txt"></h2>
1515
<div class="ctrlHolder">
1616
<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
1717
<select name="client_group_id" id="client_group_id" class="selectInput">
18-
{tmpl_var name='server_id'}
18+
{tmpl_var name='client_group_id'}
1919
</select>
2020
</div>
2121
</tmpl_if>
2222
<tmpl_if name="is_reseller">
2323
<div class="ctrlHolder">
2424
<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
2525
<select name="client_group_id" id="client_group_id" class="selectInput">
26-
{tmpl_var name='server_id'}
26+
{tmpl_var name='client_group_id'}
2727
</select>
2828
</div>
2929
</tmpl_if>
3030
<div class="ctrlHolder">
3131
<label for="type">{tmpl_var name='type_txt'}</label>
32-
<select name="type" id="type" class="selectInput">
32+
<select name="type" id="type" class="selectInput formLengthHalf">
3333
{tmpl_var name='type'}
3434
</select>
3535
</div>
3636
<div class="ctrlHolder">
3737
<label for="database_name">{tmpl_var name='database_name_txt'}</label>
3838
<div style="float: left;">{tmpl_var name='database_name_prefix'} </div>
39-
<input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput" />
39+
<input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
4040
</div>
4141
<div class="ctrlHolder">
4242
<label for="database_user">{tmpl_var name='database_user_txt'}</label>
4343
<div style="float: left;">{tmpl_var name='database_user_prefix'} </div>
44-
<input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput" />
44+
<input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
4545
</div>
4646
<div class="ctrlHolder">
4747
<label for="database_password">{tmpl_var name='database_password_txt'}</label>
48-
<input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="text" class="textInput" />
48+
<input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" />
4949
</div>
5050
<div class="ctrlHolder">
5151
<p class="label">{tmpl_var name='password_strength_txt'}</p>
@@ -54,7 +54,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
5454
</div>
5555
<div class="ctrlHolder">
5656
<label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
57-
<select name="database_charset" id="database_charset" class="selectInput">
57+
<select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
5858
{tmpl_var name='database_charset'}
5959
</select>
6060
</div>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,38 @@ <h2><tmpl_var name="list_head_txt"></h2>
44
<div class="panel panel_ftp_user">
55

66
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Options</legend>
7+
<fieldset class="inlineLabels">
88
<div class="ctrlHolder">
99
<label for="uid">{tmpl_var name='uid_txt'}</label>
10-
<input name="uid" id="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255" type="text" class="textInput" />
10+
<input name="uid" id="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
1111
</div>
1212
<div class="ctrlHolder">
1313
<label for="gid">{tmpl_var name='gid_txt'}</label>
14-
<input name="gid" id="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255" type="text" class="textInput" />
14+
<input name="gid" id="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
1515
</div>
1616
<div class="ctrlHolder">
1717
<label for="dir">{tmpl_var name='dir_txt'}</label>
1818
<input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
1919
</div>
2020
<div class="ctrlHolder">
2121
<label for="quota_files">{tmpl_var name='quota_files_txt'}</label>
22-
<input name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7" type="text" class="textInput" />
22+
<input name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;{tmpl_var name='quota_files_unity_txt'}</p>
2323
</div>
2424
<div class="ctrlHolder">
2525
<label for="ul_ratio">{tmpl_var name='ul_ratio_txt'}</label>
26-
<input name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7" type="text" class="textInput" />
26+
<input name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
2727
</div>
2828
<div class="ctrlHolder">
2929
<label for="dl_ratio">{tmpl_var name='dl_ratio_txt'}</label>
30-
<input name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7" type="text" class="textInput" />
30+
<input name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
3131
</div>
3232
<div class="ctrlHolder">
3333
<label for="ul_bandwidth">{tmpl_var name='ul_bandwidth_txt'}</label>
34-
<input name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7" type="text" class="textInput" />
34+
<input name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;kb/s</p>
3535
</div>
3636
<div class="ctrlHolder">
3737
<label for="dl_bandwidth">{tmpl_var name='dl_bandwidth_txt'}</label>
38-
<input name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7" type="text" class="textInput" />
38+
<input name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;kb/s</p>
3939
</div>
4040
</fieldset>
4141

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
44
<div class="panel panel_ftp_user">
55

66
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>FTP User</legend>
7+
<fieldset class="inlineLabels">
88
<div class="ctrlHolder">
99
<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
1010
<select name="parent_domain_id" id="parent_domain_id" class="selectInput">
@@ -18,7 +18,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
1818
</div>
1919
<div class="ctrlHolder">
2020
<label for="password">{tmpl_var name='password_txt'}</label>
21-
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" />
21+
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value)" />
2222
</div>
2323
<div class="ctrlHolder">
2424
<p class="label">{tmpl_var name='password_strength_txt'}</p>
@@ -27,7 +27,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
2727
</div>
2828
<div class="ctrlHolder">
2929
<label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
30-
<input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput" />
30+
<input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
3131
</div>
3232
<div class="ctrlHolder">
3333
<p class="label">{tmpl_var name='active_txt'}</p>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
44
<div class="panel panel_shell_user">
55

66
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Options</legend>
7+
<fieldset class="inlineLabels">
88
<div class="ctrlHolder">
99
<label for="puser">{tmpl_var name='puser_txt'}</label>
10-
<input name="puser" id="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255" type="text" class="textInput" />
10+
<input name="puser" id="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
1111
</div>
1212
<div class="ctrlHolder">
1313
<label for="pgroup">{tmpl_var name='pgroup_txt'}</label>
14-
<input name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255" type="text" class="textInput" />
14+
<input name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
1515
</div>
1616
<div class="ctrlHolder">
1717
<label for="shell">{tmpl_var name='shell_txt'}</label>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
44
<div class="panel panel_shell_user">
55

66
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Shell User</legend>
7+
<fieldset class="inlineLabels">
88
<div class="ctrlHolder">
99
<label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
1010
<select name="parent_domain_id" id="parent_domain_id" class="selectInput" {tmpl_var name='parent_domain_id_disabled'}>
@@ -27,13 +27,13 @@ <h2><tmpl_var name="list_head_txt"></h2>
2727
</div>
2828
<div class="ctrlHolder">
2929
<label for="chroot">{tmpl_var name='chroot_txt'}</label>
30-
<select name="chroot" id="chroot" class="selectInput">
30+
<select name="chroot" id="chroot" class="selectInput formLengthHalf">
3131
{tmpl_var name='chroot'}
3232
</select>
3333
</div>
3434
<div class="ctrlHolder">
3535
<label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
36-
<input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput" />
36+
<input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="formInputUnity">&nbsp;MB</p>
3737
</div>
3838
<div class="ctrlHolder">
3939
<p class="label">{tmpl_var name='active_txt'}</p>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
44
<div class="panel panel_web_domain">
55

66
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Domain</legend>
7+
<fieldset class="inlineLabels">
88
<div class="ctrlHolder">
99
<label for="domain">{tmpl_var name='domain_txt'}</label>
1010
<input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
@@ -17,7 +17,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
1717
</div>
1818
<div class="ctrlHolder">
1919
<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
20-
<select name="redirect_type" id="redirect_type" class="selectInput">
20+
<select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
2121
{tmpl_var name='redirect_type'}
2222
</select>
2323
</div>
@@ -27,7 +27,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
2727
</div>
2828
<div class="ctrlHolder">
2929
<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
30-
<select name="subdomain" id="subdomain" class="selectInput">
30+
<select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
3131
{tmpl_var name='subdomain'}
3232
</select>
3333
</div>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ <h2><tmpl_var name="list_head_txt"></h2>
44
<div class="panel panel_web_domain">
55

66
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels"><legend>Options</legend>
7+
<fieldset class="inlineLabels">
88
<div class="ctrlHolder">
99
<label for="document_root">{tmpl_var name='document_root_txt'}</label>
1010
<input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="text" class="textInput" />
1111
</div>
1212
<div class="ctrlHolder">
1313
<label for="system_user">{tmpl_var name='system_user_txt'}</label>
14-
<input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" size="30" maxlength="255" type="text" class="textInput" />
14+
<input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
1515
</div>
1616
<div class="ctrlHolder">
1717
<label for="system_group">{tmpl_var name='system_group_txt'}</label>
18-
<input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" size="30" maxlength="255" type="text" class="textInput" />
18+
<input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
1919
</div>
2020
<div class="ctrlHolder">
2121
<label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
22-
<input name="apache_directives" id="apache_directives" value="{tmpl_var name='apache_directives'}" size="30" maxlength="255" type="text" class="textInput" />
22+
<textarea name="apache_directives" id="apache_directives" rows='10' cols='30'>{tmpl_var name='apache_directives'}</textarea>
2323
</div>
2424
</fieldset>
2525

0 commit comments

Comments
 (0)