From e27086410672d7c4efe37aac0505007fe26d6e8b Mon Sep 17 00:00:00 2001 From: mcramer Date: Wed, 29 Aug 2012 11:35:16 +0000 Subject: [PATCH] Fixed: onClick attributes changed to valid onclick (lower case) Fixed: password match function blocked tabs incorrectly Fixed: set focus on username input field threw an error if this field did not exist on a page --- interface/lib/classes/cmstree.inc.php | 4 +-- .../classes/listform_tpl_generator.inc.php | 6 ++-- interface/lib/classes/tform_actions.inc.php | 2 +- .../lib/classes/tform_tpl_generator.inc.php | 4 +-- .../web/admin/lib/lang/en_iptables_list.lng | 2 +- interface/web/admin/login_as.php | 4 +-- .../web/admin/software_package_install.php | 2 +- interface/web/admin/software_package_list.php | 2 +- interface/web/admin/software_update_list.php | 4 +-- .../web/admin/templates/firewall_edit.htm | 4 +-- .../web/admin/templates/firewall_list.htm | 12 +++---- interface/web/admin/templates/groups_edit.htm | 4 +-- interface/web/admin/templates/groups_list.htm | 8 ++--- .../web/admin/templates/iptables_edit.htm | 4 +-- .../web/admin/templates/iptables_list.htm | 20 +++++------ .../web/admin/templates/language_add.htm | 4 +-- .../web/admin/templates/language_complete.htm | 4 +-- .../web/admin/templates/language_edit.htm | 4 +-- .../web/admin/templates/language_export.htm | 4 +-- .../web/admin/templates/language_import.htm | 4 +-- .../web/admin/templates/language_list.htm | 6 ++-- .../templates/remote_action_ispcupdate.htm | 2 +- .../templates/remote_action_osupdate.htm | 2 +- .../web/admin/templates/remote_user_edit.htm | 6 ++-- .../web/admin/templates/remote_user_list.htm | 8 ++--- .../templates/server_config_cron_edit.htm | 4 +-- .../templates/server_config_dns_edit.htm | 4 +-- .../templates/server_config_fastcgi_edit.htm | 4 +-- .../templates/server_config_getmail_edit.htm | 4 +-- .../templates/server_config_jailkit_edit.htm | 4 +-- .../admin/templates/server_config_list.htm | 4 +-- .../templates/server_config_mail_edit.htm | 4 +-- .../templates/server_config_rescue_edit.htm | 4 +-- .../templates/server_config_server_edit.htm | 4 +-- .../templates/server_config_ufw_edit.htm | 4 +-- .../templates/server_config_vlogger_edit.htm | 4 +-- .../templates/server_config_web_edit.htm | 4 +-- .../admin/templates/server_edit_config.htm | 4 +-- .../admin/templates/server_edit_services.htm | 4 +-- .../web/admin/templates/server_ip_edit.htm | 4 +-- .../web/admin/templates/server_ip_list.htm | 16 ++++----- interface/web/admin/templates/server_list.htm | 4 +-- .../templates/server_php_fastcgi_edit.htm | 4 +-- .../admin/templates/server_php_fpm_edit.htm | 4 +-- .../web/admin/templates/server_php_list.htm | 10 +++--- .../admin/templates/server_php_name_edit.htm | 4 +-- .../templates/software_package_install.htm | 4 +-- .../admin/templates/software_package_list.htm | 2 +- .../admin/templates/software_repo_edit.htm | 4 +-- .../admin/templates/software_repo_list.htm | 10 +++--- .../templates/system_config_domains_edit.htm | 4 +-- .../templates/system_config_mail_edit.htm | 4 +-- .../templates/system_config_misc_edit.htm | 4 +-- .../templates/system_config_sites_edit.htm | 4 +-- .../web/admin/templates/tpl_default_basic.htm | 4 +-- .../web/admin/templates/users_groups_edit.htm | 4 +-- interface/web/admin/templates/users_list.htm | 10 +++--- .../web/admin/templates/users_user_edit.htm | 6 ++-- .../client/templates/client_circle_edit.htm | 4 +-- .../client/templates/client_circle_list.htm | 12 +++---- interface/web/client/templates/client_del.htm | 4 +-- .../client/templates/client_edit_address.htm | 6 ++-- .../client/templates/client_edit_limits.htm | 8 ++--- .../web/client/templates/client_message.htm | 4 +-- .../templates/client_template_edit_limits.htm | 4 +-- .../client_template_edit_template.htm | 4 +-- .../client/templates/client_template_list.htm | 10 +++--- .../web/client/templates/clients_list.htm | 14 ++++---- .../web/client/templates/domain_edit.htm | 4 +-- .../web/client/templates/domain_list.htm | 10 +++--- .../templates/reseller_edit_address.htm | 6 ++-- .../client/templates/reseller_edit_limits.htm | 4 +-- .../web/client/templates/resellers_list.htm | 12 +++---- interface/web/designer/form_show.php | 18 +++++----- interface/web/designer/module_show.php | 18 +++++----- .../web/designer/templates/form_edit.htm | 2 +- .../web/designer/templates/form_show.htm | 6 ++-- .../web/designer/templates/module_edit.htm | 4 +-- .../designer/templates/module_nav_edit.htm | 4 +-- .../templates/module_nav_item_edit.htm | 4 +-- .../web/designer/templates/module_show.htm | 6 ++-- interface/web/dns/templates/dns_a_edit.htm | 4 +-- interface/web/dns/templates/dns_a_list.htm | 34 +++++++++---------- interface/web/dns/templates/dns_aaaa_edit.htm | 4 +-- .../web/dns/templates/dns_alias_edit.htm | 4 +-- .../web/dns/templates/dns_cname_edit.htm | 4 +-- .../web/dns/templates/dns_hinfo_edit.htm | 4 +-- interface/web/dns/templates/dns_import.htm | 4 +-- interface/web/dns/templates/dns_mx_edit.htm | 4 +-- interface/web/dns/templates/dns_ns_edit.htm | 4 +-- interface/web/dns/templates/dns_ptr_edit.htm | 4 +-- interface/web/dns/templates/dns_rp_edit.htm | 4 +-- .../web/dns/templates/dns_slave_edit.htm | 4 +-- .../web/dns/templates/dns_slave_list.htm | 12 +++---- interface/web/dns/templates/dns_soa_edit.htm | 4 +-- interface/web/dns/templates/dns_soa_list.htm | 18 +++++----- interface/web/dns/templates/dns_srv_edit.htm | 4 +-- .../web/dns/templates/dns_template_edit.htm | 4 +-- .../web/dns/templates/dns_template_list.htm | 8 ++--- interface/web/dns/templates/dns_txt_edit.htm | 4 +-- interface/web/dns/templates/dns_wizard.htm | 4 +-- interface/web/help/templates/faq_edit.htm | 4 +-- .../templates/faq_manage_questions_list.htm | 2 +- .../web/help/templates/faq_sections_edit.htm | 4 +-- .../web/help/templates/help_faq_list.htm | 2 +- .../help/templates/help_faq_sections_list.htm | 2 +- .../help/templates/support_message_edit.htm | 4 +-- .../help/templates/support_message_list.htm | 8 ++--- .../help/templates/support_message_view.htm | 2 +- interface/web/js/scrigo.js.php | 17 ++++++++-- interface/web/login/logout.php | 4 +-- interface/web/login/templates/index.htm | 2 +- .../web/login/templates/password_reset.htm | 2 +- .../web/mail/templates/mail_alias_edit.htm | 4 +-- .../web/mail/templates/mail_alias_list.htm | 10 +++--- .../mail/templates/mail_aliasdomain_edit.htm | 4 +-- .../mail/templates/mail_aliasdomain_list.htm | 10 +++--- .../mail/templates/mail_blacklist_edit.htm | 4 +-- .../mail/templates/mail_blacklist_list.htm | 12 +++---- .../templates/mail_content_filter_edit.htm | 4 +-- .../templates/mail_content_filter_list.htm | 12 +++---- .../mail/templates/mail_domain_admin_list.htm | 12 +++---- .../templates/mail_domain_catchall_edit.htm | 4 +-- .../templates/mail_domain_catchall_list.htm | 10 +++--- .../web/mail/templates/mail_domain_edit.htm | 4 +-- .../web/mail/templates/mail_domain_list.htm | 10 +++--- .../web/mail/templates/mail_forward_edit.htm | 4 +-- .../web/mail/templates/mail_forward_list.htm | 10 +++--- .../web/mail/templates/mail_get_edit.htm | 4 +-- .../web/mail/templates/mail_get_list.htm | 14 ++++---- .../mail/templates/mail_mailinglist_edit.htm | 6 ++-- .../mail/templates/mail_mailinglist_list.htm | 8 ++--- .../templates/mail_relay_recipient_edit.htm | 4 +-- .../templates/mail_relay_recipient_list.htm | 10 +++--- .../mail/templates/mail_transport_edit.htm | 4 +-- .../mail/templates/mail_transport_list.htm | 14 ++++---- .../mail_user_autoresponder_edit.htm | 4 +-- .../templates/mail_user_custom_rules_edit.htm | 4 +-- .../mail/templates/mail_user_filter_edit.htm | 4 +-- .../mail/templates/mail_user_filter_list.htm | 4 +-- .../web/mail/templates/mail_user_list.htm | 12 +++---- .../mail/templates/mail_user_mailbox_edit.htm | 6 ++-- .../templates/mail_user_mailfilter_edit.htm | 4 +-- .../mail/templates/mail_user_stats_list.htm | 12 +++---- .../mail/templates/mail_whitelist_edit.htm | 4 +-- .../mail/templates/mail_whitelist_list.htm | 12 +++---- .../templates/spamfilter_blacklist_edit.htm | 4 +-- .../templates/spamfilter_blacklist_list.htm | 14 ++++---- .../spamfilter_config_getmail_edit.htm | 4 +-- .../mail/templates/spamfilter_config_list.htm | 6 ++-- .../templates/spamfilter_config_mail_edit.htm | 4 +-- .../spamfilter_config_server_edit.htm | 4 +-- .../mail/templates/spamfilter_other_edit.htm | 4 +-- .../mail/templates/spamfilter_policy_edit.htm | 4 +-- .../mail/templates/spamfilter_policy_list.htm | 14 ++++---- .../templates/spamfilter_quarantine_edit.htm | 4 +-- .../templates/spamfilter_taglevel_edit.htm | 4 +-- .../mail/templates/spamfilter_users_edit.htm | 4 +-- .../mail/templates/spamfilter_users_list.htm | 14 ++++---- .../templates/spamfilter_whitelist_edit.htm | 4 +-- .../templates/spamfilter_whitelist_list.htm | 14 ++++---- .../mail/templates/user_quota_stats_list.htm | 10 +++--- .../mail_user_autoresponder_edit.htm | 4 +-- .../mailuser/templates/mail_user_cc_edit.htm | 4 +-- .../templates/mail_user_filter_edit.htm | 4 +-- .../templates/mail_user_filter_list.htm | 6 ++-- .../templates/mail_user_password_edit.htm | 6 ++-- .../templates/mail_user_spamfilter_edit.htm | 4 +-- .../web/monitor/templates/datalog_list.htm | 2 +- .../web/monitor/templates/syslog_list.htm | 2 +- .../sites/templates/aps_install_package.htm | 4 +-- .../sites/templates/aps_instances_list.htm | 6 ++-- .../templates/aps_packagedetails_show.htm | 2 +- .../web/sites/templates/aps_packages_list.htm | 4 +-- interface/web/sites/templates/cron_edit.htm | 4 +-- interface/web/sites/templates/cron_list.htm | 22 ++++++------ .../sites/templates/database_admin_list.htm | 16 ++++----- .../web/sites/templates/database_edit.htm | 4 +-- .../web/sites/templates/database_list.htm | 14 ++++---- .../templates/database_user_admin_list.htm | 6 ++-- .../sites/templates/database_user_edit.htm | 6 ++-- .../sites/templates/database_user_list.htm | 6 ++-- .../web/sites/templates/ftp_user_advanced.htm | 4 +-- .../templates/ftp_user_advanced_client.htm | 4 +-- .../web/sites/templates/ftp_user_edit.htm | 6 ++-- .../web/sites/templates/ftp_user_list.htm | 12 +++---- .../sites/templates/shell_user_advanced.htm | 4 +-- .../web/sites/templates/shell_user_edit.htm | 6 ++-- .../web/sites/templates/shell_user_list.htm | 12 +++---- .../sites/templates/user_quota_stats_list.htm | 14 ++++---- .../sites/templates/web_aliasdomain_edit.htm | 4 +-- .../sites/templates/web_aliasdomain_list.htm | 12 +++---- .../web/sites/templates/web_backup_list.htm | 4 +-- .../sites/templates/web_domain_admin_list.htm | 14 ++++---- .../sites/templates/web_domain_advanced.htm | 4 +-- .../web/sites/templates/web_domain_backup.htm | 4 +-- .../web/sites/templates/web_domain_edit.htm | 2 +- .../web/sites/templates/web_domain_list.htm | 12 +++---- .../sites/templates/web_domain_redirect.htm | 4 +-- .../web/sites/templates/web_domain_ssl.htm | 4 +-- .../web/sites/templates/web_domain_stats.htm | 6 ++-- .../web/sites/templates/web_folder_edit.htm | 4 +-- .../web/sites/templates/web_folder_list.htm | 12 +++---- .../sites/templates/web_folder_user_edit.htm | 6 ++-- .../sites/templates/web_folder_user_list.htm | 10 +++--- .../sites/templates/web_sites_stats_list.htm | 22 ++++++------ .../sites/templates/web_subdomain_edit.htm | 4 +-- .../sites/templates/web_subdomain_list.htm | 12 +++---- .../web_vhost_subdomain_advanced.htm | 4 +-- .../templates/web_vhost_subdomain_backup.htm | 4 +-- .../templates/web_vhost_subdomain_edit.htm | 2 +- .../templates/web_vhost_subdomain_list.htm | 12 +++---- .../web_vhost_subdomain_redirect.htm | 4 +-- .../templates/web_vhost_subdomain_ssl.htm | 4 +-- .../templates/web_vhost_subdomain_stats.htm | 6 ++-- .../web/sites/templates/webdav_user_edit.htm | 6 ++-- .../web/sites/templates/webdav_user_list.htm | 12 +++---- .../themes/default/templates/sidenav.tpl.htm | 4 +-- .../themes/default/templates/topnav.tpl.htm | 2 +- .../web/tools/templates/dns_import_tupa.htm | 4 +-- .../web/tools/templates/import_ispconfig.htm | 8 ++--- .../web/tools/templates/import_plesk.htm | 4 +-- .../tools/templates/interface_settings.htm | 4 +-- interface/web/tools/templates/resync.htm | 4 +-- interface/web/tools/templates/tpl_default.htm | 4 +-- .../web/tools/templates/user_settings.htm | 6 ++-- interface/web/vm/templates/openvz_action.htm | 4 +-- interface/web/vm/templates/openvz_ip_edit.htm | 4 +-- interface/web/vm/templates/openvz_ip_list.htm | 12 +++---- .../vm/templates/openvz_ostemplate_edit.htm | 4 +-- .../vm/templates/openvz_ostemplate_list.htm | 14 ++++---- .../openvz_template_advanced_edit.htm | 4 +-- .../web/vm/templates/openvz_template_edit.htm | 4 +-- .../web/vm/templates/openvz_template_list.htm | 8 ++--- .../vm/templates/openvz_vm_advanced_edit.htm | 4 +-- interface/web/vm/templates/openvz_vm_edit.htm | 4 +-- interface/web/vm/templates/openvz_vm_list.htm | 18 +++++----- 237 files changed, 757 insertions(+), 746 deletions(-) diff --git a/interface/lib/classes/cmstree.inc.php b/interface/lib/classes/cmstree.inc.php index 2a590008e2..d83fb297e5 100644 --- a/interface/lib/classes/cmstree.inc.php +++ b/interface/lib/classes/cmstree.inc.php @@ -100,9 +100,9 @@ class cmstree */ $val_id = $val->id; if($_SESSION['s']['cat_open'][$val_id] == 1) { - $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; + $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; } else { - $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; + $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; } $optionlist[] = array( media_cat => $kategorie, diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php index 25505f7ded..ff4f3e7ef4 100644 --- a/interface/lib/classes/listform_tpl_generator.inc.php +++ b/interface/lib/classes/listform_tpl_generator.inc.php @@ -44,7 +44,7 @@ class listform_tpl_generator {
{tmpl_var name="toolsarea_head_txt"}
-
@@ -79,7 +79,7 @@ class listform_tpl_generator { } } - $html .= '
+ $html .= '
@@ -89,7 +89,7 @@ class listform_tpl_generator { foreach($listDef["item"] as $field) { $key = $field["field"]; - $html .= " {tmpl_var name=\"".$key."\"}\n"; + $html .= " {tmpl_var name=\"".$key."\"}\n"; } $html .= " diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index 5235da7c0b..d536f4b364 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -486,7 +486,7 @@ class tform_actions { $navibar .= 'Drucken  '; } if($app->tform->formDef['template_mailsend'] != '') { - $navibar .= "tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\">\"Als"; + $navibar .= "tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\">\"Als"; } $app->tpl->setVar('form_navibar',$navibar); } diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php index 053e8dfbbf..4767ad0b4b 100644 --- a/interface/lib/classes/tform_tpl_generator.inc.php +++ b/interface/lib/classes/tform_tpl_generator.inc.php @@ -136,8 +136,8 @@ class tform_tpl_generator {
- - + +
diff --git a/interface/web/admin/lib/lang/en_iptables_list.lng b/interface/web/admin/lib/lang/en_iptables_list.lng index 0b9f68697b..229374adf4 100644 --- a/interface/web/admin/lib/lang/en_iptables_list.lng +++ b/interface/web/admin/lib/lang/en_iptables_list.lng @@ -13,7 +13,7 @@ templates/iptables_list.htm: templates/iptables_list.htm: templates/iptables_list.htm: -templates/iptables_list.htm: templates/iptables_list.htm: {tmpl_var name='delete_txt'} */ diff --git a/interface/web/admin/login_as.php b/interface/web/admin/login_as.php index 0f9c259346..807897763f 100644 --- a/interface/web/admin/login_as.php +++ b/interface/web/admin/login_as.php @@ -78,8 +78,8 @@ echo '
- - + +
'; ?> diff --git a/interface/web/admin/software_package_install.php b/interface/web/admin/software_package_install.php index eb7a72ab16..9957c14de4 100644 --- a/interface/web/admin/software_package_install.php +++ b/interface/web/admin/software_package_install.php @@ -129,7 +129,7 @@ if($install_server_id > 0 && $package_name != '' && ($package['package_installab //* Add the record to start the install process $insert_data = "(package_name, server_id, software_update_id, status) VALUES ('$package_name', '$install_server_id', '$software_update_id','installing')"; $app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id'); - $message_ok = 'Starting package installation '."".$app->lng('next').""; + $message_ok = 'Starting package installation '."".$app->lng('next').""; } diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php index dd73c14083..c9380052c7 100644 --- a/interface/web/admin/software_package_list.php +++ b/interface/web/admin/software_package_list.php @@ -165,7 +165,7 @@ if(is_array($packages)) { if($p['package_installable'] == 'no') { $installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."
"; } else { - $installed_txt .= $s['server_name'].": Install now
"; + $installed_txt .= $s['server_name'].": Install now
"; } } } diff --git a/interface/web/admin/software_update_list.php b/interface/web/admin/software_update_list.php index 734f369343..226a5693a1 100644 --- a/interface/web/admin/software_update_list.php +++ b/interface/web/admin/software_update_list.php @@ -175,7 +175,7 @@ if(is_array($installed_packages)) { foreach($updates as $key => $u) { $version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4']; - $installed_txt = "Install Update
"; + $installed_txt = "Install Update
"; $records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt); } @@ -199,7 +199,7 @@ if(is_array($updates)) { if($u['status'] == 'installed' || $u['status'] == 'installing' || $u['status'] == 'deleting') { $installed_txt .= "Installed version $version
"; } else { - $installed_txt .= "Install now
"; + $installed_txt .= "Install now
"; } $updates[$key]['installed'] = $installed_txt; diff --git a/interface/web/admin/templates/firewall_edit.htm b/interface/web/admin/templates/firewall_edit.htm index 827c1c8b9f..b297f0a006 100644 --- a/interface/web/admin/templates/firewall_edit.htm +++ b/interface/web/admin/templates/firewall_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm index 53e2e4bc39..e9cb42527e 100644 --- a/interface/web/admin/templates/firewall_list.htm +++ b/interface/web/admin/templates/firewall_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="tcp_port"} - {tmpl_var name="udp_port"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="tcp_port"} + {tmpl_var name="udp_port"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/groups_edit.htm b/interface/web/admin/templates/groups_edit.htm index b5fe764944..c38317236a 100644 --- a/interface/web/admin/templates/groups_edit.htm +++ b/interface/web/admin/templates/groups_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm index 6cdbcc394e..2718d1f10e 100644 --- a/interface/web/admin/templates/groups_list.htm +++ b/interface/web/admin/templates/groups_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-

@@ -27,15 +27,15 @@ - + - {tmpl_var name="name"} - {tmpl_var name="description"} + {tmpl_var name="name"} + {tmpl_var name="description"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/iptables_edit.htm b/interface/web/admin/templates/iptables_edit.htm index 87033ab2c1..283c5e78db 100644 --- a/interface/web/admin/templates/iptables_edit.htm +++ b/interface/web/admin/templates/iptables_edit.htm @@ -57,9 +57,9 @@
- -
diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm index f1159f3292..b570b97d2f 100644 --- a/interface/web/admin/templates/iptables_list.htm +++ b/interface/web/admin/templates/iptables_list.htm @@ -5,7 +5,7 @@
Tools
-
@@ -37,21 +37,21 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="table"} - {tmpl_var name="protocol"} - {tmpl_var name="singleport"} - {tmpl_var name="multiport"} - {tmpl_var name="state"} - {tmpl_var name="target"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="table"} + {tmpl_var name="protocol"} + {tmpl_var name="singleport"} + {tmpl_var name="multiport"} + {tmpl_var name="state"} + {tmpl_var name="target"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm index 540fc97657..0cab8abac7 100644 --- a/interface/web/admin/templates/language_add.htm +++ b/interface/web/admin/templates/language_add.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm index 7416a7096c..86d3a44d45 100644 --- a/interface/web/admin/templates/language_complete.htm +++ b/interface/web/admin/templates/language_complete.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_edit.htm b/interface/web/admin/templates/language_edit.htm index 3767a178eb..30bd927eb2 100644 --- a/interface/web/admin/templates/language_edit.htm +++ b/interface/web/admin/templates/language_edit.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm index 40856220c9..98be4b5f4a 100644 --- a/interface/web/admin/templates/language_export.htm +++ b/interface/web/admin/templates/language_export.htm @@ -20,8 +20,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm index 30289448f2..85ea2a97d1 100644 --- a/interface/web/admin/templates/language_import.htm +++ b/interface/web/admin/templates/language_import.htm @@ -33,8 +33,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm index c0718decdf..ce1bf64b43 100644 --- a/interface/web/admin/templates/language_list.htm +++ b/interface/web/admin/templates/language_list.htm @@ -29,9 +29,9 @@ - {tmpl_var name="module"} - {tmpl_var name="lang_file"} - {tmpl_var name="lang_file_date"} + {tmpl_var name="module"} + {tmpl_var name="lang_file"} + {tmpl_var name="lang_file_date"} diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm index 6c903bad7c..219c6fd842 100644 --- a/interface/web/admin/templates/remote_action_ispcupdate.htm +++ b/interface/web/admin/templates/remote_action_ispcupdate.htm @@ -25,7 +25,7 @@
- +
--> diff --git a/interface/web/admin/templates/remote_action_osupdate.htm b/interface/web/admin/templates/remote_action_osupdate.htm index 034947355f..05f2b29636 100644 --- a/interface/web/admin/templates/remote_action_osupdate.htm +++ b/interface/web/admin/templates/remote_action_osupdate.htm @@ -18,7 +18,7 @@
- +
diff --git a/interface/web/admin/templates/remote_user_edit.htm b/interface/web/admin/templates/remote_user_edit.htm index 1b7d22a5c4..69dd61ccfe 100644 --- a/interface/web/admin/templates/remote_user_edit.htm +++ b/interface/web/admin/templates/remote_user_edit.htm @@ -13,7 +13,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -39,8 +39,8 @@
- - + +
diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm index 131c1aa3d2..c7e86b44c9 100644 --- a/interface/web/admin/templates/remote_user_list.htm +++ b/interface/web/admin/templates/remote_user_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -25,15 +25,15 @@   - + - {tmpl_var name="remote_userid"} - {tmpl_var name="remote_username"} + {tmpl_var name="remote_userid"} + {tmpl_var name="remote_username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_config_cron_edit.htm b/interface/web/admin/templates/server_config_cron_edit.htm index 17c811ba27..4f9d283e1a 100644 --- a/interface/web/admin/templates/server_config_cron_edit.htm +++ b/interface/web/admin/templates/server_config_cron_edit.htm @@ -22,8 +22,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_dns_edit.htm b/interface/web/admin/templates/server_config_dns_edit.htm index c308ec495c..541c9d7f97 100644 --- a/interface/web/admin/templates/server_config_dns_edit.htm +++ b/interface/web/admin/templates/server_config_dns_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm index ad9444060a..88d06d7018 100644 --- a/interface/web/admin/templates/server_config_fastcgi_edit.htm +++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm @@ -44,8 +44,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm index 21492e4c89..8dc900de51 100644 --- a/interface/web/admin/templates/server_config_getmail_edit.htm +++ b/interface/web/admin/templates/server_config_getmail_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm index 19e0416e61..9d7864b342 100644 --- a/interface/web/admin/templates/server_config_jailkit_edit.htm +++ b/interface/web/admin/templates/server_config_jailkit_edit.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm index b2f0aa352d..05efdcb226 100644 --- a/interface/web/admin/templates/server_config_list.htm +++ b/interface/web/admin/templates/server_config_list.htm @@ -14,14 +14,14 @@ - + - {tmpl_var name="server_name"} + {tmpl_var name="server_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index 72292b32bf..4bfd430b94 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -86,8 +86,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm index 0310344013..778225b3e6 100644 --- a/interface/web/admin/templates/server_config_rescue_edit.htm +++ b/interface/web/admin/templates/server_config_rescue_edit.htm @@ -36,8 +36,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm index 3cb6848164..54fba4943d 100644 --- a/interface/web/admin/templates/server_config_server_edit.htm +++ b/interface/web/admin/templates/server_config_server_edit.htm @@ -59,8 +59,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm index e0a1ded29d..12a94aee18 100644 --- a/interface/web/admin/templates/server_config_ufw_edit.htm +++ b/interface/web/admin/templates/server_config_ufw_edit.htm @@ -58,8 +58,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_vlogger_edit.htm b/interface/web/admin/templates/server_config_vlogger_edit.htm index c960fb131a..9f6c02896f 100644 --- a/interface/web/admin/templates/server_config_vlogger_edit.htm +++ b/interface/web/admin/templates/server_config_vlogger_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index c0c9b3b963..7ff0c06112 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -217,8 +217,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_edit_config.htm b/interface/web/admin/templates/server_edit_config.htm index e5e2392411..d6ad468b5f 100644 --- a/interface/web/admin/templates/server_edit_config.htm +++ b/interface/web/admin/templates/server_edit_config.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm index f6e47323c2..595f16d5d2 100644 --- a/interface/web/admin/templates/server_edit_services.htm +++ b/interface/web/admin/templates/server_edit_services.htm @@ -62,8 +62,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_ip_edit.htm b/interface/web/admin/templates/server_ip_edit.htm index 35718ceed8..09055c40d2 100644 --- a/interface/web/admin/templates/server_ip_edit.htm +++ b/interface/web/admin/templates/server_ip_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm index c82e9a334f..eef98aadd8 100644 --- a/interface/web/admin/templates/server_ip_list.htm +++ b/interface/web/admin/templates/server_ip_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -33,19 +33,19 @@ - + - {tmpl_var name="server_id"} - {tmpl_var name="client_id"} - {tmpl_var name="ip_type"} - {tmpl_var name="ip_address"} - {tmpl_var name="virtualhost"} - {tmpl_var name="virtualhost_port"} + {tmpl_var name="server_id"} + {tmpl_var name="client_id"} + {tmpl_var name="ip_type"} + {tmpl_var name="ip_address"} + {tmpl_var name="virtualhost"} + {tmpl_var name="virtualhost_port"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm index fd2da095cb..413ce4642b 100644 --- a/interface/web/admin/templates/server_list.htm +++ b/interface/web/admin/templates/server_list.htm @@ -26,14 +26,14 @@ - + - {tmpl_var name="server_name"} + {tmpl_var name="server_name"} {tmpl_var name="mail_server"} {tmpl_var name="web_server"} {tmpl_var name="dns_server"} diff --git a/interface/web/admin/templates/server_php_fastcgi_edit.htm b/interface/web/admin/templates/server_php_fastcgi_edit.htm index 21eba02678..bfc2978a3e 100644 --- a/interface/web/admin/templates/server_php_fastcgi_edit.htm +++ b/interface/web/admin/templates/server_php_fastcgi_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_php_fpm_edit.htm b/interface/web/admin/templates/server_php_fpm_edit.htm index 92cd4a88ba..869af3c481 100644 --- a/interface/web/admin/templates/server_php_fpm_edit.htm +++ b/interface/web/admin/templates/server_php_fpm_edit.htm @@ -22,8 +22,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm index f41ff26355..f8c67558d2 100644 --- a/interface/web/admin/templates/server_php_list.htm +++ b/interface/web/admin/templates/server_php_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,16 +27,16 @@ - + - {tmpl_var name="server_id"} - {tmpl_var name="client_id"} - {tmpl_var name="name"} + {tmpl_var name="server_id"} + {tmpl_var name="client_id"} + {tmpl_var name="name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm index d9e88ff192..c1e02a10ed 100644 --- a/interface/web/admin/templates/server_php_name_edit.htm +++ b/interface/web/admin/templates/server_php_name_edit.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/admin/templates/software_package_install.htm b/interface/web/admin/templates/software_package_install.htm index 1d2d4de95b..3c2814439a 100644 --- a/interface/web/admin/templates/software_package_install.htm +++ b/interface/web/admin/templates/software_package_install.htm @@ -21,8 +21,8 @@

 

- - + +
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm index f9e1a25b09..8fc0973310 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
diff --git a/interface/web/admin/templates/software_repo_edit.htm b/interface/web/admin/templates/software_repo_edit.htm index bd8b230522..fc5c38d9a4 100644 --- a/interface/web/admin/templates/software_repo_edit.htm +++ b/interface/web/admin/templates/software_repo_edit.htm @@ -32,8 +32,8 @@
- - + +
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm index 66aa396633..466e8f8eda 100644 --- a/interface/web/admin/templates/software_repo_list.htm +++ b/interface/web/admin/templates/software_repo_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="repo_name"} - {tmpl_var name="repo_url"} + {tmpl_var name="active"} + {tmpl_var name="repo_name"} + {tmpl_var name="repo_url"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/system_config_domains_edit.htm b/interface/web/admin/templates/system_config_domains_edit.htm index 605587900d..748729d911 100644 --- a/interface/web/admin/templates/system_config_domains_edit.htm +++ b/interface/web/admin/templates/system_config_domains_edit.htm @@ -25,8 +25,8 @@
- - + +
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm index 013c39ae06..91fcc1f7c9 100644 --- a/interface/web/admin/templates/system_config_mail_edit.htm +++ b/interface/web/admin/templates/system_config_mail_edit.htm @@ -72,8 +72,8 @@
- - + +
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm index dfb19eb5b7..3bdd72ee90 100644 --- a/interface/web/admin/templates/system_config_misc_edit.htm +++ b/interface/web/admin/templates/system_config_misc_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index 121d607a38..ba1796fcdd 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -50,8 +50,8 @@
- - + +
diff --git a/interface/web/admin/templates/tpl_default_basic.htm b/interface/web/admin/templates/tpl_default_basic.htm index f6a63716c3..a52533165d 100644 --- a/interface/web/admin/templates/tpl_default_basic.htm +++ b/interface/web/admin/templates/tpl_default_basic.htm @@ -15,8 +15,8 @@
- - + +
diff --git a/interface/web/admin/templates/users_groups_edit.htm b/interface/web/admin/templates/users_groups_edit.htm index cb52ae32b5..3d3644dba2 100644 --- a/interface/web/admin/templates/users_groups_edit.htm +++ b/interface/web/admin/templates/users_groups_edit.htm @@ -22,8 +22,8 @@
- - + +
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index 1b824866b7..e67050c857 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-

@@ -31,16 +31,16 @@ - + - {tmpl_var name="client_id"} - {tmpl_var name="active"} -
{tmpl_var name="typ"}
{tmpl_var name="username"}
+ {tmpl_var name="client_id"} + {tmpl_var name="active"} +
{tmpl_var name="typ"}
{tmpl_var name="username"}
{tmpl_var name="groups"} diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm index 4abe793588..186322e43c 100644 --- a/interface/web/admin/templates/users_user_edit.htm +++ b/interface/web/admin/templates/users_user_edit.htm @@ -11,7 +11,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -65,8 +65,8 @@
- - + +
diff --git a/interface/web/client/templates/client_circle_edit.htm b/interface/web/client/templates/client_circle_edit.htm index 1616dd4773..95c5f32698 100644 --- a/interface/web/client/templates/client_circle_edit.htm +++ b/interface/web/client/templates/client_circle_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm index 08a8148ef5..c7869d3b5f 100644 --- a/interface/web/client/templates/client_circle_list.htm +++ b/interface/web/client/templates/client_circle_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="circle_id"} - {tmpl_var name="active"} - {tmpl_var name="circle_name"} - {tmpl_var name="description"} + {tmpl_var name="circle_id"} + {tmpl_var name="active"} + {tmpl_var name="circle_name"} + {tmpl_var name="description"} {tmpl_var name='delete_txt'} diff --git a/interface/web/client/templates/client_del.htm b/interface/web/client/templates/client_del.htm index aeb206f107..ff254881c5 100644 --- a/interface/web/client/templates/client_del.htm +++ b/interface/web/client/templates/client_del.htm @@ -17,8 +17,8 @@
- - + +
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm index 076f4b021f..c03827e9f1 100644 --- a/interface/web/client/templates/client_edit_address.htm +++ b/interface/web/client/templates/client_edit_address.htm @@ -23,7 +23,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -132,8 +132,8 @@
- - + +
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 83928dd7fa..4aae4739c0 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -7,8 +7,8 @@
{tmpl_var name="toolsarea_head_txt"}
- - + +
@@ -283,8 +283,8 @@
- - + +
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm index 20afdb1112..6cff7105c4 100644 --- a/interface/web/client/templates/client_message.htm +++ b/interface/web/client/templates/client_message.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm index 91f9bd52d9..e7b28f17dd 100644 --- a/interface/web/client/templates/client_template_edit_limits.htm +++ b/interface/web/client/templates/client_template_edit_limits.htm @@ -222,8 +222,8 @@
- - + +
diff --git a/interface/web/client/templates/client_template_edit_template.htm b/interface/web/client/templates/client_template_edit_template.htm index 232fa55fa7..79ea1094af 100644 --- a/interface/web/client/templates/client_template_edit_template.htm +++ b/interface/web/client/templates/client_template_edit_template.htm @@ -20,8 +20,8 @@
- - + +
diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm index 81d93fd9b2..a760a17d3d 100644 --- a/interface/web/client/templates/client_template_list.htm +++ b/interface/web/client/templates/client_template_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="template_id"} - {tmpl_var name="template_type"} - {tmpl_var name="template_name"} + {tmpl_var name="template_id"} + {tmpl_var name="template_type"} + {tmpl_var name="template_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index cc948ce2f4..7183765598 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -34,18 +34,18 @@ - + - {tmpl_var name="client_id"} - {tmpl_var name="company_name"} - {tmpl_var name="contact_name"} - {tmpl_var name="username"} - {tmpl_var name="city"} + {tmpl_var name="client_id"} + {tmpl_var name="company_name"} + {tmpl_var name="contact_name"} + {tmpl_var name="username"} + {tmpl_var name="city"}
{tmpl_var name="country"}
diff --git a/interface/web/client/templates/domain_edit.htm b/interface/web/client/templates/domain_edit.htm index 5a6bef3965..03f3aaf2ff 100644 --- a/interface/web/client/templates/domain_edit.htm +++ b/interface/web/client/templates/domain_edit.htm @@ -32,8 +32,8 @@
- - + +
diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm index 3f45632a55..ef52ffc472 100644 --- a/interface/web/client/templates/domain_list.htm +++ b/interface/web/client/templates/domain_list.htm @@ -7,11 +7,11 @@
{tmpl_var name="toolsarea_head_txt"}
- - @@ -31,14 +31,14 @@ - + - {tmpl_var name="domain"} - {tmpl_var name="sys_groupid"} + {tmpl_var name="domain"} + {tmpl_var name="sys_groupid"} {tmpl_var name='delete_txt'} diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm index d58ee93b7e..ac6df07424 100644 --- a/interface/web/client/templates/reseller_edit_address.htm +++ b/interface/web/client/templates/reseller_edit_address.htm @@ -23,7 +23,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -108,8 +108,8 @@
- - + +
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm index 621dfa2b3b..4c4b06f962 100644 --- a/interface/web/client/templates/reseller_edit_limits.htm +++ b/interface/web/client/templates/reseller_edit_limits.htm @@ -271,8 +271,8 @@
- - + +
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index f5e1726d12..c1880577a8 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,17 +32,17 @@ - + - {tmpl_var name="client_id"} - {tmpl_var name="company_name"} - {tmpl_var name="contact_name"} - {tmpl_var name="city"} + {tmpl_var name="client_id"} + {tmpl_var name="company_name"} + {tmpl_var name="contact_name"} + {tmpl_var name="city"}
{tmpl_var name="country"}
{tmpl_var name='login_as_txt'} diff --git a/interface/web/designer/form_show.php b/interface/web/designer/form_show.php index 77bb080a1e..4cb805668e 100644 --- a/interface/web/designer/form_show.php +++ b/interface/web/designer/form_show.php @@ -72,11 +72,11 @@ foreach($tabs as $tab_id => $tab) { $tab[title] - - - - - + + + + + "; //$content .= "Bereich:\r\n"; @@ -87,10 +87,10 @@ foreach($tabs as $tab_id => $tab) { $content .= " $field_id - - - - + + + + "; $n2++; diff --git a/interface/web/designer/module_show.php b/interface/web/designer/module_show.php index 44548784d3..504d313d5b 100644 --- a/interface/web/designer/module_show.php +++ b/interface/web/designer/module_show.php @@ -66,11 +66,11 @@ foreach($navi as $nav_id => $section) { $section[title] -
-
-
-
-
+
+
+
+
+
"; //$content .= "Bereich:\r\n"; @@ -81,10 +81,10 @@ foreach($navi as $nav_id => $section) { $content .= " $item[title] -
-
-
-
+
+
+
+
"; $n2++; diff --git a/interface/web/designer/templates/form_edit.htm b/interface/web/designer/templates/form_edit.htm index 38a28c4aa3..72cb0a4429 100644 --- a/interface/web/designer/templates/form_edit.htm +++ b/interface/web/designer/templates/form_edit.htm @@ -70,7 +70,7 @@   - + diff --git a/interface/web/designer/templates/form_show.htm b/interface/web/designer/templates/form_show.htm index 2a3eff4ea5..e8db5efd88 100644 --- a/interface/web/designer/templates/form_show.htm +++ b/interface/web/designer/templates/form_show.htm @@ -43,9 +43,9 @@ function del_menuitem(link) { - - - + + +
diff --git a/interface/web/designer/templates/module_edit.htm b/interface/web/designer/templates/module_edit.htm index 2cd48a9ea7..e6e5b113b2 100644 --- a/interface/web/designer/templates/module_edit.htm +++ b/interface/web/designer/templates/module_edit.htm @@ -29,8 +29,8 @@   -
-
+
+
diff --git a/interface/web/designer/templates/module_nav_edit.htm b/interface/web/designer/templates/module_nav_edit.htm index 3b2007af84..fe925ddce4 100644 --- a/interface/web/designer/templates/module_nav_edit.htm +++ b/interface/web/designer/templates/module_nav_edit.htm @@ -9,8 +9,8 @@   -
-
+
+
diff --git a/interface/web/designer/templates/module_nav_item_edit.htm b/interface/web/designer/templates/module_nav_item_edit.htm index 0aee2ca65f..3a52daeb25 100644 --- a/interface/web/designer/templates/module_nav_item_edit.htm +++ b/interface/web/designer/templates/module_nav_item_edit.htm @@ -17,8 +17,8 @@   -
-
+
+
diff --git a/interface/web/designer/templates/module_show.htm b/interface/web/designer/templates/module_show.htm index ffdfe9bb8a..24694b4b60 100644 --- a/interface/web/designer/templates/module_show.htm +++ b/interface/web/designer/templates/module_show.htm @@ -14,9 +14,9 @@ -
-
-
+
+
+
diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm index cce1af6052..410d0103a1 100644 --- a/interface/web/dns/templates/dns_a_edit.htm +++ b/interface/web/dns/templates/dns_a_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 4be690d5d6..d1fcc5cc45 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -1,17 +1,17 @@ c
{tmpl_var name="toolsarea_head_txt"}
- - - - - - - - - - - + + + + + + + + + + +
@@ -44,12 +44,12 @@ c
- {tmpl_var name="active"} - {tmpl_var name="type"} - {tmpl_var name="name"} - {tmpl_var name="data"} - {tmpl_var name="aux"} - {tmpl_var name="ttl"} + {tmpl_var name="active"} + {tmpl_var name="type"} + {tmpl_var name="name"} + {tmpl_var name="data"} + {tmpl_var name="aux"} + {tmpl_var name="ttl"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_aaaa_edit.htm b/interface/web/dns/templates/dns_aaaa_edit.htm index fdea8270c7..44beefc909 100644 --- a/interface/web/dns/templates/dns_aaaa_edit.htm +++ b/interface/web/dns/templates/dns_aaaa_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_alias_edit.htm b/interface/web/dns/templates/dns_alias_edit.htm index 2c859c7a05..517df750e8 100644 --- a/interface/web/dns/templates/dns_alias_edit.htm +++ b/interface/web/dns/templates/dns_alias_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_cname_edit.htm b/interface/web/dns/templates/dns_cname_edit.htm index 5cf86c589f..50212131f1 100644 --- a/interface/web/dns/templates/dns_cname_edit.htm +++ b/interface/web/dns/templates/dns_cname_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm index 1651bcc7d1..0a9e0282f4 100644 --- a/interface/web/dns/templates/dns_hinfo_edit.htm +++ b/interface/web/dns/templates/dns_hinfo_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm index 7f462ab62a..af6a6e0a6b 100644 --- a/interface/web/dns/templates/dns_import.htm +++ b/interface/web/dns/templates/dns_import.htm @@ -38,8 +38,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_mx_edit.htm b/interface/web/dns/templates/dns_mx_edit.htm index e986efb777..64b2c1291f 100644 --- a/interface/web/dns/templates/dns_mx_edit.htm +++ b/interface/web/dns/templates/dns_mx_edit.htm @@ -34,8 +34,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_ns_edit.htm b/interface/web/dns/templates/dns_ns_edit.htm index 9efd881a90..3c5ee5904a 100644 --- a/interface/web/dns/templates/dns_ns_edit.htm +++ b/interface/web/dns/templates/dns_ns_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_ptr_edit.htm b/interface/web/dns/templates/dns_ptr_edit.htm index 5d8cf1fdbe..86b96e9444 100644 --- a/interface/web/dns/templates/dns_ptr_edit.htm +++ b/interface/web/dns/templates/dns_ptr_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_rp_edit.htm b/interface/web/dns/templates/dns_rp_edit.htm index 86697cfed6..df9456fc0d 100644 --- a/interface/web/dns/templates/dns_rp_edit.htm +++ b/interface/web/dns/templates/dns_rp_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm index b6dea70f9c..8aa9b03a55 100644 --- a/interface/web/dns/templates/dns_slave_edit.htm +++ b/interface/web/dns/templates/dns_slave_edit.htm @@ -61,8 +61,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm index 730b13ae3b..1c7046b817 100644 --- a/interface/web/dns/templates/dns_slave_list.htm +++ b/interface/web/dns/templates/dns_slave_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="origin"} - {tmpl_var name="ns"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="origin"} + {tmpl_var name="ns"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm index 386a2ab6ae..20a97cf383 100644 --- a/interface/web/dns/templates/dns_soa_edit.htm +++ b/interface/web/dns/templates/dns_soa_edit.htm @@ -95,8 +95,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm index 980b002fdd..d70f76aa46 100644 --- a/interface/web/dns/templates/dns_soa_list.htm +++ b/interface/web/dns/templates/dns_soa_list.htm @@ -6,9 +6,9 @@
{tmpl_var name="toolsarea_head_txt"}
- - - + + +
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="origin"} - {tmpl_var name="ns"} - {tmpl_var name="mbox"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="origin"} + {tmpl_var name="ns"} + {tmpl_var name="mbox"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm index fbcf10db9d..b50abe6dcf 100644 --- a/interface/web/dns/templates/dns_srv_edit.htm +++ b/interface/web/dns/templates/dns_srv_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_template_edit.htm b/interface/web/dns/templates/dns_template_edit.htm index b18d84a691..36ab9e05ba 100644 --- a/interface/web/dns/templates/dns_template_edit.htm +++ b/interface/web/dns/templates/dns_template_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm index 87b28387e2..a7ecf410cd 100644 --- a/interface/web/dns/templates/dns_template_list.htm +++ b/interface/web/dns/templates/dns_template_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -26,15 +26,15 @@ - + - {tmpl_var name="visible"} - {tmpl_var name="name"} + {tmpl_var name="visible"} + {tmpl_var name="name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_txt_edit.htm b/interface/web/dns/templates/dns_txt_edit.htm index 0450fc865f..7884a86bd6 100644 --- a/interface/web/dns/templates/dns_txt_edit.htm +++ b/interface/web/dns/templates/dns_txt_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm index 51d9b76147..849c5b4e15 100644 --- a/interface/web/dns/templates/dns_wizard.htm +++ b/interface/web/dns/templates/dns_wizard.htm @@ -72,8 +72,8 @@
- - + +
diff --git a/interface/web/help/templates/faq_edit.htm b/interface/web/help/templates/faq_edit.htm index 6513f95508..dc353589de 100644 --- a/interface/web/help/templates/faq_edit.htm +++ b/interface/web/help/templates/faq_edit.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm index ad5d1f8faa..809ce84a26 100644 --- a/interface/web/help/templates/faq_manage_questions_list.htm +++ b/interface/web/help/templates/faq_manage_questions_list.htm @@ -30,7 +30,7 @@ {tmpl_var name="faq_delete_txt"} - {tmpl_var name="faq_edit_txt"} + {tmpl_var name="faq_edit_txt"} diff --git a/interface/web/help/templates/faq_sections_edit.htm b/interface/web/help/templates/faq_sections_edit.htm index 181364bdc2..0597c14b93 100644 --- a/interface/web/help/templates/faq_sections_edit.htm +++ b/interface/web/help/templates/faq_sections_edit.htm @@ -11,8 +11,8 @@
- - + +
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm index 436f515597..298874654b 100644 --- a/interface/web/help/templates/help_faq_list.htm +++ b/interface/web/help/templates/help_faq_list.htm @@ -6,7 +6,7 @@

Delete - {tmpl_var name="edit_txt"} + {tmpl_var name="edit_txt"}


diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm index 8f1db6ea49..39b2b4000f 100644 --- a/interface/web/help/templates/help_faq_sections_list.htm +++ b/interface/web/help/templates/help_faq_sections_list.htm @@ -30,7 +30,7 @@ {tmpl_var name="faq_delete_txt"} - {tmpl_var name="faq_edit_txt"} + {tmpl_var name="faq_edit_txt"} diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm index 06c17977fa..a7c2647574 100644 --- a/interface/web/help/templates/support_message_edit.htm +++ b/interface/web/help/templates/support_message_edit.htm @@ -25,8 +25,8 @@
- - + +
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm index 6a7d6d640e..1c111fc06d 100644 --- a/interface/web/help/templates/support_message_list.htm +++ b/interface/web/help/templates/support_message_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -26,15 +26,15 @@ - + - {tmpl_var name="sender_id"} - {tmpl_var name="subject"} + {tmpl_var name="sender_id"} + {tmpl_var name="subject"} {tmpl_var name='delete_txt'} diff --git a/interface/web/help/templates/support_message_view.htm b/interface/web/help/templates/support_message_view.htm index 62f2736ec9..e671ef702f 100644 --- a/interface/web/help/templates/support_message_view.htm +++ b/interface/web/help/templates/support_message_view.htm @@ -15,7 +15,7 @@
- +
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 41461275b6..6be0225d34 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -269,7 +269,7 @@ function loadInitContent() { function setFocus() { try { - document.pageForm.username.focus(); + jQuery('form#pageForm').find('input[name="username"]').focus(); } catch (e) { } } @@ -601,6 +601,8 @@ function generatePassword(passwordFieldID, repeatPasswordFieldID){ newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup'); } +var funcDisableClick = function(e) { e.preventDefault(); return false; }; + function checkPassMatch(pwField1,pwField2){ var rpass = jQuery('#'+pwField2).val(); var npass = jQuery('#'+pwField1).val(); @@ -608,13 +610,22 @@ function checkPassMatch(pwField1,pwField2){ jQuery('#confirmpasswordOK').hide(); jQuery('#confirmpasswordError').show(); jQuery('button.positive').attr('disabled','disabled'); - jQuery('.tabbox_tabs ul li a').attr('onclick','return false;'); + jQuery('.tabbox_tabs ul li a').each(function() { + var $this = $(this); + $this.data('saved_onclick', $this.attr('onclick')); + $this.removeAttr('onclick'); + $this.click(funcDisableClick); + }); return false; } else { jQuery('#confirmpasswordError').hide(); jQuery('#confirmpasswordOK').show(); jQuery('button.positive').removeAttr('disabled'); - jQuery('.tabbox_tabs ul li a').removeAttr('onclick'); + jQuery('.tabbox_tabs ul li a').each(function() { + var $this = $(this); + $this.unbind('click', funcDisableClick); + if($this.data('saved_onclick') && !$this.attr('onclick')) $this.attr('onclick', $this.data('saved_onclick')); + }); } } diff --git a/interface/web/login/logout.php b/interface/web/login/logout.php index 53dc933022..c56b73dec6 100644 --- a/interface/web/login/logout.php +++ b/interface/web/login/logout.php @@ -52,8 +52,8 @@ if ((isset($_SESSION['s_old']) && ($_SESSION['s_old']['user']['typ'] == 'admin')
- - + +
'; exit; diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm index e977e05882..dff5b41e98 100644 --- a/interface/web/login/templates/index.htm +++ b/interface/web/login/templates/index.htm @@ -26,7 +26,7 @@
- +
diff --git a/interface/web/login/templates/password_reset.htm b/interface/web/login/templates/password_reset.htm index d6007e67be..a4ab3113e5 100644 --- a/interface/web/login/templates/password_reset.htm +++ b/interface/web/login/templates/password_reset.htm @@ -26,7 +26,7 @@
- +
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm index 0aa550f9aa..c2a6e95ab7 100644 --- a/interface/web/mail/templates/mail_alias_edit.htm +++ b/interface/web/mail/templates/mail_alias_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm index b6935a75a5..5761b50e3e 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_aliasdomain_edit.htm b/interface/web/mail/templates/mail_aliasdomain_edit.htm index c41121b7bd..21ca7c7408 100644 --- a/interface/web/mail/templates/mail_aliasdomain_edit.htm +++ b/interface/web/mail/templates/mail_aliasdomain_edit.htm @@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm index 5303a78b43..8adc9f38af 100644 --- a/interface/web/mail/templates/mail_aliasdomain_list.htm +++ b/interface/web/mail/templates/mail_aliasdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_blacklist_edit.htm b/interface/web/mail/templates/mail_blacklist_edit.htm index 493e88b90a..fcd5bf6e52 100644 --- a/interface/web/mail/templates/mail_blacklist_edit.htm +++ b/interface/web/mail/templates/mail_blacklist_edit.htm @@ -33,8 +33,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm index cb410099a5..fc5f3ac0d4 100644 --- a/interface/web/mail/templates/mail_blacklist_list.htm +++ b/interface/web/mail/templates/mail_blacklist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source"} - {tmpl_var name="type"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source"} + {tmpl_var name="type"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_content_filter_edit.htm b/interface/web/mail/templates/mail_content_filter_edit.htm index 8dc53e16ab..0caf697425 100644 --- a/interface/web/mail/templates/mail_content_filter_edit.htm +++ b/interface/web/mail/templates/mail_content_filter_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm index c55d9990ab..9109884f57 100644 --- a/interface/web/mail/templates/mail_content_filter_list.htm +++ b/interface/web/mail/templates/mail_content_filter_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="pattern"} - {tmpl_var name="action"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="pattern"} + {tmpl_var name="action"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm index 7fae59575e..88ef532680 100644 --- a/interface/web/mail/templates/mail_domain_admin_list.htm +++ b/interface/web/mail/templates/mail_domain_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -29,17 +29,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="sys_groupid"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="sys_groupid"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm index b6b9223fcf..fc64b66f42 100644 --- a/interface/web/mail/templates/mail_domain_catchall_edit.htm +++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm @@ -28,8 +28,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm index 1800917bc3..e9732f56cd 100644 --- a/interface/web/mail/templates/mail_domain_catchall_list.htm +++ b/interface/web/mail/templates/mail_domain_catchall_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index b84e2d61cb..5a1b613792 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -65,8 +65,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index 0b888bd851..e1dc4bfa61 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm index d0a85033f6..5e076dc559 100644 --- a/interface/web/mail/templates/mail_forward_edit.htm +++ b/interface/web/mail/templates/mail_forward_edit.htm @@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index 83d1be3979..230880204a 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm index 1ba3f9e8f1..e1cba90269 100644 --- a/interface/web/mail/templates/mail_get_edit.htm +++ b/interface/web/mail/templates/mail_get_edit.htm @@ -52,8 +52,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index 34b731849e..05f8bbd100 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source_server"} - {tmpl_var name="source_username"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source_server"} + {tmpl_var name="source_username"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm index 04964c70e2..6a37951b83 100644 --- a/interface/web/mail/templates/mail_mailinglist_edit.htm +++ b/interface/web/mail/templates/mail_mailinglist_edit.htm @@ -60,7 +60,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -78,8 +78,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm index 0b9e6b9b68..05c48d4de6 100644 --- a/interface/web/mail/templates/mail_mailinglist_list.htm +++ b/interface/web/mail/templates/mail_mailinglist_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -25,15 +25,15 @@ - + - {tmpl_var name="listname"} - {tmpl_var name="domain"} + {tmpl_var name="listname"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_relay_recipient_edit.htm b/interface/web/mail/templates/mail_relay_recipient_edit.htm index 60ac345134..0e5999c089 100644 --- a/interface/web/mail/templates/mail_relay_recipient_edit.htm +++ b/interface/web/mail/templates/mail_relay_recipient_edit.htm @@ -27,8 +27,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm index c86e68f2b7..e5b614b124 100644 --- a/interface/web/mail/templates/mail_relay_recipient_list.htm +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,16 +27,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm index 0bb8dfaf37..cd1e8c99be 100644 --- a/interface/web/mail/templates/mail_transport_edit.htm +++ b/interface/web/mail/templates/mail_transport_edit.htm @@ -48,8 +48,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm index 70bd71745f..d7d7e09064 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"} - {tmpl_var name="transport"} - {tmpl_var name="sort_order"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"} + {tmpl_var name="transport"} + {tmpl_var name="sort_order"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm index da6edd48df..4ff8c813e7 100644 --- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm @@ -31,11 +31,11 @@
diff --git a/interface/web/mail/templates/mail_user_custom_rules_edit.htm b/interface/web/mail/templates/mail_user_custom_rules_edit.htm index 78c87ebc04..31549df0d7 100644 --- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm +++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm index 694b618765..16ea6fa3cc 100644 --- a/interface/web/mail/templates/mail_user_filter_edit.htm +++ b/interface/web/mail/templates/mail_user_filter_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm index 8bb8d21111..cd10e4dc87 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -2,7 +2,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,7 +27,7 @@ - {tmpl_var name="rulename"} + {tmpl_var name="rulename"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index 66ff0b0fb0..553cc816bc 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,21 +30,21 @@ - + - {tmpl_var name="email"} + {tmpl_var name="email"} - {tmpl_var name="login"} + {tmpl_var name="login"} - {tmpl_var name="name"} - {tmpl_var name="autoresponder"} + {tmpl_var name="name"} + {tmpl_var name="autoresponder"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index bb1dd37ba0..2647e24998 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -23,7 +23,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -73,8 +73,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_mailfilter_edit.htm b/interface/web/mail/templates/mail_user_mailfilter_edit.htm index ef053c9367..3274685fe5 100644 --- a/interface/web/mail/templates/mail_user_mailfilter_edit.htm +++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm index fac9fa9d1d..973300cc5e 100644 --- a/interface/web/mail/templates/mail_user_stats_list.htm +++ b/interface/web/mail/templates/mail_user_stats_list.htm @@ -22,18 +22,18 @@ - + - {tmpl_var name="email"} - {tmpl_var name="this_month"} MB - {tmpl_var name="last_month"} MB - {tmpl_var name="this_year"} MB - {tmpl_var name="last_year"} MB + {tmpl_var name="email"} + {tmpl_var name="this_month"} MB + {tmpl_var name="last_month"} MB + {tmpl_var name="this_year"} MB + {tmpl_var name="last_year"} MB diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm index cf2aeb596b..d36434941a 100644 --- a/interface/web/mail/templates/mail_whitelist_edit.htm +++ b/interface/web/mail/templates/mail_whitelist_edit.htm @@ -33,8 +33,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index 043875a0f5..631052c302 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source"} - {tmpl_var name="type"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source"} + {tmpl_var name="type"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm index 34c2249d4b..ae5b3eecbd 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm @@ -41,8 +41,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index 181c686498..2181b0d48f 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="priority"} - {tmpl_var name="rid"} - {tmpl_var name="email"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="priority"} + {tmpl_var name="rid"} + {tmpl_var name="email"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm index 2b3c85a513..4dd0710f40 100644 --- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm index 5f6a28f572..cf46159ae3 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -24,14 +24,14 @@ - + - {tmpl_var name="server_name"} + {tmpl_var name="server_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm index 524c9804b0..22f5b9fb0a 100644 --- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm @@ -58,8 +58,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm index 6cdca69f3c..e91d4a0ead 100644 --- a/interface/web/mail/templates/spamfilter_config_server_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm index 518be5f477..a25a2e70eb 100644 --- a/interface/web/mail/templates/spamfilter_other_edit.htm +++ b/interface/web/mail/templates/spamfilter_other_edit.htm @@ -72,8 +72,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm index 7279f0a68f..3ed6b83712 100644 --- a/interface/web/mail/templates/spamfilter_policy_edit.htm +++ b/interface/web/mail/templates/spamfilter_policy_edit.htm @@ -56,8 +56,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm index 653c4bcaed..9dffaa93a9 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="policy_name"} - {tmpl_var name="virus_lover"} - {tmpl_var name="spam_lover"} - {tmpl_var name="banned_files_lover"} - {tmpl_var name="bad_header_lover"} + {tmpl_var name="policy_name"} + {tmpl_var name="virus_lover"} + {tmpl_var name="spam_lover"} + {tmpl_var name="banned_files_lover"} + {tmpl_var name="bad_header_lover"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_quarantine_edit.htm b/interface/web/mail/templates/spamfilter_quarantine_edit.htm index 98e9c3e4b1..4a38d7ffb8 100644 --- a/interface/web/mail/templates/spamfilter_quarantine_edit.htm +++ b/interface/web/mail/templates/spamfilter_quarantine_edit.htm @@ -36,8 +36,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm index 34577c8794..059ab155b3 100644 --- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm +++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm @@ -44,8 +44,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm index 7c96208536..52e5945f46 100644 --- a/interface/web/mail/templates/spamfilter_users_edit.htm +++ b/interface/web/mail/templates/spamfilter_users_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm index 39c4ef8686..92e8821591 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="local"} - {tmpl_var name="server_id"} - {tmpl_var name="priority"} - {tmpl_var name="policy_id"} - {tmpl_var name="fullname"} + {tmpl_var name="local"} + {tmpl_var name="server_id"} + {tmpl_var name="priority"} + {tmpl_var name="policy_id"} + {tmpl_var name="fullname"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm index 0d31b7af5c..efb70186ff 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm @@ -41,8 +41,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm index 9cb4ba6bbb..9bd30eefe2 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="priority"} - {tmpl_var name="rid"} - {tmpl_var name="email"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="priority"} + {tmpl_var name="rid"} + {tmpl_var name="email"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm index 1f8a9ecc85..e9485f0d55 100644 --- a/interface/web/mail/templates/user_quota_stats_list.htm +++ b/interface/web/mail/templates/user_quota_stats_list.htm @@ -19,17 +19,17 @@     - + - {tmpl_var name="email"} - {tmpl_var name="name"} - {tmpl_var name="used"} - {tmpl_var name="quota"} + {tmpl_var name="email"} + {tmpl_var name="name"} + {tmpl_var name="used"} + {tmpl_var name="quota"} diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm index 271fca1035..34b7f0d238 100644 --- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm @@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_cc_edit.htm b/interface/web/mailuser/templates/mail_user_cc_edit.htm index 089f824301..ba715c89ae 100644 --- a/interface/web/mailuser/templates/mail_user_cc_edit.htm +++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm index a9113c2f65..320567742c 100644 --- a/interface/web/mailuser/templates/mail_user_filter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm index a303d03484..5d252299cf 100644 --- a/interface/web/mailuser/templates/mail_user_filter_list.htm +++ b/interface/web/mailuser/templates/mail_user_filter_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -23,14 +23,14 @@ - + - {tmpl_var name="rulename"} + {tmpl_var name="rulename"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm index ed49c1654b..01d1227ce7 100644 --- a/interface/web/mailuser/templates/mail_user_password_edit.htm +++ b/interface/web/mailuser/templates/mail_user_password_edit.htm @@ -11,7 +11,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm index eaa59e9503..4fdc5f86fd 100644 --- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm @@ -20,8 +20,8 @@
- - + +
diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm index e237e5aa1a..ac9a8c0077 100644 --- a/interface/web/monitor/templates/datalog_list.htm +++ b/interface/web/monitor/templates/datalog_list.htm @@ -20,7 +20,7 @@ - + diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm index 9b796f246f..fa0449b6af 100644 --- a/interface/web/monitor/templates/syslog_list.htm +++ b/interface/web/monitor/templates/syslog_list.htm @@ -20,7 +20,7 @@ - + diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm index e6ce02a445..4aba7ed429 100644 --- a/interface/web/sites/templates/aps_install_package.htm +++ b/interface/web/sites/templates/aps_install_package.htm @@ -48,8 +48,8 @@
- - + +
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index 3007d40c7f..46312889dc 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -25,17 +25,17 @@   - + - {tmpl_var name='package_name'} + {tmpl_var name='package_name'} {tmpl_var name='package_version'}-{tmpl_var name='package_release'} - {tmpl_var name='customer_name'} + {tmpl_var name='customer_name'} {tmpl_var name='install_location_short'} {tmpl_var name='instance_status'} diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm index e7187ffaeb..4a5b4359c2 100644 --- a/interface/web/sites/templates/aps_packagedetails_show.htm +++ b/interface/web/sites/templates/aps_packagedetails_show.htm @@ -8,7 +8,7 @@

 

-

 

 

diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index 454822d7d1..bfd8c627f8 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -22,13 +22,13 @@ - + - {tmpl_var name='name'} + {tmpl_var name='name'} {tmpl_var name='version'}-{tmpl_var name='release'} {tmpl_var name='category'} diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm index 7d47b4e277..1c0cd02ed5 100644 --- a/interface/web/sites/templates/cron_edit.htm +++ b/interface/web/sites/templates/cron_edit.htm @@ -60,8 +60,8 @@
- - + +
diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm index 868469c5cf..2759e225a4 100644 --- a/interface/web/sites/templates/cron_list.htm +++ b/interface/web/sites/templates/cron_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -40,22 +40,22 @@ - + - - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="run_min"} - {tmpl_var name="run_hour"} - {tmpl_var name="run_mday"} - {tmpl_var name="run_month"} - {tmpl_var name="run_wday"} - {tmpl_var name="command"} + + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="run_min"} + {tmpl_var name="run_hour"} + {tmpl_var name="run_mday"} + {tmpl_var name="run_month"} + {tmpl_var name="run_wday"} + {tmpl_var name="command"}
{tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index 8a169b65dd..e66aa51390 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -33,19 +33,19 @@ - + - {tmpl_var name="active"} - {tmpl_var name="remote_access"} - {tmpl_var name="sys_groupid"} - {tmpl_var name="server_id"} - {tmpl_var name="database_user_id"} - {tmpl_var name="database_name"} + {tmpl_var name="active"} + {tmpl_var name="remote_access"} + {tmpl_var name="sys_groupid"} + {tmpl_var name="server_id"} + {tmpl_var name="database_user_id"} + {tmpl_var name="database_name"} {tmpl_var name='admin_txt'} diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index 4207a789ff..de2899c1c3 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -90,8 +90,8 @@
- - + +
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index 0412080e54..5fec212eec 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="remote_access"} - {tmpl_var name="server_id"} - {tmpl_var name="database_user_id"} - {tmpl_var name="database_name"} + {tmpl_var name="active"} + {tmpl_var name="remote_access"} + {tmpl_var name="server_id"} + {tmpl_var name="database_user_id"} + {tmpl_var name="database_name"} {tmpl_var name='admin_txt'} diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm index 59a45104eb..0e33a887d3 100644 --- a/interface/web/sites/templates/database_user_admin_list.htm +++ b/interface/web/sites/templates/database_user_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -22,13 +22,13 @@ - + - {tmpl_var name="database_user"} + {tmpl_var name="database_user"} {tmpl_var name='edit_txt'} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/database_user_edit.htm b/interface/web/sites/templates/database_user_edit.htm index 40e8c96e82..5bdf062fa5 100644 --- a/interface/web/sites/templates/database_user_edit.htm +++ b/interface/web/sites/templates/database_user_edit.htm @@ -28,7 +28,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -46,8 +46,8 @@
- - + +
diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm index f20b26189c..b3e1efed12 100644 --- a/interface/web/sites/templates/database_user_list.htm +++ b/interface/web/sites/templates/database_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -23,13 +23,13 @@ - + - {tmpl_var name="database_user"} + {tmpl_var name="database_user"} {tmpl_var name='edit_txt'} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/ftp_user_advanced.htm b/interface/web/sites/templates/ftp_user_advanced.htm index 175b5fe5d9..b945033823 100644 --- a/interface/web/sites/templates/ftp_user_advanced.htm +++ b/interface/web/sites/templates/ftp_user_advanced.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/sites/templates/ftp_user_advanced_client.htm b/interface/web/sites/templates/ftp_user_advanced_client.htm index 5918c6d571..8e2500d501 100644 --- a/interface/web/sites/templates/ftp_user_advanced_client.htm +++ b/interface/web/sites/templates/ftp_user_advanced_client.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm index cf900015c9..c33401103d 100644 --- a/interface/web/sites/templates/ftp_user_edit.htm +++ b/interface/web/sites/templates/ftp_user_edit.htm @@ -18,7 +18,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -46,8 +46,8 @@
- - + +
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index 8c07458ff2..9621e96759 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="username"} {tmpl_var name='admin_txt'} diff --git a/interface/web/sites/templates/shell_user_advanced.htm b/interface/web/sites/templates/shell_user_advanced.htm index bad78c81c6..a16b50cd03 100644 --- a/interface/web/sites/templates/shell_user_advanced.htm +++ b/interface/web/sites/templates/shell_user_advanced.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index 3cb5d38424..1aa663b7be 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -26,7 +26,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -64,8 +64,8 @@
- - + +
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm index d98c959754..2ed2c5e355 100644 --- a/interface/web/sites/templates/shell_user_list.htm +++ b/interface/web/sites/templates/shell_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm index 43b6a00b78..ad303c1d07 100644 --- a/interface/web/sites/templates/user_quota_stats_list.htm +++ b/interface/web/sites/templates/user_quota_stats_list.htm @@ -23,19 +23,19 @@     - + - {tmpl_var name="domain"} - {tmpl_var name="system_user"} - {tmpl_var name="used"} - {tmpl_var name="soft"} - {tmpl_var name="hard"} - {tmpl_var name="files"} + {tmpl_var name="domain"} + {tmpl_var name="system_user"} + {tmpl_var name="used"} + {tmpl_var name="soft"} + {tmpl_var name="hard"} + {tmpl_var name="files"} diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm index 0ccaa5edf1..3f800596f6 100644 --- a/interface/web/sites/templates/web_aliasdomain_edit.htm +++ b/interface/web/sites/templates/web_aliasdomain_edit.htm @@ -48,8 +48,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm index 126a972d95..1de97c4020 100644 --- a/interface/web/sites/templates/web_aliasdomain_list.htm +++ b/interface/web/sites/templates/web_aliasdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm index 0347072e59..51c3c33566 100644 --- a/interface/web/sites/templates/web_backup_list.htm +++ b/interface/web/sites/templates/web_backup_list.htm @@ -27,8 +27,8 @@ {tmpl_var name="filename"}
- - + +
diff --git a/interface/web/sites/templates/web_domain_admin_list.htm b/interface/web/sites/templates/web_domain_admin_list.htm index b286e50407..bf2cc659a5 100644 --- a/interface/web/sites/templates/web_domain_admin_list.htm +++ b/interface/web/sites/templates/web_domain_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -31,18 +31,18 @@ - + - {tmpl_var name="domain_id"} - {tmpl_var name="active"} - {tmpl_var name="sys_groupid"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"}Link + {tmpl_var name="domain_id"} + {tmpl_var name="active"} + {tmpl_var name="sys_groupid"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"}Link {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm index 87107400af..f61cf500c7 100644 --- a/interface/web/sites/templates/web_domain_advanced.htm +++ b/interface/web/sites/templates/web_domain_advanced.htm @@ -82,8 +82,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_backup.htm b/interface/web/sites/templates/web_domain_backup.htm index c46d4e2d4e..3c78fe73de 100644 --- a/interface/web/sites/templates/web_domain_backup.htm +++ b/interface/web/sites/templates/web_domain_backup.htm @@ -24,8 +24,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm index edf1836d29..145104e0e9 100644 --- a/interface/web/sites/templates/web_domain_edit.htm +++ b/interface/web/sites/templates/web_domain_edit.htm @@ -146,7 +146,7 @@
- +
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm index 52ec9e2b1a..362060dfe6 100644 --- a/interface/web/sites/templates/web_domain_list.htm +++ b/interface/web/sites/templates/web_domain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="domain_id"} - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"}Link + {tmpl_var name="domain_id"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"}Link {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm index 66a17034c9..ddbdc04bbd 100644 --- a/interface/web/sites/templates/web_domain_redirect.htm +++ b/interface/web/sites/templates/web_domain_redirect.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_domain_ssl.htm index 4c27bb7729..832d623f61 100644 --- a/interface/web/sites/templates/web_domain_ssl.htm +++ b/interface/web/sites/templates/web_domain_ssl.htm @@ -60,8 +60,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_domain_stats.htm index 26eee94772..d0f6f16a31 100644 --- a/interface/web/sites/templates/web_domain_stats.htm +++ b/interface/web/sites/templates/web_domain_stats.htm @@ -10,7 +10,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}
@@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_folder_edit.htm b/interface/web/sites/templates/web_folder_edit.htm index 4165ab70b1..a5dc3b9c60 100644 --- a/interface/web/sites/templates/web_folder_edit.htm +++ b/interface/web/sites/templates/web_folder_edit.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm index 6b7761c98f..af362337f2 100644 --- a/interface/web/sites/templates/web_folder_list.htm +++ b/interface/web/sites/templates/web_folder_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -29,17 +29,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="path"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="path"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_folder_user_edit.htm b/interface/web/sites/templates/web_folder_user_edit.htm index 63376d8ed8..bb6291375b 100644 --- a/interface/web/sites/templates/web_folder_user_edit.htm +++ b/interface/web/sites/templates/web_folder_user_edit.htm @@ -17,7 +17,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -41,8 +41,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm index ae00cccb28..c36281aab8 100644 --- a/interface/web/sites/templates/web_folder_user_list.htm +++ b/interface/web/sites/templates/web_folder_user_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,16 +27,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="web_folder_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="web_folder_id"} + {tmpl_var name="username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index 3e0642489b..0a4da64325 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -22,27 +22,27 @@ - + - {tmpl_var name="domain"} - {tmpl_var name="this_month"} MB - {tmpl_var name="last_month"} MB - {tmpl_var name="this_year"} MB - {tmpl_var name="last_year"} MB + {tmpl_var name="domain"} + {tmpl_var name="this_month"} MB + {tmpl_var name="last_month"} MB + {tmpl_var name="this_year"} MB + {tmpl_var name="last_year"} MB - {tmpl_var name="sum_txt"} - {tmpl_var name="sum_this_month"} MB - {tmpl_var name="sum_last_month"} MB - {tmpl_var name="sum_this_year"} MB - {tmpl_var name="sum_last_year"} MB + {tmpl_var name="sum_txt"} + {tmpl_var name="sum_this_month"} MB + {tmpl_var name="sum_last_month"} MB + {tmpl_var name="sum_this_year"} MB + {tmpl_var name="sum_last_year"} MB
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm index a8b0fe9bd0..4aaae6790f 100644 --- a/interface/web/sites/templates/web_subdomain_edit.htm +++ b/interface/web/sites/templates/web_subdomain_edit.htm @@ -34,8 +34,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm index 7d097ec487..03ca2b3b83 100644 --- a/interface/web/sites/templates/web_subdomain_list.htm +++ b/interface/web/sites/templates/web_subdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm index 87107400af..f61cf500c7 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 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_backup.htm b/interface/web/sites/templates/web_vhost_subdomain_backup.htm index c46d4e2d4e..3c78fe73de 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 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm index 159830c685..f6f84b0749 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm @@ -105,7 +105,7 @@
- +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_list.htm b/interface/web/sites/templates/web_vhost_subdomain_list.htm index 26eb3f1cc7..6db8d059e0 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_list.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -29,16 +29,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm index 66a17034c9..ddbdc04bbd 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 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm index 4c27bb7729..832d623f61 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 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_stats.htm b/interface/web/sites/templates/web_vhost_subdomain_stats.htm index 26eee94772..d0f6f16a31 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_stats.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_stats.htm @@ -10,7 +10,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}
@@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/sites/templates/webdav_user_edit.htm b/interface/web/sites/templates/webdav_user_edit.htm index 8dd719dca1..9a75015f4c 100644 --- a/interface/web/sites/templates/webdav_user_edit.htm +++ b/interface/web/sites/templates/webdav_user_edit.htm @@ -26,7 +26,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -56,8 +56,8 @@
- - + +
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm index e5b055a2ba..82004d924e 100644 --- a/interface/web/sites/templates/webdav_user_list.htm +++ b/interface/web/sites/templates/webdav_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/themes/default/templates/sidenav.tpl.htm b/interface/web/themes/default/templates/sidenav.tpl.htm index a5051cf3a5..8ec46aa867 100644 --- a/interface/web/themes/default/templates/sidenav.tpl.htm +++ b/interface/web/themes/default/templates/sidenav.tpl.htm @@ -2,7 +2,7 @@
  • - + @@ -12,7 +12,7 @@
  • id='' > - + diff --git a/interface/web/themes/default/templates/topnav.tpl.htm b/interface/web/themes/default/templates/topnav.tpl.htm index 4c681960c0..485fa23083 100644 --- a/interface/web/themes/default/templates/topnav.tpl.htm +++ b/interface/web/themes/default/templates/topnav.tpl.htm @@ -3,7 +3,7 @@
    • -
    • +
    • diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm index b4fad7e6f2..bf1ed65d2c 100644 --- a/interface/web/tools/templates/dns_import_tupa.htm +++ b/interface/web/tools/templates/dns_import_tupa.htm @@ -48,8 +48,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm index 7d7b4c17bc..465c8c519d 100644 --- a/interface/web/tools/templates/import_ispconfig.htm +++ b/interface/web/tools/templates/import_ispconfig.htm @@ -91,13 +91,13 @@
    - - + +
    - - + +
    \ 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 f72096c700..10a73d7a68 100644 --- a/interface/web/tools/templates/import_plesk.htm +++ b/interface/web/tools/templates/import_plesk.htm @@ -66,8 +66,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm index 640f187cd2..978355f0fc 100644 --- a/interface/web/tools/templates/interface_settings.htm +++ b/interface/web/tools/templates/interface_settings.htm @@ -23,8 +23,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm index c7611b8049..62b3a1d01a 100644 --- a/interface/web/tools/templates/resync.htm +++ b/interface/web/tools/templates/resync.htm @@ -59,8 +59,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/tpl_default.htm b/interface/web/tools/templates/tpl_default.htm index e9e5ade713..fadcd36f80 100644 --- a/interface/web/tools/templates/tpl_default.htm +++ b/interface/web/tools/templates/tpl_default.htm @@ -13,8 +13,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm index 6155093aa3..27be28c531 100644 --- a/interface/web/tools/templates/user_settings.htm +++ b/interface/web/tools/templates/user_settings.htm @@ -7,7 +7,7 @@
    -  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

    {tmpl_var name='password_strength_txt'}

    @@ -31,8 +31,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_action.htm b/interface/web/vm/templates/openvz_action.htm index 057c851dc3..00bb65e077 100644 --- a/interface/web/vm/templates/openvz_action.htm +++ b/interface/web/vm/templates/openvz_action.htm @@ -45,8 +45,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_ip_edit.htm b/interface/web/vm/templates/openvz_ip_edit.htm index 8b8f34b62b..ef0537d9d9 100644 --- a/interface/web/vm/templates/openvz_ip_edit.htm +++ b/interface/web/vm/templates/openvz_ip_edit.htm @@ -32,8 +32,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm index 12d50da039..99e48e2720 100644 --- a/interface/web/vm/templates/openvz_ip_list.htm +++ b/interface/web/vm/templates/openvz_ip_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -29,17 +29,17 @@ - + - {tmpl_var name="server_id"} - {tmpl_var name="vm_id"} - {tmpl_var name="ip_address"} - {tmpl_var name="reserved"} + {tmpl_var name="server_id"} + {tmpl_var name="vm_id"} + {tmpl_var name="ip_address"} + {tmpl_var name="reserved"} {tmpl_var name='delete_txt'} diff --git a/interface/web/vm/templates/openvz_ostemplate_edit.htm b/interface/web/vm/templates/openvz_ostemplate_edit.htm index 6f08d15064..8bcba15b76 100644 --- a/interface/web/vm/templates/openvz_ostemplate_edit.htm +++ b/interface/web/vm/templates/openvz_ostemplate_edit.htm @@ -40,8 +40,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm index f30f68affb..679c66599e 100644 --- a/interface/web/vm/templates/openvz_ostemplate_list.htm +++ b/interface/web/vm/templates/openvz_ostemplate_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -31,18 +31,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="ostemplate_id"} - {tmpl_var name="template_name"} - {tmpl_var name="server_id"} - {tmpl_var name="allservers"} + {tmpl_var name="active"} + {tmpl_var name="ostemplate_id"} + {tmpl_var name="template_name"} + {tmpl_var name="server_id"} + {tmpl_var name="allservers"} {tmpl_var name='delete_txt'} diff --git a/interface/web/vm/templates/openvz_template_advanced_edit.htm b/interface/web/vm/templates/openvz_template_advanced_edit.htm index 6741ce9ab3..86e2807d29 100644 --- a/interface/web/vm/templates/openvz_template_advanced_edit.htm +++ b/interface/web/vm/templates/openvz_template_advanced_edit.htm @@ -102,8 +102,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_template_edit.htm b/interface/web/vm/templates/openvz_template_edit.htm index ce356afeec..e26bdf9f6a 100644 --- a/interface/web/vm/templates/openvz_template_edit.htm +++ b/interface/web/vm/templates/openvz_template_edit.htm @@ -66,8 +66,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm index d83eb31de2..7f5ab7130e 100644 --- a/interface/web/vm/templates/openvz_template_list.htm +++ b/interface/web/vm/templates/openvz_template_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -25,15 +25,15 @@ - + - {tmpl_var name="active"} - {tmpl_var name="template_name"} + {tmpl_var name="active"} + {tmpl_var name="template_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/vm/templates/openvz_vm_advanced_edit.htm b/interface/web/vm/templates/openvz_vm_advanced_edit.htm index a0bf42d3e4..0226eda767 100644 --- a/interface/web/vm/templates/openvz_vm_advanced_edit.htm +++ b/interface/web/vm/templates/openvz_vm_advanced_edit.htm @@ -56,8 +56,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm index 402bad398c..446cd1e844 100644 --- a/interface/web/vm/templates/openvz_vm_edit.htm +++ b/interface/web/vm/templates/openvz_vm_edit.htm @@ -96,8 +96,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm index 66d65a1d74..339c9851fa 100644 --- a/interface/web/vm/templates/openvz_vm_list.htm +++ b/interface/web/vm/templates/openvz_vm_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -35,20 +35,20 @@ - + - {tmpl_var name="veid"} - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="ostemplate_id"} - {tmpl_var name="template_id"} - {tmpl_var name="hostname"} - {tmpl_var name="ip_address"} + {tmpl_var name="veid"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="ostemplate_id"} + {tmpl_var name="template_id"} + {tmpl_var name="hostname"} + {tmpl_var name="ip_address"} Action {tmpl_var name='delete_txt'} -- GitLab