diff --git a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
index fecd3dcedb1345c198479c11b5773803de8135a4..c0c9b3b963778968925170ad7f31669d2ef40795 100644
--- a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
@@ -31,6 +31,10 @@
{tmpl_var name='website_symlinks_rel'}
</div>
</div>
+ <div class="ctrlHolder">
+ <label for="website_autoalias">{tmpl_var name='website_autoalias_txt'}</label>
+ <input name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='website_autoalias_note_txt'}
+ </div>
<div class="ctrlHolder apache">
<label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
<input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
index 18fdfccc9db23b2cda5247ce41df04beefee7c68..013c39ae069be0130107f897894b8ea3fa7a310f 100644
--- a/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
@@ -39,6 +39,34 @@
<label for="admin_name">{tmpl_var name='admin_name_txt'}</label>
<input name="admin_name" id="admin_name" value="{tmpl_var name='admin_name'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='smtp_enabled_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='smtp_enabled'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="smtp_host">{tmpl_var name='smtp_host_txt'}</label>
+ <input name="smtp_host" id="smtp_host" value="{tmpl_var name='smtp_host'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="smtp_port">{tmpl_var name='smtp_port_txt'}</label>
+ <input name="smtp_port" id="smtp_port" value="{tmpl_var name='smtp_port'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="smtp_user">{tmpl_var name='smtp_user_txt'}</label>
+ <input name="smtp_user" id="smtp_user" value="{tmpl_var name='smtp_user'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="smtp_pass">{tmpl_var name='smtp_pass_txt'}</label>
+ <input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='smtp_crypt_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='smtp_crypt'}
+ </div>
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
index 21bbf0ef151fdf9fa51668c02a6be60f57203fa2..121d607a38def87f3eafcb37df68596a22fdae93 100644
--- a/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
@@ -39,6 +39,12 @@
<label for="webftp_url">{tmpl_var name='webftp_url_txt'}</label>
<input name="webftp_url" id="webftp_url" value="{tmpl_var name='webftp_url'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='vhost_subdomains_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
+ </div>
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm b/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm
index fa31547cc8e7a69968a24cc1055ab287bf93e943..31f3eda05c035cdf4a3a718070ca4a947f6368ab 100644
--- a/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm
+++ b/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm
@@ -12,6 +12,7 @@
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
+ <input type="hidden" name="username" value="global">
<div class="buttonHolder buttons">
<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>
diff --git a/interface/web/themes/default-v2/templates/admin/tpl_default_basic.htm b/interface/web/themes/default-v2/templates/admin/tpl_default_basic.htm
index 23d78638aca74e7e5004a0b524fc9b0fe7de0d66..f6a63716c3c8b03d796dc05013eb40e57fbd6936 100644
--- a/interface/web/themes/default-v2/templates/admin/tpl_default_basic.htm
+++ b/interface/web/themes/default-v2/templates/admin/tpl_default_basic.htm
@@ -12,6 +12,7 @@
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
+ <input type="hidden" name="username" value="global">
<div class="buttonHolder buttons">
<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>
diff --git a/interface/web/themes/default-v2/templates/admin/users_user_edit.htm b/interface/web/themes/default-v2/templates/admin/users_user_edit.htm
index 66142a47773c2927ec8e3056a842656e14ef86c6..4abe7935881e9deff47dc7ceff0ed47ed6ed6fcb 100644
--- a/interface/web/themes/default-v2/templates/admin/users_user_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/users_user_edit.htm
@@ -11,7 +11,7 @@
</div>
<div class="ctrlHolder">
<label for="passwort">{tmpl_var name='passwort_txt'}</label>
- <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');"/> <a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
+ <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');"/> <a href="javascript:void(0);" onClick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='password_strength_txt'}</p>
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_limits.htm b/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
index d7e850d960360cf89c080f61790a4bd000fb53dd..9e12671b11db14ec046022100bfcbf912e7618bb 100644
--- a/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
+++ b/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
@@ -61,6 +61,60 @@
{tmpl_var name='web_php_options'}
</div>
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_cgi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_cgi'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ssi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ssi'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_perl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_perl'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ruby_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ruby'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_python_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_python'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='force_suexec_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='force_suexec'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_hterror_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_hterror'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_wildcard'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ssl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ssl'}
+ </div>
+ </div>
<div class="ctrlHolder">
<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
<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" />
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
index 81a2e595b32087d2a80f0b3300394bb397bd465b..91f9bd52d94c57dbf1a1be54d02f5dd008722138 100644
--- a/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
+++ b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
@@ -25,6 +25,60 @@
{tmpl_var name='web_php_options'}
</div>
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_cgi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_cgi'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ssi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ssi'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_perl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_perl'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ruby_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ruby'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_python_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_python'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='force_suexec_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='force_suexec'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_hterror_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_hterror'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_wildcard'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ssl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ssl'}
+ </div>
+ </div>
<div class="ctrlHolder">
<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
<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" />
diff --git a/interface/web/themes/default-v2/templates/domain/domain_edit.htm b/interface/web/themes/default-v2/templates/client/domain_edit.htm
similarity index 93%
rename from interface/web/themes/default-v2/templates/domain/domain_edit.htm
rename to interface/web/themes/default-v2/templates/client/domain_edit.htm
index 75c464a03c96d9956fc0626010d9da7aaaa1c65c..5a6bef39654c95df1fd796d53769601f28b021ed 100644
--- a/interface/web/themes/default-v2/templates/domain/domain_edit.htm
+++ b/interface/web/themes/default-v2/templates/client/domain_edit.htm
@@ -32,8 +32,8 @@
<input type="hidden" name="type" value="local">
<div class="buttonHolder buttons">
- <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>
- <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>
+ <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>
+ <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>
</div>
</div>
diff --git a/interface/web/themes/default-v2/templates/domain/domain_list.htm b/interface/web/themes/default-v2/templates/client/domain_list.htm
similarity index 59%
rename from interface/web/themes/default-v2/templates/domain/domain_list.htm
rename to interface/web/themes/default-v2/templates/client/domain_list.htm
index d4a1e61818462e169e2c4bd9793453e27974a63c..3c6b1ce5b0bcbc5d14e8a1d767fcccdcb33df4d1 100644
--- a/interface/web/themes/default-v2/templates/domain/domain_list.htm
+++ b/interface/web/themes/default-v2/templates/client/domain_list.htm
@@ -7,11 +7,11 @@
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
<tmpl_if name="is_admin">
- <button class="button iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_edit.php');">
+ <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/domain_edit.php');">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
<tmpl_else>
- <button class="button iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_new_client.php');">
+ <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/domain_new_client.php');">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
</tmpl_if>
@@ -23,27 +23,27 @@
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
<table class="list">
<thead>
- <tr class="caption">
+ <tr>
<th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt"></th>
+ <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt">A</th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
+ <tr>
<td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_buttons">
- <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>
- </td>
+ <td class="tbl_col_user"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <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>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <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>
+ <td class="tbl_col_domain"><a href="#" onClick="loadContent('client/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+ <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>
<td class="tbl_col_buttons">
<tmpl_if name="is_admin">
- <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>
+ <div class="buttons icons16">
+ <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>
+ </div>
</tmpl_if>
</td>
</tr>
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm b/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
index 85936e9519d0fb5e99648b6d1e11da8894d64912..621dfa2b3b4abd5ba3db0558e490ab284e97d6a2 100644
--- a/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
+++ b/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
@@ -56,6 +56,60 @@
{tmpl_var name='web_php_options'}
</div>
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_cgi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_cgi'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ssi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ssi'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_perl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_perl'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ruby_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ruby'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_python_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_python'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='force_suexec_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='force_suexec'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_hterror_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_hterror'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_wildcard'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='limit_ssl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='limit_ssl'}
+ </div>
+ </div>
<div class="ctrlHolder">
<label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
<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" />
diff --git a/interface/web/themes/default-v2/templates/designer/form_edit.htm b/interface/web/themes/default-v2/templates/designer/form_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..38a28c4aa3006220f7a8a90c37776142896b4555
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/form_edit.htm
@@ -0,0 +1,79 @@
+<form method="POST" action="form_edit.php">
+<div class="frmTextHead"><tmpl_var name="header_txt"></div><br />
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="name_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[name]" type="text" class="text" value="{tmpl_var name='name'}" size="20" maxlength="50" {tmpl_var name='readonly'}></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="title_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[title]" type="text" class="text" value="{tmpl_var name='title'}" size="20" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="description_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[description]" type="text" class="text" value="{tmpl_var name='description'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="action_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[action]" type="text" class="text" value="{tmpl_var name='action'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="db_table_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[db_table]" type="text" class="text" value="{tmpl_var name='db_table'}" size="10" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="db_table_idx_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[db_table_idx]" type="text" class="text" value="{tmpl_var name='db_table_idx'}" size="10" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="db_history_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[db_history]" type="text" class="text" value="{tmpl_var name='db_history'}" size="3" maxlength="3"> yes / no</td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="tab_default_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[tab_default]" type="text" class="text" value="{tmpl_var name='tab_default'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="list_default_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[list_default]" type="text" class="text" value="{tmpl_var name='list_default'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="auth_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[auth]" type="text" class="text" value="{tmpl_var name='auth'}" size="3" maxlength="3"> yes / no</td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="auth_preset_userid_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[auth_preset][userid]" type="text" class="text" value="{tmpl_var name='auth_preset_userid'}" size="4" maxlength="4"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="auth_preset_groupid_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[auth_preset][groupid]" type="text" class="text" value="{tmpl_var name='auth_preset_groupid'}" size="4" maxlength="4"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="auth_preset_perm_user_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[auth_preset][perm_user]" type="text" class="text" value="{tmpl_var name='auth_preset_perm_user'}" size="4" maxlength="4"> r = read, i = insert, u = update, d = delete</td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="auth_preset_perm_group_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[auth_preset][perm_group]" type="text" class="text" value="{tmpl_var name='auth_preset_perm_group'}" size="4" maxlength="4"> r = read, i = insert, u = update, d = delete</td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="auth_preset_perm_other_txt">:</td>
+ <td width="366" class="frmText11"><input name="form[auth_preset][perm_other]" type="text" class="text" value="{tmpl_var name='auth_preset_perm_other'}" size="4" maxlength="4"> r = read, i = insert, u = update, d = delete</td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name="Speichern" type="submit" class="button" value="{tmpl_var name='save_txt'}">
+ <input name="Abbrechen" type="button" class="button" value="{tmpl_var name='cancel_txt'}" onClick="self.location.href='form_list.php';">
+ </td>
+ </tr>
+</table>
+<input type="hidden" name="module_name" value="{tmpl_var name='module_name'}">
+<input type="hidden" name="form_name" value="{tmpl_var name='form_name'}">
+</form>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/form_list.htm b/interface/web/themes/default-v2/templates/designer/form_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..39eb7b901543dcfbba6197d65b51e6c32f09de6a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/form_list.htm
@@ -0,0 +1,24 @@
+<form name="myform" action="form_list.php" method="POST">
+<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
+<table width="100%" border="0" cellspacing="0" cellpadding="4">
+ <tr>
+ <td class="tblHead"><tmpl_var name="form_txt"></td>
+ <td class="tblHead"><tmpl_var name="title_txt"></td>
+ <td class="tblHead"><tmpl_var name="module_txt"></td>
+ <td class="tblHead"><tmpl_var name="description_txt"></td>
+ <td class="tblHead"> </td>
+ </tr>
+ <tmpl_loop name="records">
+ <tr bgcolor="{tmpl_var name="bgcolor"}">
+ <td class="frmText11"><a href="form_show.php?form_name={tmpl_var name='name'}&module_name={tmpl_var name='module_name'}" class="frmText11">{tmpl_var name="name"}</a></td>
+ <td class="frmText11"><a href="form_show.php?form_name={tmpl_var name='name'}&module_name={tmpl_var name='module_name'}" class="frmText11">{tmpl_var name="title"}</a></td>
+ <td class="frmText11"><a href="form_show.php?form_name={tmpl_var name='name'}&module_name={tmpl_var name='module_name'}" class="frmText11">{tmpl_var name="module_name"}</a></td>
+ <td class="frmText11"><a href="form_show.php?form_name={tmpl_var name='name'}&module_name={tmpl_var name='module_name'}" class="frmText11">{tmpl_var name="description"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('form_del.php?form_name={tmpl_var name='module'}&module_name={tmpl_var name='module_name'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">Delete</a>]</td>
+ </tr>
+ </tmpl_loop>
+ <tr>
+ <td colspan="7" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
+ </tr>
+</table>
+</form>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/form_show.htm b/interface/web/themes/default-v2/templates/designer/form_show.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2a3eff4ea5b50b66b39a1974dee006518c847b49
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/form_show.htm
@@ -0,0 +1,61 @@
+<script language="JavaScript">
+<!--
+function del_module(link) {
+ if(window.confirm("{tmpl_var name='module_del_txt'}")) {
+ location.href = link;
+ }
+}
+function del_menu(link) {
+ if(window.confirm("{tmpl_var name='menu_del_txt'}")) {
+ location.href = link;
+ }
+}
+function del_menuitem(link) {
+ if(window.confirm("{tmpl_var name='item_del_txt'}")) {
+ location.href = link;
+ }
+}
+
+//-->
+</script>
+<form name="myform" action="module_show.php" method="POST">
+<div class="frmTextHead"><tmpl_var name="header_txt"></div><br />
+<fieldset style="width:320px;"><legend class="frmText11"><b>{tmpl_var name='form_txt'}</b></legend>
+<table border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="title_txt">:</td>
+ <td width="366" class="frmText11">{tmpl_var name='title'}</td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="name_txt">:</td>
+ <td width="366" class="frmText11">{tmpl_var name='form_name'}</td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="module_txt">:</td>
+ <td width="366" class="frmText11">{tmpl_var name='module_name'}</td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="description_txt">:</td>
+ <td width="366" class="frmText11" valign="top">{tmpl_var name='description'}</td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11">
+ <input type="button" name="ed1" value="{tmpl_var name='properties_txt'}" onClick="location.href='form_edit.php?form_name={tmpl_var name='form_name'}&module_name={tmpl_var name='module_name'}'" class="button" />
+ <input type="button" name="ed2" value="{tmpl_var name='delete_txt'}" onClick="del_module('form_del.php?form_name={tmpl_var name='form_name'}&module_name={tmpl_var name='module_name'}');" class="button" />
+ <input type="button" name="ed3" value="{tmpl_var name='new_tab_txt'}" onClick="location.href='form_tab_edit.php?form_name={tmpl_var name='form_name'}&module_name={tmpl_var name='module_name'}'" class="button" /></td>
+ </tr>
+</table>
+</fieldset>
+<table width="350" border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+ <tmpl_var name="nav">
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+</table>
+</form>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/module_edit.htm b/interface/web/themes/default-v2/templates/designer/module_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2cd48a9ea7a495355c27b75e15ba13c5f168f23e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/module_edit.htm
@@ -0,0 +1,43 @@
+<div class="frmTextHead"><tmpl_var name="header_txt"></div><br />
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="name_txt">:</td>
+ <td width="366" class="frmText11"><input name="module[name]" type="text" class="text" value="{tmpl_var name='name'}" size="30" maxlength="50" {tmpl_var name='readonly'}></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="title_txt">:</td>
+ <td width="366" class="frmText11"><input name="module[title]" type="text" class="text" value="{tmpl_var name='title'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="template_txt">:</td>
+ <td width="366" class="frmText11"><input name="module[template]" type="text" class="text" value="{tmpl_var name='template'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="navframe_txt">:</td>
+ <td width="366" class="frmText11"><input name="module[navframe_page]" type="text" class="text" value="{tmpl_var name='navframe_page'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="startpage_txt">:</td>
+ <td width="366" class="frmText11"><input name="module[startpage]" type="text" class="text" value="{tmpl_var name='startpage'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="tab_width_txt">:</td>
+ <td width="366" class="frmText11"><input name="module[tab_width]" type="text" class="text" value="{tmpl_var name='tab_width'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> <inp</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name="Speichern" type="button" class="button" value="{tmpl_var name='save_txt'}" onClick="submitForm('pageForm','designer/module_edit.php');"><div class="buttonEnding"></div>
+ <input name="Abbrechen" type="button" class="button" value="{tmpl_var name='cancel_txt'}" onClick="loadContent('designer/module_list.php');"><div class="buttonEnding"></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"><tmpl_var name="description_txt"></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+</table>
+<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/module_list.htm b/interface/web/themes/default-v2/templates/designer/module_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1e148f3ee2a564da293df343ef0ddc7349ffe6e9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/module_list.htm
@@ -0,0 +1,18 @@
+<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br />
+<table width="100%" border="0" cellspacing="0" cellpadding="4">
+ <tr>
+ <td class="tblHead"><tmpl_var name="module_txt"></td>
+ <td class="tblHead"><tmpl_var name="title_txt"></td>
+ <td class="tblHead"> </td>
+ </tr>
+ <tmpl_loop name="records">
+ <tr bgcolor="{tmpl_var name="bgcolor"}">
+ <td class="frmText11"><a href="javascript:loadContent('designer/module_show.php?id={tmpl_var name='module'}');" class="frmText11">{tmpl_var name="module"}</a></td>
+ <td class="frmText11"><a href="javascript:loadContent('designer/module_show.php?id={tmpl_var name='module'}');" class="frmText11">{tmpl_var name="title"}</a></td>
+ <td class="frmText11" align="right">[<a href="javascript: del_record('module_del.php?id={tmpl_var name='module'}&phpsessid={tmpl_var name='phpsessid'}');" class="frmText11">Delete</a>]</td>
+ </tr>
+ </tmpl_loop>
+ <tr>
+ <td colspan="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td>
+ </tr>
+</table>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/module_nav_edit.htm b/interface/web/themes/default-v2/templates/designer/module_nav_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3b2007af840ed1f52bb6e9b8cc415aaff854bdb0
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/module_nav_edit.htm
@@ -0,0 +1,24 @@
+<div class="frmTextHead"><tmpl_var name="header_txt"></div><br />
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="title_txt">:</td>
+ <td width="366" class="frmText11"><input name="nav[title]" type="text" class="text" value="{tmpl_var name='title'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> <inp</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name="Speichern" type="button" class="button" value="{tmpl_var name='save_txt'}" onClick="submitForm('pageForm','designer/module_nav_edit.php');"><div class="buttonEnding"></div>
+ <input name="Abbrechen" type="button" class="button" value="{tmpl_var name='cancel_txt'}" onClick="loadContent('designer/module_list.php');"><div class="buttonEnding"></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"><tmpl_var name="description_txt"></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+</table>
+<input type="hidden" name="nav_id" value="{tmpl_var name='nav_id'}">
+<input type="hidden" name="module_name" value="{tmpl_var name='module_name'}">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/module_nav_item_edit.htm b/interface/web/themes/default-v2/templates/designer/module_nav_item_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0aee2ca65fa7eb5e69831b48b535bd3248ca0041
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/module_nav_item_edit.htm
@@ -0,0 +1,33 @@
+<div class="frmTextHead"><tmpl_var name="header_txt"></div><br />
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="title_txt">:</td>
+ <td width="366" class="frmText11"><input name="title" type="text" class="text" value="{tmpl_var name='title'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="target_txt">:</td>
+ <td width="366" class="frmText11"><input name="target" type="text" class="text" value="{tmpl_var name='target'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="link_txt">:</td>
+ <td width="366" class="frmText11"><input name="link" type="text" class="text" value="{tmpl_var name='link'}" size="30" maxlength="255"></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> <inp</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input name="Speichern" type="button" class="button" value="{tmpl_var name='save_txt'}" onClick="submitForm('pageForm','designer/module_nav_item_edit.php');"><div class="buttonEnding"></div>
+ <input name="Abbrechen" type="button" class="button" value="{tmpl_var name='cancel_txt'}" onClick="loadContent('designer/module_list.php');"><div class="buttonEnding"></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"><tmpl_var name="description_txt"></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+</table>
+<input type="hidden" name="item_id" value="{tmpl_var name='item_id'}">
+<input type="hidden" name="nav_id" value="{tmpl_var name='nav_id'}">
+<input type="hidden" name="module_name" value="{tmpl_var name='module_name'}">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/module_show.htm b/interface/web/themes/default-v2/templates/designer/module_show.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ffdfe9bb8abf28c70a79e20e85026b0e864c8ec6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/module_show.htm
@@ -0,0 +1,31 @@
+<div class="frmTextHead"><tmpl_var name="header_txt"></div><br />
+<fieldset style="width:250px;"><legend class="frmText11"><b>{tmpl_var name='module_txt'}</b></legend>
+<table border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="title_txt">:</td>
+ <td width="366" class="frmText11">{tmpl_var name='title'}</td>
+ </tr>
+ <tr>
+ <td width="126" class="frmText11"><tmpl_var name="name_txt">:</td>
+ <td width="366" class="frmText11">{tmpl_var name='name'}</td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="frmText11">
+ <input type="button" name="ed1" value="{tmpl_var name='properties_txt'}" onClick="loadContent('designer/module_edit.php?id={tmpl_var name='name'}')" class="button" /><div class="buttonEnding"></div>
+ <input type="button" name="ed2" value="{tmpl_var name='delete_txt'}" onClick="del_record('designer/module_del.php?id={tmpl_var name='name'}');" class="button" /><div class="buttonEnding"></div>
+ <input type="button" name="ed3" value="{tmpl_var name='new_menu_txt'}" onClick="loadContent('designer/module_nav_edit.php?module_name={tmpl_var name='name'}')" class="button" /><div class="buttonEnding"></div></td>
+ </tr>
+</table>
+</fieldset>
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+ <tmpl_var name="nav">
+ <tr>
+ <td colspan="2" class="frmText11"> </td>
+ </tr>
+</table>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/designer/paging.tpl.htm b/interface/web/themes/default-v2/templates/designer/paging.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..eb3bfa6c73a274ec787facd7e2bbc30dc4d526b3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/designer/paging.tpl.htm
@@ -0,0 +1,9 @@
+[ <a href='{tmpl_var name="list_file"}?page=0'>|<< </a>]
+<tmpl_if name="show_page_back">
+ [<< <a href='{tmpl_var name="list_file"}?page={tmpl_var name="last_page"}'>Zurück</a>]
+</tmpl_if>
+ Seite {tmpl_var name="next_page"} von {tmpl_var name="max_pages"}
+<tmpl_if name="show_page_next">
+ [<a href='{tmpl_var name="list_file"}?page={tmpl_var name="next_page"}'>Weiter >></a>]
+</tmpl_if>
+ [<a href='{tmpl_var name="list_file"}?page={tmpl_var name="pages"}'> >>| </a>]
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_a_list.htm b/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
index ebc291d56a5f6f7803ad12c1850d732091e6cb21..658962146e493fb726fb09a17b3244407b333c25 100644
--- a/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
+++ b/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
@@ -11,6 +11,7 @@
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');"><span>PTR</span></button>
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');"><span>RP</span></button>
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');"><span>SRV</span></button>
+ <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');"><span>TXT</span></button>
</div>
</fieldset>
</div>
diff --git a/interface/web/themes/default-v2/templates/login/index.htm b/interface/web/themes/default-v2/templates/login/index.htm
index 39cbc7dd54c89b649e7cc9245ac25192529d47de..e977e058829af741a2cf94700ebeb1f880338c50 100644
--- a/interface/web/themes/default-v2/templates/login/index.htm
+++ b/interface/web/themes/default-v2/templates/login/index.htm
@@ -1,4 +1,4 @@
-<h2>Login</h2>
+<h2><tmpl_var name="login_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_login">
diff --git a/interface/web/themes/default-v2/templates/login/password_reset.htm b/interface/web/themes/default-v2/templates/login/password_reset.htm
index 3b235eb57f9281edd8a941deba5fe795974c805c..d6007e67be0d1da048be4d6735be293149509447 100644
--- a/interface/web/themes/default-v2/templates/login/password_reset.htm
+++ b/interface/web/themes/default-v2/templates/login/password_reset.htm
@@ -1,4 +1,4 @@
-<h2>Password Reset</h2>
+<h2><tmpl_var name="pw_reset_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_password_reset">
diff --git a/interface/web/themes/default-v2/templates/main.tpl.htm b/interface/web/themes/default-v2/templates/main.tpl.htm
index f5dff89f6eb69d2d34d58a3b161a1491a3a029d7..4e222dd9af27fbddc3670c90f9f1921a97caa089 100644
--- a/interface/web/themes/default-v2/templates/main.tpl.htm
+++ b/interface/web/themes/default-v2/templates/main.tpl.htm
@@ -49,7 +49,7 @@
jQuery(document).bind("change", function(event) {
if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
event.preventDefault();
- jQuery(".panel #Filter").trigger('click');
+ jQuery(".panel #Filter").trigger('click');
}
});
diff --git a/interface/web/themes/default-v2/templates/sites/database_admin_list.htm b/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
index c86c07d0a0128e343ed1a85653fc44c79520d749..b62b3491cde1c4406965e5239e1bfbb5545b27a2 100644
--- a/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
+++ b/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
@@ -30,7 +30,7 @@
<td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
<td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}" /></td>
+ <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
<td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
<td class="tbl_col_buttons">
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
diff --git a/interface/web/themes/default-v2/templates/sites/database_edit.htm b/interface/web/themes/default-v2/templates/sites/database_edit.htm
index ada2f9482b48c93182dbdb53c38a39d0c4506ed3..4207a789ff724b95cb3a71e82bf88ad768fb3349 100644
--- a/interface/web/themes/default-v2/templates/sites/database_edit.htm
+++ b/interface/web/themes/default-v2/templates/sites/database_edit.htm
@@ -44,25 +44,17 @@
</tmpl_if>
</div>
<div class="ctrlHolder">
- <label for="database_user">{tmpl_var name='database_user_txt'}</label>
- <p class="prefix">{tmpl_var name='database_user_prefix'}</p>
- <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="database_password">{tmpl_var name='database_password_txt'}</label>
- <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" /> <a href="javascript:void(0);" onClick="generatePassword('database_password');">{tmpl_var name='generate_password_txt'}</a>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
- <div id="passBar"></div>
- <p class="formHint"><span id="passText"> </span></p>
+ <label for="database_user_id">{tmpl_var name='database_user_txt'}</label>
+ <select name="database_user_id" id="database_user_id" class="selectInput">
+ {tmpl_var name='database_user_id'}
+ </select>
</div>
<div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
- <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('database_password','repeat_password');" />
+ <label for="database_ro_user_id">{tmpl_var name='database_ro_user_txt'}</label>
+ <select name="database_ro_user_id" id="database_ro_user_id" class="selectInput">
+ {tmpl_var name='database_ro_user_id'}
+ </select> {tmpl_var name='optional_txt'}
</div>
- <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
- <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
<div class="ctrlHolder">
<tmpl_if name="edit_disabled">
<label for="database_charset_disabled">{tmpl_var name='database_charset_txt'}</label>
diff --git a/interface/web/themes/default-v2/templates/sites/database_list.htm b/interface/web/themes/default-v2/templates/sites/database_list.htm
index 3ccac3112f953b8887a97c46488f6d31839f115f..ea2162f1525163f465fd7ca58d193e05e3b55553 100644
--- a/interface/web/themes/default-v2/templates/sites/database_list.htm
+++ b/interface/web/themes/default-v2/templates/sites/database_list.htm
@@ -21,7 +21,7 @@
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
<th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_user_txt"></th>
+ <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
<th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
@@ -29,7 +29,7 @@
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
<td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
+ <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
<td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
<td class="tbl_col_buttons">
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
diff --git a/interface/web/themes/default-v2/templates/sites/database_user_admin_list.htm b/interface/web/themes/default-v2/templates/sites/database_user_admin_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c1bee6768841907bb495189a0fc4b29e5dd2712b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_user_admin_list.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_database_user_admin">
+
+ <div class="pnl_toolsarea">
+ <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <div class="buttons">
+ <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_user_edit.php');">
+ <span>{tmpl_var name="add_new_record_txt"}</span>
+ </button>
+ </div>
+ </fieldset>
+ </div>
+
+ <div class="pnl_listarea">
+ <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+ <table class="list">
+ <thead>
+ <tr>
+ <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
+ <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ </tr>
+ <tr>
+ <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}" /></td>
+ <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','sites/database_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ </tr>
+ </thead>
+ <tbody>
+ <tmpl_loop name="records">
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+ <td class="tbl_col_buttons">
+ <div class="buttons icons16">
+ <a class="icons16 icoEdit" href="javascript: loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+ <a class="icons16 icoDelete" href="javascript: del_record('sites/database_user_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>
+ </div>
+ </td>
+ </tr>
+ </tmpl_loop>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+ </tr>
+ </tfoot>
+ </table>
+ </fieldset>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_user_edit.htm b/interface/web/themes/default-v2/templates/sites/database_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..40e8c96e826fd64ed7ca414ad9da05724b8992c8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_user_edit.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_database_user">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <tmpl_if name="is_admin">
+ <div class="ctrlHolder">
+ <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+ <select name="client_group_id" id="client_group_id" class="selectInput">
+ {tmpl_var name='client_group_id'}
+ </select>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="is_reseller">
+ <div class="ctrlHolder">
+ <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+ <select name="client_group_id" id="client_group_id" class="selectInput">
+ {tmpl_var name='client_group_id'}
+ </select>
+ </div>
+ </tmpl_if>
+ <div class="ctrlHolder">
+ <label for="database_user">{tmpl_var name='database_user_txt'}</label>
+ <p class="prefix">{tmpl_var name='database_user_prefix'}</p>
+ <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="database_password">{tmpl_var name='database_password_txt'}</label>
+ <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" /> <a href="javascript:void(0);" onClick="generatePassword('database_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div id="passBar"></div>
+ <p class="formHint"><span id="passText"> </span></p>
+ </div>
+ <div class="ctrlHolder">
+ <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('database_password','repeat_password');" />
+ </div>
+ <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+ <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_user_list.htm b/interface/web/themes/default-v2/templates/sites/database_user_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0a0ea1a63779a0182d966490bdc99cf22c9b589e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_user_list.htm
@@ -0,0 +1,51 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_database">
+
+ <div class="pnl_toolsarea">
+ <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <div class="buttons">
+ <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_user_edit.php');">
+ <span>{tmpl_var name="add_new_record_txt"}</span>
+ </button>
+ </div>
+ </fieldset>
+ </div>
+
+ <div class="pnl_listarea">
+ <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+ <table class="list">
+ <thead>
+ <tr>
+ <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
+ <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ </tr>
+ <tr>
+ <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
+ <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','sites/database_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ </tr>
+ </thead>
+ <tbody>
+ <tmpl_loop name="records">
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+ <td class="tbl_col_buttons">
+ <div class="buttons icons16">
+ <a class="icons16 icoEdit" href="javascript: loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+ <a class="icons16 icoDelete" href="javascript: del_record('sites/database_user_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>
+ </div>
+ </td>
+ </tr>
+ </tmpl_loop>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+ </tr>
+ </tfoot>
+ </table>
+ </fieldset>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
index 496ddec53248212edf019ce889671d161db41385..edf1836d29a0ab48a764a21844efce438b4cbfee 100644
--- a/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
@@ -67,42 +67,48 @@
<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
<input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
</div>
- <div class="ctrlHolder">
+ <tmpl_if name="limit_cgi" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='cgi_txt'}</p>
<div class="multiField">
{tmpl_var name='cgi'}
</div>
- </div>
- <div class="ctrlHolder">
+ </div></tmpl_if>
+ <tmpl_if name="limit_ssi" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='ssi_txt'}</p>
<div class="multiField">
{tmpl_var name='ssi'}
</div>
- </div>
- <div class="ctrlHolder apache">
+ </div></tmpl_if>
+ <tmpl_if name="limit_perl" op="==" value="y"><div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='perl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='perl'}
+ </div>
+ </div></tmpl_if>
+ <tmpl_if name="limit_ruby" op="==" value="y"><div class="ctrlHolder apache">
<p class="label">{tmpl_var name='ruby_txt'}</p>
<div class="multiField">
{tmpl_var name='ruby'}
</div>
- </div>
- <div class="ctrlHolder apache">
+ </div></tmpl_if>
+ <tmpl_if name="limit_python" op="==" value="y"><div class="ctrlHolder apache">
<p class="label">{tmpl_var name='python_txt'}</p>
<div class="multiField">
{tmpl_var name='python'}
</div>
- </div>
- <div class="ctrlHolder apache">
+ </div></tmpl_if>
+ <tmpl_if name="force_suexec" op="==" value="n"><div class="ctrlHolder apache">
<p class="label">{tmpl_var name='suexec_txt'}</p>
<div class="multiField">
{tmpl_var name='suexec'}
</div>
- </div>
- <div class="ctrlHolder">
+ </div></tmpl_if>
+ <tmpl_if name="limit_hterror" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='errordocs_txt'}</p>
<div class="multiField">
{tmpl_var name='errordocs'}
</div>
- </div>
+ </div></tmpl_if>
<div class="ctrlHolder">
<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
@@ -110,12 +116,12 @@
{tmpl_var name='subdomain'}
</select>
</div>
- <div class="ctrlHolder">
+ <tmpl_if name="limit_ssl" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='ssl_txt'}</p>
<div class="multiField">
{tmpl_var name='ssl'}
</div>
- </div>
+ </div></tmpl_if>
<div class="ctrlHolder">
<label for="php">{tmpl_var name='php_txt'}</label>
<select name="php" id="php" class="selectInput formLengthHalf">
@@ -139,7 +145,7 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
@@ -161,6 +167,7 @@
});
}
adjustForm();
+ reloadFastcgiPHPVersions();
jQuery('#client_group_id').change(function(){
clientGroupId = $(this).val();
@@ -223,5 +230,20 @@
$('#fastcgi_php_version').html(options);
});
}
+
+ <tmpl_if name="readonly_tab">
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').attr('disabled', 'disabled');
+ jQuery('div.tabbox_tabs').find('a').click(function() {
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
+ });
+ jQuery('#dom-edit-submit').click(function() {
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
+ submitForm('pageForm','sites/web_domain_edit.php');
+ });
+ <tmpl_else>
+ jQuery('#dom-edit-submit').click(function() {
+ submitForm('pageForm','sites/web_domain_edit.php');
+ });
+ </tmpl_if>
</script>
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm b/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
index 0b1d1fee18a0323a3123c601e2e3869ccb18a280..4c27bb77298df546759290df5dfd967d1400d8e7 100644
--- a/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
@@ -32,6 +32,10 @@
<select name="ssl_domain" id="ssl_domain" class="selectInput">
{tmpl_var name='ssl_domain'}
</select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_request">{tmpl_var name='ssl_key_txt'}</label>
+ <textarea name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea>
</div>
<div class="ctrlHolder">
<label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm b/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
index b5ffe73848220522c19e9ae9c055af4902e07f2b..26eee94772c6b8ea574a65495cf7fa43aad68377 100644
--- a/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
@@ -10,7 +10,7 @@
</div>
<div class="ctrlHolder">
<label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
- <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" /> <a href="javascript:void(0);" onClick="generatePassword('stats_password');">{tmpl_var name='generate_password_txt'}</a>
+ <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" /> <a href="javascript:void(0);" onClick="generatePassword('stats_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
<div class="ctrlHolder">
<label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
diff --git a/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm b/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
index f791e131910dfee6deba9124a44f7bb0b529de1c..475c9d1b9ca058be15d04d579120dbe823061fcc 100644
--- a/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
+++ b/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
@@ -37,6 +37,17 @@
<td class="tbl_col_buttons"></td>
</tr>
</tmpl_loop>
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_txt"}</a></td>
+ <td class="tbl_col_this_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_this_month"} MB</a></td>
+ <td class="tbl_col_last_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_last_month"} MB</a></td>
+ <td class="tbl_col_this_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_this_year"} MB</a></td>
+ <td class="tbl_col_last_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_last_year"} MB</a></td>
+ <td class="tbl_col_buttons">
+ <div class="buttons icons16">
+ </div>
+ </td>
+ </tr>
</tbody>
<tfoot>
<tr>
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_advanced.htm b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_advanced.htm
new file mode 100644
index 0000000000000000000000000000000000000000..87107400af24704f79644aa7ac3cc83dac2373cf
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_advanced.htm
@@ -0,0 +1,146 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
+ <div class="ctrlHolder">
+ <label for="system_user">{tmpl_var name='system_user_txt'}</label>
+ <label for="system_user">{tmpl_var name='system_user'}</label>
+ <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="system_group">{tmpl_var name='system_group_txt'}</label>
+ <label for="system_group">{tmpl_var name='system_group'}</label>
+ <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
+ </div>
+ <div class="ctrlHolder apache">
+ <label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
+ <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="phpfpm">
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='php_fpm_use_socket'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="pm">{tmpl_var name='pm_txt'}</label>
+ <select name="pm" id="pm" class="selectInput">
+ {tmpl_var name='pm'}
+ </select>
+ </div>
+ <div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
+ {tmpl_var name='pm_ondemand_hint_txt'}
+ </div>
+ <div class="ctrlHolder">
+ <label for="pm_max_children">{tmpl_var name='pm_max_children_txt'}</label>
+ <input name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_dynamic">
+ <label for="pm_start_servers">{tmpl_var name='pm_start_servers_txt'}</label>
+ <input name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_dynamic">
+ <label for="pm_min_spare_servers">{tmpl_var name='pm_min_spare_servers_txt'}</label>
+ <input name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_dynamic">
+ <label for="pm_max_spare_servers">{tmpl_var name='pm_max_spare_servers_txt'}</label>
+ <input name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_ondemand">
+ <label for="pm_process_idle_timeout">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
+ <input name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" /> s
+ </div>
+ <div class="ctrlHolder">
+ <label for="pm_max_requests">{tmpl_var name='pm_max_requests_txt'}</label>
+ <input name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
+ <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput" style="width:400px;" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
+ <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea>
+ </div>
+ <div class="ctrlHolder apache">
+ <label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
+ <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea>
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
+ <textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+ var webId = jQuery('input[name="id"]').val();
+ var serverId;
+ getServerId();
+ adjustForm();
+
+ var pm = jQuery('#pm').val();
+ pmMode(pm);
+ jQuery('#pm').change(function(){
+ pm = jQuery(this).val();
+ pmMode(pm);
+ });
+
+ function pmMode(pm){
+ switch(pm){
+ case "static":
+ jQuery('.pm_dynamic').add('.pm_ondemand').hide();
+ jQuery('.pm_static').show();
+ break;
+ case "dynamic":
+ jQuery('.pm_static').add('.pm_ondemand').hide();
+ jQuery('.pm_dynamic').show();
+ break;
+ case "ondemand":
+ jQuery('.pm_static').add('.pm_dynamic').hide();
+ jQuery('.pm_ondemand').show();
+ break;
+ }
+ }
+
+ function getServerId(){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+ serverId = data.serverid;
+ });
+ }
+
+ function adjustForm(){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+ if(data.servertype == "nginx"){
+ jQuery('.nginx').show();
+ jQuery('.apache').hide();
+ } else {
+ jQuery('.nginx').hide();
+ jQuery('.apache').show();
+ }
+ });
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getphptype"}, function(data) {
+ if(data.phptype == "php-fpm"){
+ jQuery('.phpfpm').show();
+ } else {
+ jQuery('.phpfpm').hide();
+ }
+ });
+ }
+
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_backup.htm b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_backup.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c46d4e2d4ef9a3fd0aae5921d68d194f959bfb86
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_backup.htm
@@ -0,0 +1,32 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels"><legend>Backup</legend>
+ <div class="ctrlHolder">
+ <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
+ <select name="backup_interval" id="backup_interval" class="selectInput">
+ {tmpl_var name='backup_interval'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
+ <select name="backup_copies" id="backup_copies" class="selectInput">
+ {tmpl_var name='backup_copies'}
+ </select>
+ </div>
+ </fieldset>
+
+ {tmpl_var name='backup_records'}
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..159830c685c148b8fb52736b62eec6c276815eec
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_edit.htm
@@ -0,0 +1,208 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
+ <div class="ctrlHolder">
+ <label for="domain">{tmpl_var name='host_txt'}</label>
+ <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
+ <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
+ <input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
+ </div>
+ <div class="ctrlHolder">
+ <label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
+ <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB
+ </div>
+ <div class="ctrlHolder">
+ <label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
+ <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
+ </div>
+ <tmpl_if name="limit_cgi" op="==" value="y"><div class="ctrlHolder">
+ <p class="label">{tmpl_var name='cgi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='cgi'}
+ </div>
+ </div></tmpl_if>
+ <tmpl_if name="limit_ssi" op="==" value="y"><div class="ctrlHolder">
+ <p class="label">{tmpl_var name='ssi_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='ssi'}
+ </div>
+ </div></tmpl_if>
+ <tmpl_if name="limit_perl" op="==" value="y"><div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='perl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='perl'}
+ </div>
+ </div></tmpl_if>
+ <tmpl_if name="limit_ruby" op="==" value="y"><div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='ruby_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='ruby'}
+ </div>
+ </div></tmpl_if>
+ <tmpl_if name="limit_python" op="==" value="y"><div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='python_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='python'}
+ </div>
+ </div></tmpl_if>
+ <tmpl_if name="force_suexec" op="==" value="n"><div class="ctrlHolder apache">
+ <p class="label">{tmpl_var name='suexec_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='suexec'}
+ </div>
+ </div></tmpl_if>
+ <tmpl_if name="limit_hterror" op="==" value="y"><div class="ctrlHolder">
+ <p class="label">{tmpl_var name='errordocs_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='errordocs'}
+ </div>
+ </div></tmpl_if>
+
+ <div class="ctrlHolder">
+ <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+ <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+ {tmpl_var name='subdomain'}
+ </select>
+ </div>
+ <tmpl_if name="limit_ssl" op="==" value="y"><div class="ctrlHolder">
+ <p class="label">{tmpl_var name='ssl_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='ssl'}
+ </div>
+ </div></tmpl_if>
+ <div class="ctrlHolder">
+ <label for="php">{tmpl_var name='php_txt'}</label>
+ <select name="php" id="php" class="selectInput formLengthHalf">
+ {tmpl_var name='php'}
+ </select>
+ </div>
+ <div class="ctrlHolder fastcgi_php_version">
+ <label for="fastcgi_php_version">{tmpl_var name='fastcgi_php_version_txt'}</label>
+ <select name="fastcgi_php_version" id="fastcgi_php_version" class="selectInput formLengthHalf">
+ {tmpl_var name='fastcgi_php_version'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='active_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='active'}
+ </div>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+ var serverId;
+ var clientGroupId = jQuery('#client_group_id').val();
+ var serverIdDisabled = jQuery('#server_id_disabled').val();
+ if(serverIdDisabled > 0){
+ serverId = serverIdDisabled;
+ } else {
+ serverId = jQuery('#server_id').val();
+ jQuery('#server_id').change(function(){
+ serverId = $(this).val();
+ adjustForm();
+ reloadWebIP();
+ reloadFastcgiPHPVersions();
+ });
+ }
+ adjustForm();
+ reloadFastcgiPHPVersions();
+
+ jQuery('#client_group_id').change(function(){
+ clientGroupId = $(this).val();
+ reloadWebIP();
+ });
+
+ if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
+ jQuery('.fastcgi_php_version:hidden').show();
+ } else {
+ jQuery('.fastcgi_php_version:visible').hide();
+ }
+ jQuery('#php').change(function(){
+ reloadFastcgiPHPVersions();
+ if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
+ jQuery('.fastcgi_php_version:hidden').show();
+ } else {
+ jQuery('.fastcgi_php_version:visible').hide();
+ }
+ });
+
+ function adjustForm(){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+ if(data.servertype == "nginx"){
+ var selected = jQuery('#php').val();
+ jQuery('.apache').hide();
+ jQuery('.apache').hide();
+ jQuery('#php option[value="fast-cgi"]').hide();
+ jQuery('#php option[value="cgi"]').hide();
+ jQuery('#php option[value="mod"]').hide();
+ jQuery('#php option[value="suphp"]').hide();
+ if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
+ } else {
+ jQuery('.apache').show();
+ jQuery('.apache').show();
+ jQuery('#php option[value="fast-cgi"]').show();
+ jQuery('#php option[value="cgi"]').show();
+ jQuery('#php option[value="mod"]').show();
+ jQuery('#php option[value="suphp"]').show();
+ }
+ });
+ }
+
+ function reloadWebIP() {
+ loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId);
+ loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
+ }
+
+ function reloadFastcgiPHPVersions() {
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
+ var options = '<option value="">Default</option>';
+ var phpfastcgiselected = '';
+ $.each(data, function(key, val) {
+ if($('#fastcgi_php_version').val() == key){
+ phpfastcgiselected = ' selected="selected"';
+ } else {
+ phpfastcgiselected = '';
+ }
+ options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
+ });
+ $('#fastcgi_php_version').html(options);
+ });
+ }
+
+ <tmpl_if name="readonly_tab">
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').attr('disabled', 'disabled');
+ jQuery('div.tabbox_tabs').find('a').click(function() {
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
+ });
+ jQuery('#dom-edit-submit').click(function() {
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
+ submitForm('pageForm','sites/web_vhost_subdomain_edit.php');
+ });
+ <tmpl_else>
+ jQuery('#dom-edit-submit').click(function() {
+ submitForm('pageForm','sites/web_vhost_subdomain_edit.php');
+ });
+ </tmpl_if>
+
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_list.htm b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f21698899839af4acb93ec0c2c71a36ac879223f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_list.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_subdomain">
+
+ <div class="pnl_toolsarea">
+ <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <div class="buttons">
+ <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_vhost_subdomain_edit.php');">
+ <span>{tmpl_var name="add_new_record_txt"}</span>
+ </button>
+ </div>
+ </fieldset>
+ </div>
+
+ <div class="pnl_listarea">
+ <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+ <table class="list">
+ <thead>
+ <tr>
+ <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+ <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+ <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+ <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+ <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ </tr>
+ <tr>
+ <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <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','sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ </tr>
+ </thead>
+ <tbody>
+ <tmpl_loop name="records">
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+ <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+ <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+ <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_vhost_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+ <td class="tbl_col_buttons">
+ <div class="buttons icons16">
+ <a class="icons16 icoDelete" href="javascript: del_record('sites/web_vhost_subdomain_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>
+ </div>
+ </td>
+ </tr>
+ </tmpl_loop>
+ </tbody>
+
+ <tfoot>
+ <tr>
+ <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ </tr>
+ </tfoot>
+ </table>
+ </fieldset>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_redirect.htm b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_redirect.htm
new file mode 100644
index 0000000000000000000000000000000000000000..66a17034c9b27fec864671d69ddddf1024273511
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_redirect.htm
@@ -0,0 +1,76 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <div class="ctrlHolder">
+ <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+ <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+ {tmpl_var name='redirect_type'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+ <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
+ <select name="seo_redirect" id="seo_redirect" class="selectInput formLengthHalf">
+ {tmpl_var name='seo_redirect'}
+ </select>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+ var webId = jQuery('input[name="id"]').val();
+ var serverId;
+ getServerId(webId);
+
+ function getServerId(webId){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+ serverId = data.serverid;
+ adjustForm(serverId);
+ });
+ }
+
+ function adjustForm(serverId){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+ var selected = jQuery('#redirect_type').val();
+ if(data.servertype == "nginx"){
+ jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+ jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+
+ jQuery('#redirect_type option[value="R"]').hide();
+ jQuery('#redirect_type option[value="L"]').hide();
+ jQuery('#redirect_type option[value="R,L"]').hide();
+ jQuery('#redirect_type option[value="R=301,L"]').hide();
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ } else {
+ jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+
+ jQuery('#redirect_type option[value="last"]').hide();
+ jQuery('#redirect_type option[value="break"]').hide();
+ jQuery('#redirect_type option[value="redirect"]').hide();
+ jQuery('#redirect_type option[value="permanent"]').hide();
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ }
+ });
+ }
+
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_ssl.htm b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_ssl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4c27bb77298df546759290df5dfd967d1400d8e7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_ssl.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <div class="ctrlHolder">
+ <label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
+ <input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_locality">{tmpl_var name='ssl_locality_txt'}</label>
+ <input name="ssl_locality" id="ssl_locality" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_organisation">{tmpl_var name='ssl_organisation_txt'}</label>
+ <input name="ssl_organisation" id="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_organisation_unit">{tmpl_var name='ssl_organisation_unit_txt'}</label>
+ <input name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_country">{tmpl_var name='ssl_country_txt'}</label>
+ <select name="ssl_country" id="ssl_country" class="selectInput flags">
+ {tmpl_var name='ssl_country'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
+ <select name="ssl_domain" id="ssl_domain" class="selectInput">
+ {tmpl_var name='ssl_domain'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_request">{tmpl_var name='ssl_key_txt'}</label>
+ <textarea name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea>
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
+ <textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_cert">{tmpl_var name='ssl_cert_txt'}</label>
+ <textarea name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea>
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_bundle">{tmpl_var name='ssl_bundle_txt'}</label>
+ <textarea name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea>
+ </div>
+ <div class="ctrlHolder">
+ <label for="ssl_action">{tmpl_var name='ssl_action_txt'}</label>
+ <select name="ssl_action" id="ssl_action" class="selectInput formLengthHalf">
+ {tmpl_var name='ssl_action'}
+ </select>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_stats.htm b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_stats.htm
new file mode 100644
index 0000000000000000000000000000000000000000..26eee94772c6b8ea574a65495cf7fa43aad68377
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_stats.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='stats_user_txt'}</p><p class="value">admin</p>
+ </div>
+ <div class="ctrlHolder">
+ <label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
+ <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" /> <a href="javascript:void(0);" onClick="generatePassword('stats_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+ </div>
+ <div class="ctrlHolder">
+ <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />
+ </div>
+ <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+ <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+ <div class="ctrlHolder">
+ <label for="stats_type">{tmpl_var name='stats_type_txt'}</label>
+ <select name="stats_type" id="stats_type" class="selectInput" >
+ {tmpl_var name='stats_type'}
+ </select>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/tools/interface_settings.htm b/interface/web/themes/default-v2/templates/tools/interface_settings.htm
index 7a22f2708b7fd6b6d5a09b4f814deb4f1dfccfeb..640f187cd2916384ebaf58578fbf8a0fce48d70d 100644
--- a/interface/web/themes/default-v2/templates/tools/interface_settings.htm
+++ b/interface/web/themes/default-v2/templates/tools/interface_settings.htm
@@ -5,12 +5,6 @@
<div class="pnl_formsarea">
<fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="language">{tmpl_var name='language_txt'}</label>
- <select name="language" id="language" class="selectInput flags">
- {tmpl_var name='language'}
- </select>
- </div>
<!-- TODO: If user theme change is activated -->
<div class="ctrlHolder">
<label for="app_theme">{tmpl_var name='app_theme_txt'}</label>
diff --git a/interface/web/themes/default-v2/templates/tools/user_settings.htm b/interface/web/themes/default-v2/templates/tools/user_settings.htm
index a6ea072e01ed8a19272e01b1b144224182c3e1a8..6155093aa3be1ebee42295a7e2519ca9350a0850 100644
--- a/interface/web/themes/default-v2/templates/tools/user_settings.htm
+++ b/interface/web/themes/default-v2/templates/tools/user_settings.htm
@@ -7,7 +7,7 @@
<fieldset class="inlineLabels">
<div class="ctrlHolder">
<label for="passwort">{tmpl_var name='passwort_txt'}</label>
- <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');"/> <a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
+ <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');"/> <a href="javascript:void(0);" onClick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='password_strength_txt'}</p>