From 5df6059f4153845f2d7db0bff426c4ad70c299cd Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 04 Sep 2012 08:47:19 -0400
Subject: [PATCH] a lot of minor template fixes
---
interface/web/sites/templates/web_vhost_subdomain_advanced.htm | 4
interface/web/sites/templates/database_user_admin_list.htm | 7
interface/web/sites/templates/web_sites_stats_list.htm | 11 --
interface/web/admin/templates/server_config_web_edit.htm | 12 ++
interface/web/dns/lib/lang/de_dns_wizard.lng | 2
interface/web/sites/templates/web_vhost_subdomain_ssl.htm | 4
interface/web/tools/templates/import_ispconfig.htm | 10 +-
interface/web/dns/templates/dns_a_list.htm | 2
interface/web/sites/lib/lang/en_aps.lng | 4
interface/web/help/templates/help_faq_sections_list.htm | 16 +-
interface/web/sites/templates/aps_install_package.htm | 4
interface/web/sites/templates/web_domain_stats.htm | 7 +
interface/web/sites/templates/aps_packages_list.htm | 4
interface/web/help/templates/faq_manage_questions_list.htm | 12 +-
interface/web/admin/templates/server_php_list.htm | 12 +-
interface/web/sites/templates/aps_instances_list.htm | 2
interface/web/mail/templates/spamfilter_config_list.htm | 1
interface/web/sites/templates/web_backup_list.htm | 2
interface/web/client/lib/module.conf.php | 101 ++++++++++---------
interface/web/tools/templates/interface_settings.htm | 1
interface/web/sites/templates/database_user_list.htm | 4
interface/web/admin/templates/software_package_list.htm | 4
interface/web/tools/templates/dns_import_tupa.htm | 11 +-
interface/web/tools/templates/import_plesk.htm | 6
interface/web/admin/form/system_config.tform.php | 24 ++++
interface/web/sites/lib/lang/de_aps.lng | 4
interface/web/dns/lib/lang/en_dns_wizard.lng | 2
interface/web/monitor/templates/show_sys_state.htm | 2
interface/web/sites/templates/web_vhost_subdomain_stats.htm | 4
interface/web/sites/templates/web_vhost_subdomain_backup.htm | 4
interface/web/tools/templates/resync.htm | 6
interface/web/sites/templates/web_vhost_subdomain_redirect.htm | 4
32 files changed, 167 insertions(+), 126 deletions(-)
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 1317bf7..370e57f 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -302,6 +302,30 @@
)
);
+/* TODO_ BEGIN: Branding
+
+$form["tabs"]['domains'] = array (
+ 'title' => "Branding",
+ 'width' => 70,
+ 'template' => "templates/system_config_branding_edit.htm",
+ 'fields' => array (
+ ##################################
+ # Begin Datatable fields
+ ##################################
+ 'allow_themechange' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'N',
+ 'value' => array(0 => 'n',1 => 'y')
+ ),
+ ##################################
+ # ENDE Datatable fields
+ ##################################
+ )
+);
+
+
+ END: Branding */
$form["tabs"]['misc'] = array (
'title' => "Misc",
'width' => 70,
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 7ff0c06..5a95917 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -95,6 +95,18 @@
{tmpl_var name='enable_ip_wildcard'}
</div>
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overtraffic_notify_admin_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overtraffic_notify_admin'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overtraffic_notify_client_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overtraffic_notify_client'}
+ </div>
+ </div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
<div style="display:none;">
<div class="ctrlHolder">
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index f8c6755..92aa080 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -18,14 +18,14 @@
<thead>
<tr class="caption">
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
- <th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
+ <th class="tbl_col_clientname" scope="col"><tmpl_var name="client_id_txt"></th>
+ <th class="tbl_col_phpname" scope="col"><tmpl_var name="name_txt"></th>
<th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
<tr class="filter">
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
- <td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td class="tbl_col_clientname"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td class="tbl_col_phpname"><input type="text" name="search_name" value="{tmpl_var name='search_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','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
</td>
@@ -35,8 +35,8 @@
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
- <td class="tbl_col_name"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+ <td class="tbl_col_clientname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+ <td class="tbl_col_phpname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
<td class="tbl_col_buttons">
<a class="button icons16 icoDelete" href="javascript: del_record('admin/server_php_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>
</td>
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index 8fc0973..d030e5e 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -22,7 +22,7 @@
<th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
<th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
<th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+ <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
</thead>
<tbody>
@@ -32,7 +32,7 @@
<td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
<td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
<td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
- <td class="tbl_col_buttons">
+ <td class="tbl_col_buttons">
<a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name="software_update_inst_id"}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
</td>
</tr>
diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php
index 2575ba2..233d4f6 100644
--- a/interface/web/client/lib/module.conf.php
+++ b/interface/web/client/lib/module.conf.php
@@ -1,74 +1,68 @@
<?php
-$module["name"] = "client";
-$module["title"] = "top_menu_client";
+$module["name"] = "client";
+$module["title"] = "top_menu_client";
$module["template"] = "module.tpl.htm";
$module["startpage"] = "client/client_list.php";
$module["tab_width"] = '';
-/*
- Email accounts menu
-*/
+$items[] = array( 'title' => "Edit Client",
+ 'target' => 'content',
+ 'link' => 'client/client_list.php',
+ 'html_id' => 'client_list');
-
-
-$items[] = array( 'title' => "Edit Client",
- 'target' => 'content',
- 'link' => 'client/client_list.php',
- 'html_id' => 'client_list');
-
-$items[] = array( 'title' => "Add Client",
- 'target' => 'content',
- 'link' => 'client/client_edit.php',
- 'html_id' => 'client_add');
+$items[] = array( 'title' => "Add Client",
+ 'target' => 'content',
+ 'link' => 'client/client_edit.php',
+ 'html_id' => 'client_add');
- if($_SESSION["s"]["user"]["typ"] == 'admin'){
- $items[] = array( 'title' => "Edit Client-Templates",
- 'target' => 'content',
- 'link' => 'client/client_template_list.php',
- 'html_id' => 'client_template_list');
+if($_SESSION["s"]["user"]["typ"] == 'admin'){
+$items[] = array( 'title' => "Edit Client-Templates",
+ 'target' => 'content',
+ 'link' => 'client/client_template_list.php',
+ 'html_id' => 'client_template_list');
}
-$module["nav"][] = array( 'title' => 'Clients',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'Clients',
+ 'open' => 1,
+ 'items' => $items);
unset($items);
if($_SESSION["s"]["user"]["typ"] == 'admin'){
-$items[] = array( 'title' => "Edit Reseller",
- 'target' => 'content',
- 'link' => 'client/reseller_list.php',
- 'html_id' => 'reseller_list');
+$items[] = array( 'title' => "Edit Reseller",
+ 'target' => 'content',
+ 'link' => 'client/reseller_list.php',
+ 'html_id' => 'reseller_list');
-$items[] = array( 'title' => "Add Reseller",
- 'target' => 'content',
- 'link' => 'client/reseller_edit.php',
- 'html_id' => 'reseller_add');
+$items[] = array( 'title' => "Add Reseller",
+ 'target' => 'content',
+ 'link' => 'client/reseller_edit.php',
+ 'html_id' => 'reseller_add');
-$module["nav"][] = array( 'title' => 'Resellers',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'Resellers',
+ 'open' => 1,
+ 'items' => $items);
unset($items);
}
-$items[] = array( 'title' => "Edit Client Circle",
- 'target' => 'content',
- 'link' => 'client/client_circle_list.php',
- 'html_id' => 'client_circle_list');
+$items[] = array( 'title' => "Edit Client Circle",
+ 'target' => 'content',
+ 'link' => 'client/client_circle_list.php',
+ 'html_id' => 'client_circle_list');
-$items[] = array( 'title' => "Send email",
- 'target' => 'content',
- 'link' => 'client/client_message.php',
- 'html_id' => 'reseller_add');
+$items[] = array( 'title' => "Send email",
+ 'target' => 'content',
+ 'link' => 'client/client_message.php',
+ 'html_id' => 'reseller_add');
-$module["nav"][] = array( 'title' => 'Messaging',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'Messaging',
+ 'open' => 1,
+ 'items' => $items);
unset($items);
@@ -87,5 +81,18 @@
unset($items);
}
-
+
+if($_SESSION["s"]["user"]["typ"] == 'admin'){
+$items[] = array( 'title' => "Interface Settings",
+ 'target' => 'content',
+ 'link' => 'client/reseller_admin_interface.php',
+ 'html_id' => 'reseller_admin_interface');
+
+
+$module["nav"][] = array( 'title' => 'Reseller Panel',
+ 'open' => 1,
+ 'items' => $items);
+
+unset($items);
+}
?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng
index 9bcaae1..e8c1715 100644
--- a/interface/web/dns/lib/lang/de_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/de_dns_wizard.lng
@@ -1,4 +1,6 @@
<?php
+$wb['list_head_txt'] = 'DNS-Zonen Assistent';
+$wb['list_desc_txt'] = 'Erstelle eine DNS-Zone per Assistent';
$wb['dns_zone_txt'] = 'DNS-Zone';
$wb['template_id_txt'] = 'Vorlage';
$wb['server_id_txt'] = 'Server';
diff --git a/interface/web/dns/lib/lang/en_dns_wizard.lng b/interface/web/dns/lib/lang/en_dns_wizard.lng
index d1a4234..8f9153d 100644
--- a/interface/web/dns/lib/lang/en_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/en_dns_wizard.lng
@@ -1,4 +1,6 @@
<?php
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
$wb['dns_zone_txt'] = 'DNS Zone';
$wb['template_id_txt'] = 'Template';
$wb['server_id_txt'] = 'Server';
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index d1fcc5c..37247f8 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -1,4 +1,4 @@
-c<div class="pnl_toolsarea">
+<div class="pnl_toolsarea">
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons topbuttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"><span>A</span></button>
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm
index 809ce84..4907b73 100644
--- a/interface/web/help/templates/faq_manage_questions_list.htm
+++ b/interface/web/help/templates/faq_manage_questions_list.htm
@@ -17,20 +17,20 @@
<thead>
<tr class="caption">
<th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
- <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
- <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
- <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+ <th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+ <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+ <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
</tr>
</thead>
<tmpl_loop name="records">
- <tr>
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td>{tmpl_var name='hf_question'}</td>
<td>{tmpl_var name='hf_section'}</td>
<td class="tbl_col_buttons">
<a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
</td>
- <td>
- <a href="#" onclick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+ <td class="tbl_col_buttons">
+ <a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm
index 39b2b40..9166f13 100644
--- a/interface/web/help/templates/help_faq_sections_list.htm
+++ b/interface/web/help/templates/help_faq_sections_list.htm
@@ -18,19 +18,19 @@
<table class="list">
<thead>
<tr class="caption">
- <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
- <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
- <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+ <th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+ <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+ <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
</tr>
</thead>
<tmpl_loop name="records">
- <tr>
- <td><b>{tmpl_var name='hfs_name'}</b></td>
- <td>
+ <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <th class="tbl_col_section_name"><b>{tmpl_var name='hfs_name'}</b></td>
+ <td class="tbl_col_buttons">
<a class="button icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
</td>
- <td>
- <a href="#" onclick="loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+ <td class="tbl_col_buttons">
+ <a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm
index cf46159..d2e9369 100644
--- a/interface/web/mail/templates/spamfilter_config_list.htm
+++ b/interface/web/mail/templates/spamfilter_config_list.htm
@@ -38,7 +38,6 @@
</tr>
</tmpl_loop>
</tbody>
-
<tfoot>
<tr>
<td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm
index 740141b..55aeeb2 100644
--- a/interface/web/monitor/templates/show_sys_state.htm
+++ b/interface/web/monitor/templates/show_sys_state.htm
@@ -7,7 +7,7 @@
<fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
<div class="buttons">
<div class="ctrlHolder">
- <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+ <label for="refreshinterval"> </label>
<select name="refreshinterval" id="refreshinterval" class="selectInput withicons" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
{tmpl_var name='refresh'}
</select>
diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng
index ad29227..f568455 100644
--- a/interface/web/sites/lib/lang/de_aps.lng
+++ b/interface/web/sites/lib/lang/de_aps.lng
@@ -26,8 +26,8 @@
$wb['install_package_txt'] = 'Dieses Paket installieren';
$wb['installation_txt'] = 'Installation';
$wb['install_location_txt'] = 'Installationsort';
-$wb['btn_install'] = 'Installieren';
-$wb['btn_cancel'] = 'Abbrechen';
+$wb['btn_install_txt'] = 'Installieren';
+$wb['btn_cancel_txt'] = 'Abbrechen';
$wb['acceptance_txt'] = 'Lizenzvereinbarung';
$wb['acceptance_text_txt'] = 'Ja, ich habe die Lizenzvereinbarung gelesen und akzeptiere sie.';
$wb['install_language_txt'] = 'Sprache der Oberfläche';
diff --git a/interface/web/sites/lib/lang/en_aps.lng b/interface/web/sites/lib/lang/en_aps.lng
index d0ecb77..2ab5402 100644
--- a/interface/web/sites/lib/lang/en_aps.lng
+++ b/interface/web/sites/lib/lang/en_aps.lng
@@ -26,8 +26,8 @@
$wb['install_package_txt'] = 'Install this package';
$wb['installation_txt'] = 'Installation';
$wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
$wb['acceptance_txt'] = 'Acceptance';
$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
$wb['install_language_txt'] = 'Interface language';
diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm
index 4aba7ed..4468475 100644
--- a/interface/web/sites/templates/aps_install_package.htm
+++ b/interface/web/sites/templates/aps_install_package.htm
@@ -48,8 +48,8 @@
<input type="hidden" name="install" value="0" />
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install'}" name="btn_install" onclick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel'}" onclick="loadContent('aps/availablepackages_list.php');"><span>{tmpl_var name='btn_cancel'}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('aps/availablepackages_list.php');"><span>{tmpl_var name='btn_cancel'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm
index 4631288..11de54f 100644
--- a/interface/web/sites/templates/aps_instances_list.htm
+++ b/interface/web/sites/templates/aps_instances_list.htm
@@ -14,7 +14,7 @@
</tmpl_if>
<th class="tbl_col_installlocation" scope="col">{tmpl_var name='install_location_txt'}</th>
<th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
- <th class="tbl_col_buttons" scope="col" > </th>
+ <th class="tbl_col_limit" scope="col" > </th>
</tr>
<tr class="filter">
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm
index bfd8c62..819bba0 100644
--- a/interface/web/sites/templates/aps_packages_list.htm
+++ b/interface/web/sites/templates/aps_packages_list.htm
@@ -13,7 +13,7 @@
<tmpl_if name='is_admin'>
<th class="tbl_col_status" scope="col">{tmpl_var name='status_txt'}</th>
</tmpl_if>
- <th class="tbl_col_buttons" scope="col" width="60px;"> </th>
+ <th class="tbl_col_limit" scope="col"> </th>
</tr>
<tr class="filter">
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
@@ -34,7 +34,7 @@
<tmpl_if name='is_admin'>
<td class="tbl_col_status"><a href="javascript:loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=change_status&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='package_status'}</span></a></td>
</tmpl_if>
- <td> </td>
+ <td class="tbl_col_buttons"> </td>
</tr>
</tmpl_loop>
</tbody>
diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm
index 0e33a88..93df0b1 100644
--- a/interface/web/sites/templates/database_user_admin_list.htm
+++ b/interface/web/sites/templates/database_user_admin_list.htm
@@ -1,4 +1,5 @@
<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_list_database_user_admin">
@@ -16,12 +17,12 @@
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
<table class="list">
<thead>
- <tr>
+ <tr class="caption">
<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>
+ <tr class="filter">
+ <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"><button type="button" class="button 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></td>
</tr>
</thead>
diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm
index b3e1efe..f1d80af 100644
--- a/interface/web/sites/templates/database_user_list.htm
+++ b/interface/web/sites/templates/database_user_list.htm
@@ -17,11 +17,11 @@
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
<table class="list">
<thead>
- <tr>
+ <tr class="caption">
<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>
+ <tr class="filter">
<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"><button type="button" class="button 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></td>
</tr>
diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm
index 51c3c33..46db0ad 100644
--- a/interface/web/sites/templates/web_backup_list.htm
+++ b/interface/web/sites/templates/web_backup_list.htm
@@ -16,7 +16,7 @@
<th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
<th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
<th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+ <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
</thead>
<tbody>
diff --git a/interface/web/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_domain_stats.htm
index d0f6f16..f497f1b 100644
--- a/interface/web/sites/templates/web_domain_stats.htm
+++ b/interface/web/sites/templates/web_domain_stats.htm
@@ -13,8 +13,13 @@
<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">
+ <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('stats_password','repeat_password');" />
+ <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>
diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm
index 0a4da64..5c40a79 100644
--- a/interface/web/sites/templates/web_sites_stats_list.htm
+++ b/interface/web/sites/templates/web_sites_stats_list.htm
@@ -37,17 +37,6 @@
<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="return false;" style="font-weight:bold;">{tmpl_var name="sum_txt"}</a></td>
- <td class="tbl_col_this_month"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_month"} MB</a></td>
- <td class="tbl_col_last_month"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_last_month"} MB</a></td>
- <td class="tbl_col_this_year"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_year"} MB</a></td>
- <td class="tbl_col_last_year"><a href="#" onclick="return false;" 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/sites/templates/web_vhost_subdomain_advanced.htm b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
index f61cf50..d71e30b 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
@@ -82,8 +82,8 @@
<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>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_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_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_backup.htm b/interface/web/sites/templates/web_vhost_subdomain_backup.htm
index 3c78fe7..6c55e50 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_backup.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_backup.htm
@@ -24,8 +24,8 @@
<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>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_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_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
index ddbdc04..ac504f1 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
@@ -26,8 +26,8 @@
<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>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_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_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
index 832d623..e5b13c1 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
@@ -60,8 +60,8 @@
<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>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_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_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_stats.htm b/interface/web/sites/templates/web_vhost_subdomain_stats.htm
index d0f6f16..aa1605e 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_stats.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_stats.htm
@@ -29,8 +29,8 @@
<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>
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_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_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm
index bf1ed65..9bd7ba3 100644
--- a/interface/web/tools/templates/dns_import_tupa.htm
+++ b/interface/web/tools/templates/dns_import_tupa.htm
@@ -1,7 +1,7 @@
-<h2>Import DNS recods from Tupa PowerDNS controlpanel</h2>
+<h2><tmpl_var name="list_head_txt">Import DNS recods from Tupa PowerDNS controlpanel</h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_import">
+<div class="panel panel_tupa_import">
<div class="pnl_formsarea">
<fieldset class="inlineLabels"><legend>PowerDNS Tupa import</legend>
@@ -28,8 +28,7 @@
<div class="multiField">
<input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
</div>
- </div>
-
+ </div>
<div class="ctrlHolder">
<p class="label">Import DNS Records</p>
<div class="multiField">
@@ -48,8 +47,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>Cancel</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
</div>
</div>
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index 465c8c5..f7b97e8 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -1,4 +1,4 @@
-<h2>{tmpl_var name="head_txt"}</h2>
+<h2><tmpl_var name="head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import">
@@ -91,13 +91,13 @@
<input type="hidden" name="connected" value="{tmpl_var name='connected'}">
<tmpl_if name="connected">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
</div>
<tmpl_else>
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
</div>
</tmpl_if>
</div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/import_plesk.htm b/interface/web/tools/templates/import_plesk.htm
index 10a73d7..363d728 100644
--- a/interface/web/tools/templates/import_plesk.htm
+++ b/interface/web/tools/templates/import_plesk.htm
@@ -1,4 +1,4 @@
-<h2>Import plesk panel data</h2>
+<h2><tmpl_var name="list_head_txt">Import plesk panel data</h2>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import">
@@ -66,8 +66,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/import_plesk.php');"><span>Start</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>Cancel</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_plesk.php');"><span>Start</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
</div>
</div>
diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm
index 978355f..a9057c8 100644
--- a/interface/web/tools/templates/interface_settings.htm
+++ b/interface/web/tools/templates/interface_settings.htm
@@ -12,6 +12,7 @@
{tmpl_var name='app_theme'}
</select>
</div>
+ <!-- TODO: Limit to activated modules -->
<div class="ctrlHolder">
<label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
<select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index 62b3a1d..f164660 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -1,4 +1,4 @@
-<h2>{tmpl_var name="head_txt"}</h2>
+<h2><tmpl_var name="head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import">
@@ -59,8 +59,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/resync.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/resync.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
</div>
</div>
--
Gitblit v1.9.1