Skip to content

Commit 5200ad0

Browse files
author
mcramer
committed
Updated default-v2 design and added missing templates, missing code parts and deleted old files and code parts
1 parent b6c04b1 commit 5200ad0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1390
-60
lines changed

‎interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
3131
{tmpl_var name='website_symlinks_rel'}
3232
</div>
3333
</div>
34+
<div class="ctrlHolder">
35+
<label for="website_autoalias">{tmpl_var name='website_autoalias_txt'}</label>
36+
<input name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='website_autoalias_note_txt'}
37+
</div>
3438
<div class="ctrlHolder apache">
3539
<label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
3640
<input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />

‎interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,34 @@ <h2><tmpl_var name="list_head_txt"></h2>
3939
<label for="admin_name">{tmpl_var name='admin_name_txt'}</label>
4040
<input name="admin_name" id="admin_name" value="{tmpl_var name='admin_name'}" size="30" maxlength="255" type="text" class="textInput" />
4141
</div>
42+
<div class="ctrlHolder">
43+
<p class="label">{tmpl_var name='smtp_enabled_txt'}</p>
44+
<div class="multiField">
45+
{tmpl_var name='smtp_enabled'}
46+
</div>
47+
</div>
48+
<div class="ctrlHolder">
49+
<label for="smtp_host">{tmpl_var name='smtp_host_txt'}</label>
50+
<input name="smtp_host" id="smtp_host" value="{tmpl_var name='smtp_host'}" size="30" maxlength="255" type="text" class="textInput" />
51+
</div>
52+
<div class="ctrlHolder">
53+
<label for="smtp_port">{tmpl_var name='smtp_port_txt'}</label>
54+
<input name="smtp_port" id="smtp_port" value="{tmpl_var name='smtp_port'}" size="30" maxlength="255" type="text" class="textInput" />
55+
</div>
56+
<div class="ctrlHolder">
57+
<label for="smtp_user">{tmpl_var name='smtp_user_txt'}</label>
58+
<input name="smtp_user" id="smtp_user" value="{tmpl_var name='smtp_user'}" size="30" maxlength="255" type="text" class="textInput" />
59+
</div>
60+
<div class="ctrlHolder">
61+
<label for="smtp_pass">{tmpl_var name='smtp_pass_txt'}</label>
62+
<input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" class="textInput" />
63+
</div>
64+
<div class="ctrlHolder">
65+
<p class="label">{tmpl_var name='smtp_crypt_txt'}</p>
66+
<div class="multiField">
67+
{tmpl_var name='smtp_crypt'}
68+
</div>
69+
</div>
4270
</fieldset>
4371

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

‎interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
3939
<label for="webftp_url">{tmpl_var name='webftp_url_txt'}</label>
4040
<input name="webftp_url" id="webftp_url" value="{tmpl_var name='webftp_url'}" size="30" maxlength="255" type="text" class="textInput" />
4141
</div>
42+
<div class="ctrlHolder">
43+
<p class="label">{tmpl_var name='vhost_subdomains_txt'}</p>
44+
<div class="multiField">
45+
{tmpl_var name='vhost_subdomains'}&nbsp;{tmpl_var name='vhost_subdomains_note_txt'}
46+
</div>
47+
</div>
4248
</fieldset>
4349

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

‎interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ <h2><tmpl_var name="tpl_default-v2_head_txt"></h2>
1212
</fieldset>
1313

1414
<input type="hidden" name="id" value="{tmpl_var name='id'}">
15+
<input type="hidden" name="username" value="global">
1516

1617
<div class="buttonHolder buttons">
1718
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/tpl_default-v2.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>

‎interface/web/themes/default-v2/templates/admin/tpl_default_basic.htm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ <h2><tmpl_var name="tpl_default_head_txt"></h2>
1212
</fieldset>
1313

1414
<input type="hidden" name="id" value="{tmpl_var name='id'}">
15+
<input type="hidden" name="username" value="global">
1516

1617
<div class="buttonHolder buttons">
1718
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/tpl_default.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>

‎interface/web/themes/default-v2/templates/admin/users_user_edit.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
1111
</div>
1212
<div class="ctrlHolder">
1313
<label for="passwort">{tmpl_var name='passwort_txt'}</label>
14-
<input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
14+
<input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
1515
</div>
1616
<div class="ctrlHolder">
1717
<p class="label">{tmpl_var name='password_strength_txt'}</p>

‎interface/web/themes/default-v2/templates/client/client_edit_limits.htm‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,60 @@ <h2><tmpl_var name="list_head_txt"></h2>
6161
{tmpl_var name='web_php_options'}
6262
</div>
6363
</div>
64+
<div class="ctrlHolder">
65+
<p class="label">{tmpl_var name='limit_cgi_txt'}</p>
66+
<div class="multiField">
67+
{tmpl_var name='limit_cgi'}
68+
</div>
69+
</div>
70+
<div class="ctrlHolder">
71+
<p class="label">{tmpl_var name='limit_ssi_txt'}</p>
72+
<div class="multiField">
73+
{tmpl_var name='limit_ssi'}
74+
</div>
75+
</div>
76+
<div class="ctrlHolder">
77+
<p class="label">{tmpl_var name='limit_perl_txt'}</p>
78+
<div class="multiField">
79+
{tmpl_var name='limit_perl'}
80+
</div>
81+
</div>
82+
<div class="ctrlHolder">
83+
<p class="label">{tmpl_var name='limit_ruby_txt'}</p>
84+
<div class="multiField">
85+
{tmpl_var name='limit_ruby'}
86+
</div>
87+
</div>
88+
<div class="ctrlHolder">
89+
<p class="label">{tmpl_var name='limit_python_txt'}</p>
90+
<div class="multiField">
91+
{tmpl_var name='limit_python'}
92+
</div>
93+
</div>
94+
<div class="ctrlHolder">
95+
<p class="label">{tmpl_var name='force_suexec_txt'}</p>
96+
<div class="multiField">
97+
{tmpl_var name='force_suexec'}
98+
</div>
99+
</div>
100+
<div class="ctrlHolder">
101+
<p class="label">{tmpl_var name='limit_hterror_txt'}</p>
102+
<div class="multiField">
103+
{tmpl_var name='limit_hterror'}
104+
</div>
105+
</div>
106+
<div class="ctrlHolder">
107+
<p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
108+
<div class="multiField">
109+
{tmpl_var name='limit_wildcard'}
110+
</div>
111+
</div>
112+
<div class="ctrlHolder">
113+
<p class="label">{tmpl_var name='limit_ssl_txt'}</p>
114+
<div class="multiField">
115+
{tmpl_var name='limit_ssl'}
116+
</div>
117+
</div>
64118
<div class="ctrlHolder">
65119
<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
66120
<input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />

‎interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,60 @@ <h2><tmpl_var name="list_head_txt"></h2>
2525
{tmpl_var name='web_php_options'}
2626
</div>
2727
</div>
28+
<div class="ctrlHolder">
29+
<p class="label">{tmpl_var name='limit_cgi_txt'}</p>
30+
<div class="multiField">
31+
{tmpl_var name='limit_cgi'}
32+
</div>
33+
</div>
34+
<div class="ctrlHolder">
35+
<p class="label">{tmpl_var name='limit_ssi_txt'}</p>
36+
<div class="multiField">
37+
{tmpl_var name='limit_ssi'}
38+
</div>
39+
</div>
40+
<div class="ctrlHolder">
41+
<p class="label">{tmpl_var name='limit_perl_txt'}</p>
42+
<div class="multiField">
43+
{tmpl_var name='limit_perl'}
44+
</div>
45+
</div>
46+
<div class="ctrlHolder">
47+
<p class="label">{tmpl_var name='limit_ruby_txt'}</p>
48+
<div class="multiField">
49+
{tmpl_var name='limit_ruby'}
50+
</div>
51+
</div>
52+
<div class="ctrlHolder">
53+
<p class="label">{tmpl_var name='limit_python_txt'}</p>
54+
<div class="multiField">
55+
{tmpl_var name='limit_python'}
56+
</div>
57+
</div>
58+
<div class="ctrlHolder">
59+
<p class="label">{tmpl_var name='force_suexec_txt'}</p>
60+
<div class="multiField">
61+
{tmpl_var name='force_suexec'}
62+
</div>
63+
</div>
64+
<div class="ctrlHolder">
65+
<p class="label">{tmpl_var name='limit_hterror_txt'}</p>
66+
<div class="multiField">
67+
{tmpl_var name='limit_hterror'}
68+
</div>
69+
</div>
70+
<div class="ctrlHolder">
71+
<p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
72+
<div class="multiField">
73+
{tmpl_var name='limit_wildcard'}
74+
</div>
75+
</div>
76+
<div class="ctrlHolder">
77+
<p class="label">{tmpl_var name='limit_ssl_txt'}</p>
78+
<div class="multiField">
79+
{tmpl_var name='limit_ssl'}
80+
</div>
81+
</div>
2882
<div class="ctrlHolder">
2983
<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
3084
<input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />

interface/web/themes/default-v2/templates/domain/domain_edit.htm renamed to interface/web/themes/default-v2/templates/client/domain_edit.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<input type="hidden" name="type" value="local">
3333

3434
<div class="buttonHolder buttons">
35-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','domain/domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
36-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('domain/domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
35+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
36+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
3737
</div>
3838
</div>
3939

interface/web/themes/default-v2/templates/domain/domain_list.htm renamed to interface/web/themes/default-v2/templates/client/domain_list.htm

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ <h2><tmpl_var name="list_head_txt"></h2>
77
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
88
<div class="buttons">
99
<tmpl_if name="is_admin">
10-
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_edit.php');">
10+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('client/domain_edit.php');">
1111
<span>{tmpl_var name="add_new_record_txt"}</span>
1212
</button>
1313
<tmpl_else>
14-
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_new_client.php');">
14+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('client/domain_new_client.php');">
1515
<span>{tmpl_var name="add_new_record_txt"}</span>
1616
</button>
1717
</tmpl_if>
@@ -23,27 +23,27 @@ <h2><tmpl_var name="list_head_txt"></h2>
2323
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
2424
<table class="list">
2525
<thead>
26-
<tr class="caption">
26+
<tr>
2727
<th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
28-
<th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt"></th>
28+
<th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt">A</th>
2929
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
3030
</tr>
31-
<tr class="filter">
31+
<tr>
3232
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
33-
<td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
34-
<td class="tbl_col_buttons">
35-
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','domain/domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
36-
</td>
33+
<td class="tbl_col_user"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
34+
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','client/domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
3735
</tr>
3836
</thead>
3937
<tbody>
4038
<tmpl_loop name="records">
4139
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
42-
<td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
43-
<td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
40+
<td class="tbl_col_domain"><a href="#" onClick="loadContent('client/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
41+
<td class="tbl_col_domain"><a href="#" onClick="loadContent('client/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
4442
<td class="tbl_col_buttons">
4543
<tmpl_if name="is_admin">
46-
<a class="button icons16 icoDelete" href="javascript: del_record('domain/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
44+
<div class="buttons icons16">
45+
<a class="icons16 icoDelete" href="javascript: del_record('client/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
46+
</div>
4747
</tmpl_if>
4848
</td>
4949
</tr>

0 commit comments

Comments
 (0)