From 8ceb0824027750b720f7788e44ed0deb87be6f08 Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Wed, 7 Jan 2015 13:52:03 +0100 Subject: [PATCH] - Layout fixes - Included new icons and buttons - Layout scaling improved (up to 1260px width) --- interface/lib/classes/listform.inc.php | 28 ++++--- .../templates/directive_snippets_edit.htm | 2 +- .../templates/directive_snippets_list.htm | 12 +-- .../web/admin/templates/firewall_list.htm | 14 ++-- interface/web/admin/templates/groups_edit.htm | 2 +- interface/web/admin/templates/groups_list.htm | 10 +-- .../web/admin/templates/iptables_list.htm | 14 ++-- .../web/admin/templates/language_edit.htm | 2 +- .../web/admin/templates/language_import.htm | 4 +- .../web/admin/templates/language_list.htm | 2 +- .../web/admin/templates/remote_user_list.htm | 8 +- .../admin/templates/server_config_list.htm | 8 +- .../admin/templates/server_edit_config.htm | 2 +- .../web/admin/templates/server_ip_list.htm | 18 ++--- interface/web/admin/templates/server_list.htm | 20 ++--- .../web/admin/templates/server_php_list.htm | 12 +-- .../admin/templates/software_package_list.htm | 6 +- .../admin/templates/software_repo_list.htm | 12 +-- .../admin/templates/software_update_list.htm | 2 +- .../templates/system_config_domains_edit.htm | 2 +- interface/web/admin/templates/users_list.htm | 16 ++-- .../client/templates/client_circle_edit.htm | 2 +- .../client/templates/client_circle_list.htm | 14 ++-- interface/web/client/templates/client_del.htm | 2 +- .../client/templates/client_edit_address.htm | 2 +- .../client/templates/client_edit_limits.htm | 2 +- .../web/client/templates/client_message.htm | 2 +- .../client_message_template_list.htm | 10 +-- .../client/templates/client_template_list.htm | 12 +-- .../web/client/templates/clients_list.htm | 24 +++--- .../web/client/templates/domain_list.htm | 10 +-- .../web/client/templates/message_template.htm | 2 +- .../templates/message_template_list.htm | 10 +-- .../templates/reseller_edit_address.htm | 2 +- .../web/client/templates/resellers_list.htm | 22 +++--- .../dashboard/dashlets/templates/limits.htm | 2 +- .../dashlets/templates/mailquota.htm | 2 +- .../dashboard/dashlets/templates/quota.htm | 2 +- interface/web/dns/templates/dns_a_list.htm | 18 ++--- interface/web/dns/templates/dns_dkim_edit.htm | 2 +- .../dns/templates/dns_slave_admin_list.htm | 16 ++-- .../web/dns/templates/dns_slave_list.htm | 14 ++-- .../web/dns/templates/dns_soa_admin_list.htm | 18 ++--- interface/web/dns/templates/dns_soa_list.htm | 16 ++-- .../web/dns/templates/dns_template_edit.htm | 2 +- .../web/dns/templates/dns_template_list.htm | 10 +-- interface/web/help/templates/faq_edit.htm | 2 +- .../templates/faq_manage_questions_list.htm | 6 +- .../web/help/templates/help_faq_list.htm | 2 +- .../help/templates/help_faq_sections_list.htm | 6 +- .../help/templates/support_message_edit.htm | 2 +- .../help/templates/support_message_list.htm | 10 +-- interface/web/js/scrigo.js.php | 4 +- interface/web/login/templates/index.htm | 2 +- .../web/mail/templates/mail_alias_list.htm | 12 +-- .../mail/templates/mail_aliasdomain_list.htm | 12 +-- .../mail/templates/mail_blacklist_list.htm | 14 ++-- .../templates/mail_content_filter_list.htm | 14 ++-- .../mail/templates/mail_domain_admin_list.htm | 14 ++-- .../templates/mail_domain_catchall_list.htm | 12 +-- .../web/mail/templates/mail_domain_edit.htm | 6 +- .../web/mail/templates/mail_domain_list.htm | 12 +-- .../web/mail/templates/mail_forward_list.htm | 12 +-- .../web/mail/templates/mail_get_list.htm | 16 ++-- .../mail/templates/mail_mailinglist_list.htm | 10 +-- .../templates/mail_relay_recipient_list.htm | 12 +-- .../mail/templates/mail_transport_edit.htm | 2 +- .../mail/templates/mail_transport_list.htm | 16 ++-- .../mail_user_autoresponder_edit.htm | 6 +- .../mail/templates/mail_user_backup_list.htm | 2 +- .../templates/mail_user_custom_rules_edit.htm | 2 +- .../mail/templates/mail_user_filter_edit.htm | 6 +- .../mail/templates/mail_user_filter_list.htm | 8 +- .../web/mail/templates/mail_user_list.htm | 22 +++--- .../mail/templates/mail_user_stats_list.htm | 6 +- .../mail/templates/mail_whitelist_list.htm | 14 ++-- .../templates/spamfilter_blacklist_list.htm | 16 ++-- .../spamfilter_config_getmail_edit.htm | 2 +- .../mail/templates/spamfilter_config_list.htm | 8 +- .../templates/spamfilter_config_mail_edit.htm | 24 +++--- .../spamfilter_config_server_edit.htm | 10 +-- .../mail/templates/spamfilter_policy_list.htm | 16 ++-- .../mail/templates/spamfilter_users_list.htm | 16 ++-- .../templates/spamfilter_whitelist_list.htm | 16 ++-- .../mail/templates/user_quota_stats_list.htm | 8 +- .../mail_user_autoresponder_edit.htm | 6 +- .../templates/mail_user_filter_edit.htm | 6 +- .../templates/mail_user_filter_list.htm | 8 +- .../web/monitor/templates/datalog_list.htm | 12 +-- .../web/monitor/templates/syslog_list.htm | 14 ++-- .../sites/templates/aps_install_package.htm | 4 +- .../sites/templates/aps_instances_list.htm | 14 ++-- .../templates/aps_packagedetails_show.htm | 2 +- .../web/sites/templates/aps_packages_list.htm | 12 +-- interface/web/sites/templates/cron_list.htm | 24 +++--- .../sites/templates/database_admin_list.htm | 26 +++---- .../web/sites/templates/database_list.htm | 24 +++--- .../templates/database_quota_stats_list.htm | 6 +- .../templates/database_user_admin_list.htm | 10 +-- .../sites/templates/database_user_list.htm | 10 +-- .../web/sites/templates/ftp_user_list.htm | 16 ++-- .../web/sites/templates/shell_user_edit.htm | 2 +- .../web/sites/templates/shell_user_list.htm | 14 ++-- .../sites/templates/user_quota_stats_list.htm | 8 +- .../web/sites/templates/web_backup_list.htm | 2 +- .../templates/web_childdomain_advanced.htm | 2 +- .../sites/templates/web_childdomain_list.htm | 14 ++-- .../web/sites/templates/web_folder_list.htm | 14 ++-- .../sites/templates/web_folder_user_list.htm | 12 +-- .../sites/templates/web_sites_stats_list.htm | 6 +- .../templates/web_vhost_domain_admin_list.htm | 20 ++--- .../templates/web_vhost_domain_advanced.htm | 8 +- .../sites/templates/web_vhost_domain_list.htm | 18 ++--- .../templates/web_vhost_domain_redirect.htm | 2 +- .../sites/templates/web_vhost_domain_ssl.htm | 8 +- .../web/sites/templates/webdav_user_list.htm | 14 ++-- .../web/themes/blue/templates/main.tpl.htm | 6 +- .../themes/default/assets/fonts/ispconfig.eot | Bin 11128 -> 9752 bytes .../themes/default/assets/fonts/ispconfig.svg | 45 ++++++----- .../themes/default/assets/fonts/ispconfig.ttf | Bin 10956 -> 9580 bytes .../default/assets/fonts/ispconfig.woff | Bin 7268 -> 9656 bytes .../default/assets/stylesheets/fonts.css | 24 ++++++ .../default/assets/stylesheets/fonts.min.css | 71 +----------------- .../default/assets/stylesheets/ispconfig.css | 11 ++- .../assets/stylesheets/ispconfig.min.css | 2 +- .../assets/stylesheets/select2-spinner.gif | Bin 0 -> 1849 bytes .../default/assets/stylesheets/select2.png | Bin 0 -> 613 bytes .../assets/stylesheets/themes/dark/theme.css | 11 +++ .../stylesheets/themes/dark/theme.min.css | 2 +- .../stylesheets/themes/default/theme.css | 11 +++ .../stylesheets/themes/default/theme.min.css | 2 +- .../default_64_navimg/templates/main.tpl.htm | 4 +- .../default_combobox/templates/main.tpl.htm | 6 +- .../default_no_navimg/templates/main.tpl.htm | 4 +- .../web/tools/templates/dns_import_tupa.htm | 8 +- .../web/tools/templates/import_ispconfig.htm | 18 ++--- .../web/tools/templates/import_plesk.htm | 16 ++-- .../web/tools/templates/import_vpopmail.htm | 10 +-- interface/web/tools/templates/resync.htm | 24 +++--- interface/web/vm/templates/openvz_action.htm | 8 +- interface/web/vm/templates/openvz_ip_list.htm | 14 ++-- .../vm/templates/openvz_ostemplate_edit.htm | 2 +- .../vm/templates/openvz_ostemplate_list.htm | 16 ++-- .../web/vm/templates/openvz_template_edit.htm | 2 +- .../web/vm/templates/openvz_template_list.htm | 10 +-- interface/web/vm/templates/openvz_vm_edit.htm | 2 +- interface/web/vm/templates/openvz_vm_list.htm | 22 +++--- 147 files changed, 740 insertions(+), 743 deletions(-) create mode 100644 interface/web/themes/default/assets/stylesheets/select2-spinner.gif create mode 100644 interface/web/themes/default/assets/stylesheets/select2.png diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php index 1b613a9a89..ef4d08837f 100644 --- a/interface/lib/classes/listform.inc.php +++ b/interface/lib/classes/listform.inc.php @@ -348,29 +348,33 @@ class listform { sort($show_pages); $show_pages = array_unique($show_pages); - + + $content = ''; + return $content; } diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm index 204f60d4a4..1b3d89a0b1 100644 --- a/interface/web/admin/templates/directive_snippets_edit.htm +++ b/interface/web/admin/templates/directive_snippets_edit.htm @@ -17,7 +17,7 @@
-
  {tmpl_var name='variables_txt'}: {DOCROOT}, {FASTCGIPASS} +
  {tmpl_var name='variables_txt'}: {DOCROOT}, {FASTCGIPASS}
diff --git a/interface/web/admin/templates/directive_snippets_list.htm b/interface/web/admin/templates/directive_snippets_list.htm index 49d931a40f..e2fbf055e8 100644 --- a/interface/web/admin/templates/directive_snippets_list.htm +++ b/interface/web/admin/templates/directive_snippets_list.htm @@ -14,7 +14,7 @@

- + @@ -22,11 +22,11 @@ - - - + + + @@ -37,7 +37,7 @@ diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm index 836443a6ad..8d07ba8b70 100644 --- a/interface/web/admin/templates/firewall_list.htm +++ b/interface/web/admin/templates/firewall_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="name"} {tmpl_var name="type"} - {tmpl_var name='delete_txt'} +
- + @@ -23,12 +23,12 @@ - - - - + + + + @@ -40,7 +40,7 @@ diff --git a/interface/web/admin/templates/groups_edit.htm b/interface/web/admin/templates/groups_edit.htm index 757c7f0b04..3ec77e6a5c 100644 --- a/interface/web/admin/templates/groups_edit.htm +++ b/interface/web/admin/templates/groups_edit.htm @@ -11,7 +11,7 @@
-
+
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm index c9048dd2ed..3478b87a32 100644 --- a/interface/web/admin/templates/groups_list.htm +++ b/interface/web/admin/templates/groups_list.htm @@ -15,17 +15,17 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="tcp_port"} {tmpl_var name="udp_port"} - {tmpl_var name='delete_txt'} +
- + - - + + @@ -35,7 +35,7 @@ diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm index 4e386ade83..6612176059 100644 --- a/interface/web/admin/templates/iptables_list.htm +++ b/interface/web/admin/templates/iptables_list.htm @@ -13,7 +13,7 @@

 
- +
{tmpl_var name="name"} {tmpl_var name="description"} - {tmpl_var name='delete_txt'} +
- + @@ -26,16 +26,16 @@ - - + + - + - + @@ -51,7 +51,7 @@ diff --git a/interface/web/admin/templates/language_edit.htm b/interface/web/admin/templates/language_edit.htm index 0ae325fff4..91ab9a36b8 100644 --- a/interface/web/admin/templates/language_edit.htm +++ b/interface/web/admin/templates/language_edit.htm @@ -9,7 +9,7 @@ -
+
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm index ee32ff7243..0dfc3a04e3 100644 --- a/interface/web/admin/templates/language_import.htm +++ b/interface/web/admin/templates/language_import.htm @@ -12,13 +12,13 @@
-
+
-
+
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm index 0109fa8101..8021391caf 100644 --- a/interface/web/admin/templates/language_list.htm +++ b/interface/web/admin/templates/language_list.htm @@ -20,7 +20,7 @@

 
- +
{tmpl_var name="state"} {tmpl_var name="target"} - {tmpl_var name='delete_txt'} +
- + diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm index f35cdc1bf8..719ef05183 100644 --- a/interface/web/admin/templates/remote_user_list.htm +++ b/interface/web/admin/templates/remote_user_list.htm @@ -13,7 +13,7 @@

- + @@ -21,9 +21,9 @@ - + @@ -33,7 +33,7 @@ diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm index cc35e07a0f..d0a22c0d63 100644 --- a/interface/web/admin/templates/server_config_list.htm +++ b/interface/web/admin/templates/server_config_list.htm @@ -7,15 +7,15 @@

  - +
{tmpl_var name="remote_userid"} {tmpl_var name="remote_username"} - {tmpl_var name='delete_txt'} +
- + - + @@ -24,7 +24,7 @@ diff --git a/interface/web/admin/templates/server_edit_config.htm b/interface/web/admin/templates/server_edit_config.htm index aa3f34fee8..2ce1bcbd44 100644 --- a/interface/web/admin/templates/server_edit_config.htm +++ b/interface/web/admin/templates/server_edit_config.htm @@ -7,7 +7,7 @@
-
+
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm index 130eb71f45..0ec6ddbdc4 100644 --- a/interface/web/admin/templates/server_ip_list.htm +++ b/interface/web/admin/templates/server_ip_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="server_name"} - {tmpl_var name='delete_txt'} +
- + @@ -24,14 +24,14 @@ - - - - - - + + + + + + @@ -45,7 +45,7 @@ diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm index 0885f364f7..1660c0e7d1 100644 --- a/interface/web/admin/templates/server_list.htm +++ b/interface/web/admin/templates/server_list.htm @@ -7,7 +7,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="virtualhost"} {tmpl_var name="virtualhost_port"} - {tmpl_var name='delete_txt'} +
- + @@ -19,15 +19,15 @@ - - - - - - - + + + + + + + @@ -42,7 +42,7 @@ diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm index 5f3b9c8efe..3151a827f8 100644 --- a/interface/web/admin/templates/server_php_list.htm +++ b/interface/web/admin/templates/server_php_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="db_server"} {tmpl_var name="vserver_server"} - {tmpl_var name='delete_txt'} +
- + @@ -21,11 +21,11 @@ - - - + + + @@ -36,7 +36,7 @@ diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm index 5d8e4b94fd..4a2d241b93 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="client_id"} {tmpl_var name="name"} - {tmpl_var name='delete_txt'} +
- + @@ -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 eb71fab652..794465e106 100644 --- a/interface/web/admin/templates/software_repo_list.htm +++ b/interface/web/admin/templates/software_repo_list.htm @@ -14,7 +14,7 @@

{tmpl_var name="package_description"} ispapp{tmpl_var name="package_id"} - {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + +
- + @@ -22,11 +22,11 @@ - - - + + + @@ -37,7 +37,7 @@ diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm index 4adcda32a2..60ee779e57 100644 --- a/interface/web/admin/templates/software_update_list.htm +++ b/interface/web/admin/templates/software_update_list.htm @@ -22,7 +22,7 @@

 
- +
{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 db1853f2f4..da384d4165 100644 --- a/interface/web/admin/templates/system_config_domains_edit.htm +++ b/interface/web/admin/templates/system_config_domains_edit.htm @@ -17,7 +17,7 @@
-
+
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index 746daa1245..b96ed7a46f 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -15,7 +15,7 @@

- + @@ -24,12 +24,12 @@ - - - - + + + + @@ -42,8 +42,8 @@ diff --git a/interface/web/client/templates/client_circle_edit.htm b/interface/web/client/templates/client_circle_edit.htm index e8d58d9a5b..3438b739d6 100644 --- a/interface/web/client/templates/client_circle_edit.htm +++ b/interface/web/client/templates/client_circle_edit.htm @@ -17,7 +17,7 @@
-
+
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm index e45aa67eb4..60257f2588 100644 --- a/interface/web/client/templates/client_circle_list.htm +++ b/interface/web/client/templates/client_circle_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="groups"} - {tmpl_var name='login_as_txt'} - {tmpl_var name='delete_txt'} + +
- + @@ -23,12 +23,12 @@ - - - - + + + + @@ -40,7 +40,7 @@ diff --git a/interface/web/client/templates/client_del.htm b/interface/web/client/templates/client_del.htm index 9351f6e04a..7a435f0941 100644 --- a/interface/web/client/templates/client_del.htm +++ b/interface/web/client/templates/client_del.htm @@ -16,7 +16,7 @@ -
+
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm index 00b40e152f..3ff897c81e 100644 --- a/interface/web/client/templates/client_edit_address.htm +++ b/interface/web/client/templates/client_edit_address.htm @@ -151,7 +151,7 @@
-
+
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index c01523b030..e643b5d13a 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -48,7 +48,7 @@
-
+
{tmpl_var name='web_limits_txt'}
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm index 9652d29aa2..72432f8da4 100644 --- a/interface/web/client/templates/client_message.htm +++ b/interface/web/client/templates/client_message.htm @@ -27,7 +27,7 @@
-
 {tmpl_var name="variables_txt"} {tmpl_var name="message_variables"} +
 {tmpl_var name="variables_txt"} {tmpl_var name="message_variables"}
diff --git a/interface/web/client/templates/client_message_template_list.htm b/interface/web/client/templates/client_message_template_list.htm index ed31a1c7bb..a7ab5cd2a0 100644 --- a/interface/web/client/templates/client_message_template_list.htm +++ b/interface/web/client/templates/client_message_template_list.htm @@ -13,16 +13,16 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="circle_name"} {tmpl_var name="description"} - {tmpl_var name='delete_txt'} +
- + - - - + + + @@ -32,7 +32,7 @@ diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm index 26c9ed3274..fa0eb67c7e 100644 --- a/interface/web/client/templates/client_template_list.htm +++ b/interface/web/client/templates/client_template_list.htm @@ -14,7 +14,7 @@

 
{tmpl_var name="template_name"}
- {tmpl_var name='delete_txt'} +
- + @@ -22,11 +22,11 @@ - - - + + + @@ -37,7 +37,7 @@ diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index b1b54db1e0..8070020794 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="template_type"} {tmpl_var name="template_name"} - {tmpl_var name='delete_txt'} +
- + @@ -26,15 +26,15 @@ - - - - - - - + + + + + + + @@ -50,11 +50,11 @@ diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm index 39940ad6c7..d3fb7f71f1 100644 --- a/interface/web/client/templates/domain_list.htm +++ b/interface/web/client/templates/domain_list.htm @@ -14,16 +14,16 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="country"}		 - {tmpl_var name='login_as_txt'} + - {tmpl_var name='login_as_txt'} + - {tmpl_var name='delete_txt'} +
- + - - - + + + @@ -32,7 +32,7 @@ diff --git a/interface/web/client/templates/message_template.htm b/interface/web/client/templates/message_template.htm index 39dc876381..b2b15ce222 100644 --- a/interface/web/client/templates/message_template.htm +++ b/interface/web/client/templates/message_template.htm @@ -24,7 +24,7 @@
-
+

{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"}
{tmpl_var name='variables_description_txt'}
diff --git a/interface/web/client/templates/message_template_list.htm b/interface/web/client/templates/message_template_list.htm index 3e98e7b919..8696459554 100644 --- a/interface/web/client/templates/message_template_list.htm +++ b/interface/web/client/templates/message_template_list.htm @@ -13,16 +13,16 @@

{tmpl_var name='search_limit'}
{tmpl_var name="domain"} {tmpl_var name="sys_groupid"} - {tmpl_var name='delete_txt'} +
- + - - - + + + @@ -32,7 +32,7 @@ diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm index 8cf5e2a2f3..ef62e31693 100644 --- a/interface/web/client/templates/reseller_edit_address.htm +++ b/interface/web/client/templates/reseller_edit_address.htm @@ -151,7 +151,7 @@
-
+
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index 9a91dfbd86..b2556487d2 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -14,7 +14,7 @@

 
{tmpl_var name="template_name"}
- {tmpl_var name='delete_txt'} +
- + @@ -26,15 +26,15 @@ - - - - - - - + + + + + + + @@ -49,8 +49,8 @@ diff --git a/interface/web/dashboard/dashlets/templates/limits.htm b/interface/web/dashboard/dashlets/templates/limits.htm index 35445ab89b..145d54a342 100644 --- a/interface/web/dashboard/dashlets/templates/limits.htm +++ b/interface/web/dashboard/dashlets/templates/limits.htm @@ -1,7 +1,7 @@
{tmpl_var name='search_limit'}
- +
{tmpl_var name="city"}
{tmpl_var name="country"}		 - {tmpl_var name='login_as_txt'} - {tmpl_var name='delete_txt'} + +
- + diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm index a4b87a31e8..3c3bd2c62b 100644 --- a/interface/web/dashboard/dashlets/templates/mailquota.htm +++ b/interface/web/dashboard/dashlets/templates/mailquota.htm @@ -1,7 +1,7 @@
{tmpl_var name='limits_txt'}
   
- + diff --git a/interface/web/dashboard/dashlets/templates/quota.htm b/interface/web/dashboard/dashlets/templates/quota.htm index 823de6fe0b..09895a69b6 100644 --- a/interface/web/dashboard/dashlets/templates/quota.htm +++ b/interface/web/dashboard/dashlets/templates/quota.htm @@ -1,7 +1,7 @@
{tmpl_var name='mailquota_txt'}
{tmpl_var name='email_txt'} {tmpl_var name='name_txt'}
- + diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 3693d7dbee..fb70e86a28 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -37,7 +37,7 @@

{tmpl_var name='quota_txt'}
{tmpl_var name='domain_txt'} {tmpl_var name='used_txt'}
- + @@ -48,14 +48,14 @@ - - - - - - + + + + + + @@ -69,7 +69,7 @@ diff --git a/interface/web/dns/templates/dns_dkim_edit.htm b/interface/web/dns/templates/dns_dkim_edit.htm index 4391f1665b..a73f506654 100644 --- a/interface/web/dns/templates/dns_dkim_edit.htm +++ b/interface/web/dns/templates/dns_dkim_edit.htm @@ -7,7 +7,7 @@
-
+
diff --git a/interface/web/dns/templates/dns_slave_admin_list.htm b/interface/web/dns/templates/dns_slave_admin_list.htm index 0b6929c348..0ca821aaaa 100644 --- a/interface/web/dns/templates/dns_slave_admin_list.htm +++ b/interface/web/dns/templates/dns_slave_admin_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="aux"} {tmpl_var name="ttl"} - {tmpl_var name='delete_txt'} +
- + @@ -40,13 +40,13 @@ - - - - - + + + + + @@ -59,7 +59,7 @@ diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm index 6adeef1dfe..6a162291c6 100644 --- a/interface/web/dns/templates/dns_slave_list.htm +++ b/interface/web/dns/templates/dns_slave_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="origin"} {tmpl_var name="ns"} - {tmpl_var name='delete_txt'} +
- + @@ -39,12 +39,12 @@ - - - - + + + + @@ -56,7 +56,7 @@ diff --git a/interface/web/dns/templates/dns_soa_admin_list.htm b/interface/web/dns/templates/dns_soa_admin_list.htm index 97f6178a92..4fae01eb89 100644 --- a/interface/web/dns/templates/dns_soa_admin_list.htm +++ b/interface/web/dns/templates/dns_soa_admin_list.htm @@ -32,7 +32,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="origin"} {tmpl_var name="ns"} - {tmpl_var name='delete_txt'} +
- + @@ -43,14 +43,14 @@ - - - - - - + + + + + + @@ -64,7 +64,7 @@ diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm index 44dccd731a..161727b9c0 100644 --- a/interface/web/dns/templates/dns_soa_list.htm +++ b/interface/web/dns/templates/dns_soa_list.htm @@ -32,7 +32,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="ns"} {tmpl_var name="mbox"} - {tmpl_var name='delete_txt'} +
- + @@ -42,13 +42,13 @@ - - - - - + + + + + @@ -61,7 +61,7 @@ diff --git a/interface/web/dns/templates/dns_template_edit.htm b/interface/web/dns/templates/dns_template_edit.htm index d9fbb97941..e19bc562a9 100644 --- a/interface/web/dns/templates/dns_template_edit.htm +++ b/interface/web/dns/templates/dns_template_edit.htm @@ -17,7 +17,7 @@
-
+
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm index fc6a2fb560..699190dac2 100644 --- a/interface/web/dns/templates/dns_template_list.htm +++ b/interface/web/dns/templates/dns_template_list.htm @@ -14,17 +14,17 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="ns"} {tmpl_var name="mbox"} - {tmpl_var name='delete_txt'} +
- + - - + + @@ -34,7 +34,7 @@ diff --git a/interface/web/help/templates/faq_edit.htm b/interface/web/help/templates/faq_edit.htm index b49b39a129..a241d25aff 100644 --- a/interface/web/help/templates/faq_edit.htm +++ b/interface/web/help/templates/faq_edit.htm @@ -12,7 +12,7 @@
-
+
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm index ab720a4639..b920e4f8a8 100644 --- a/interface/web/help/templates/faq_manage_questions_list.htm +++ b/interface/web/help/templates/faq_manage_questions_list.htm @@ -10,7 +10,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="visible"} {tmpl_var name="name"} - {tmpl_var name='delete_txt'} +
- + @@ -24,10 +24,10 @@ diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm index 64d8f5790c..f5d7684ff7 100644 --- a/interface/web/help/templates/help_faq_list.htm +++ b/interface/web/help/templates/help_faq_list.htm @@ -5,7 +5,7 @@ {tmpl_var name='hf_answer'}

- {tmpl_var name="delete_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 c8d1a0cafa..906237e9ad 100644 --- a/interface/web/help/templates/help_faq_sections_list.htm +++ b/interface/web/help/templates/help_faq_sections_list.htm @@ -14,7 +14,7 @@

{tmpl_var name="faq_question_txt"} {tmpl_var name="faq_section_name_txt"}{tmpl_var name='hf_question'} {tmpl_var name='hf_section'} - {tmpl_var name="faq_delete_txt"} + - {tmpl_var name="faq_edit_txt"} +
- + @@ -26,10 +26,10 @@ diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm index 6b7923eb93..ea0c729840 100644 --- a/interface/web/help/templates/support_message_edit.htm +++ b/interface/web/help/templates/support_message_edit.htm @@ -17,7 +17,7 @@
-
+
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm index ca01e463ba..f9739bade4 100644 --- a/interface/web/help/templates/support_message_list.htm +++ b/interface/web/help/templates/support_message_list.htm @@ -14,7 +14,7 @@

{tmpl_var name="faq_section_name_txt"} {tmpl_var name="faq_delete_txt"}
{tmpl_var name='hfs_name'} - {tmpl_var name="faq_delete_txt"} + - {tmpl_var name="faq_edit_txt"} +
- + @@ -22,11 +22,11 @@ - - + + @@ -37,7 +37,7 @@ diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 83b8b5d47c..14453534b5 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -101,8 +101,8 @@ if($server_config_array['misc']['use_combobox'] == 'y'){ selectOnBlur: true, allowClear: true, }).on('change', function(e) { - if (jQuery(".panel #Filter").length > 0) { - jQuery(".panel #Filter").trigger('click'); + if (jQuery("#pageForm .table #Filter").length > 0) { + jQuery("#pageForm .table #Filter").trigger('click'); } }); /* TODO: find a better way! */ diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm index 946cbfc4ed..ebe94efcf6 100644 --- a/interface/web/login/templates/index.htm +++ b/interface/web/login/templates/index.htm @@ -26,7 +26,7 @@
-
+
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm index dabf15d5c5..4745e28f6d 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
  - +
{tmpl_var name="subject"} {tmpl_var name="tstamp"} - {tmpl_var name='delete_txt'} +
- + @@ -38,11 +38,11 @@ - - - + + + @@ -53,7 +53,7 @@ diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm index e33ed94ddb..aa8cfeec11 100644 --- a/interface/web/mail/templates/mail_aliasdomain_list.htm +++ b/interface/web/mail/templates/mail_aliasdomain_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="source"} {tmpl_var name="destination"} - {tmpl_var name='delete_txt'} +
- + @@ -38,11 +38,11 @@ - - - + + + @@ -53,7 +53,7 @@ diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm index a62ac14cc4..d315558762 100644 --- a/interface/web/mail/templates/mail_blacklist_list.htm +++ b/interface/web/mail/templates/mail_blacklist_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="source"} {tmpl_var name="destination"} - {tmpl_var name='delete_txt'} +
- + @@ -39,12 +39,12 @@ - - - - + + + + @@ -56,7 +56,7 @@ diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm index dbdcba29a9..cf17024067 100644 --- a/interface/web/mail/templates/mail_content_filter_list.htm +++ b/interface/web/mail/templates/mail_content_filter_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="source"} {tmpl_var name="type"} - {tmpl_var name='delete_txt'} +
- + @@ -39,12 +39,12 @@ - - - - + + + + @@ -56,7 +56,7 @@ diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm index 08ad17afc6..872e1f723b 100644 --- a/interface/web/mail/templates/mail_domain_admin_list.htm +++ b/interface/web/mail/templates/mail_domain_admin_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="pattern"} {tmpl_var name="action"} - {tmpl_var name='delete_txt'} +
- + @@ -22,12 +22,12 @@ - - - - + + + + @@ -39,7 +39,7 @@ diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm index 5a78e38311..82d5102dbb 100644 --- a/interface/web/mail/templates/mail_domain_catchall_list.htm +++ b/interface/web/mail/templates/mail_domain_catchall_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="server_id"} {tmpl_var name="domain"} - {tmpl_var name='delete_txt'} +
- + @@ -38,11 +38,11 @@ - - - + + + @@ -53,7 +53,7 @@ diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index 471aa6a9c0..8ab90c358e 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -101,16 +101,16 @@
-
+
{tmpl_var name='dkim_generate_txt'}
-
+
-
+
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index be37a3e539..cf5402c288 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="source"} {tmpl_var name="destination"} - {tmpl_var name='delete_txt'} +
- + @@ -38,11 +38,11 @@ - - - + + + @@ -53,7 +53,7 @@ diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index d8bf33eea3..8306373880 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="server_id"} {tmpl_var name="domain"} - {tmpl_var name='delete_txt'} +
- + @@ -38,11 +38,11 @@ - - - + + + @@ -53,7 +53,7 @@ diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index 054c67d438..b90ee97f72 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="source"} {tmpl_var name="destination"} - {tmpl_var name='delete_txt'} +
- + @@ -40,13 +40,13 @@ - - - - - + + + + + @@ -59,7 +59,7 @@ diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm index 230bb7eac9..a75d1f4966 100644 --- a/interface/web/mail/templates/mail_mailinglist_list.htm +++ b/interface/web/mail/templates/mail_mailinglist_list.htm @@ -29,17 +29,17 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="source_username"} {tmpl_var name="destination"} - {tmpl_var name='delete_txt'} +
- + - - + + @@ -52,7 +52,7 @@ {tmpl_var name='mailinglist_txt'} - {tmpl_var name='delete_txt'} + diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm index c05240a985..8c201de82b 100644 --- a/interface/web/mail/templates/mail_relay_recipient_list.htm +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -29,7 +29,7 @@

{tmpl_var name='search_limit'}
- +
- + @@ -37,11 +37,11 @@ - - - + + + @@ -52,7 +52,7 @@ diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm index 4a09c24719..fe02054a5d 100644 --- a/interface/web/mail/templates/mail_transport_edit.htm +++ b/interface/web/mail/templates/mail_transport_edit.htm @@ -24,7 +24,7 @@
-
+
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm index 2b2d89bba0..fa6954123b 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="server_id"} {tmpl_var name="source"} - {tmpl_var name='delete_txt'} +
- + @@ -40,13 +40,13 @@ - - - - - + + + + + @@ -59,7 +59,7 @@ diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm index 794158c9bb..132400eac4 100644 --- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm @@ -7,15 +7,15 @@
-
+
-
+
-
diff --git a/interface/web/mail/templates/mail_user_backup_list.htm b/interface/web/mail/templates/mail_user_backup_list.htm index 3cee7c2b21..8b2e1d6e5e 100644 --- a/interface/web/mail/templates/mail_user_backup_list.htm +++ b/interface/web/mail/templates/mail_user_backup_list.htm @@ -10,7 +10,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="transport"} {tmpl_var name="sort_order"} - {tmpl_var name='delete_txt'} +
- + 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 268211f163..653d17c861 100644 --- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm +++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm @@ -7,7 +7,7 @@
-
+
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm index a88b180db2..d60ed92dce 100644 --- a/interface/web/mail/templates/mail_user_filter_edit.htm +++ b/interface/web/mail/templates/mail_user_filter_edit.htm @@ -11,13 +11,13 @@
- -

+
+


-

+


diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm index 61440b83e1..c97fc6baf3 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -25,15 +25,15 @@

- + - + @@ -42,7 +42,7 @@ diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index 24c4c97443..445cb30dcd 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="rulename"} - {tmpl_var name='delete_txt'} +
- + @@ -43,16 +43,16 @@ - - - - - + + + + @@ -75,7 +75,7 @@ {tmpl_var name="webmail_txt"} - {tmpl_var name='delete_txt'} + diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm index 80267e6995..f946bc3c6c 100644 --- a/interface/web/mail/templates/mail_user_stats_list.htm +++ b/interface/web/mail/templates/mail_user_stats_list.htm @@ -7,7 +7,7 @@

{tmpl_var name='search_limit'}
- - - +
+
+
+
- +
- + @@ -17,13 +17,13 @@ - + diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index fd3d718307..842420633f 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
- + @@ -23,12 +23,12 @@ - - - - + + + + @@ -40,7 +40,7 @@ diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index 65d76d7018..79745d9ccf 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="source"} {tmpl_var name="type"} - {tmpl_var name='delete_txt'} +
- + @@ -24,13 +24,13 @@ - - - - - + + + + + @@ -43,7 +43,7 @@ diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm index ea5f6e9d5f..2133441285 100644 --- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm @@ -7,7 +7,7 @@
-
+
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm index 5ef5f8eace..97566a6aa6 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -14,15 +14,15 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="rid"} {tmpl_var name="email"} - {tmpl_var name='delete_txt'} +
- + - + @@ -31,7 +31,7 @@ diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm index 1dfe747842..5858c8ea8c 100644 --- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm @@ -7,51 +7,51 @@
- +
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm index fcd80d45b2..aa061bdc30 100644 --- a/interface/web/mail/templates/spamfilter_config_server_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm @@ -7,23 +7,23 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm index 8ed6e5cef8..1df9880bee 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -14,7 +14,7 @@

 
- +
{tmpl_var name="server_name"} - {tmpl_var name='delete_txt'} +
- + @@ -24,13 +24,13 @@ - - - - - + + + + + @@ -43,7 +43,7 @@ diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm index afe49cd232..b06c38f93b 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="banned_files_lover"} {tmpl_var name="bad_header_lover"} - {tmpl_var name='delete_txt'} +
- + @@ -24,13 +24,13 @@ - - - - - + + + + + @@ -43,7 +43,7 @@ diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm index a2b08e317d..61eb8b5bf2 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="policy_id"} {tmpl_var name="fullname"} - {tmpl_var name='delete_txt'} +
- + @@ -24,13 +24,13 @@ - - - - - + + + + + @@ -43,7 +43,7 @@ diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm index b07845e675..78e3873751 100644 --- a/interface/web/mail/templates/user_quota_stats_list.htm +++ b/interface/web/mail/templates/user_quota_stats_list.htm @@ -6,7 +6,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="rid"} {tmpl_var name="email"} - {tmpl_var name='delete_txt'} +
- + @@ -16,13 +16,13 @@ - - + + diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm index 484f4ada60..136d1ebd01 100644 --- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm @@ -7,15 +7,15 @@
-
+
-
+
-
+
diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm index 73ef2a95ee..deed91148a 100644 --- a/interface/web/mailuser/templates/mail_user_filter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm @@ -11,13 +11,13 @@
- - +
+
- +
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm index 139439e9ad..61fb63fbe1 100644 --- a/interface/web/mailuser/templates/mail_user_filter_list.htm +++ b/interface/web/mailuser/templates/mail_user_filter_list.htm @@ -13,15 +13,15 @@

{tmpl_var name='search_limit'}
      - +
- + - + @@ -30,7 +30,7 @@ diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm index f5437b0153..74bb1e202b 100644 --- a/interface/web/monitor/templates/datalog_list.htm +++ b/interface/web/monitor/templates/datalog_list.htm @@ -7,7 +7,7 @@

 
- +
{tmpl_var name="rulename"} - {tmpl_var name='delete_txt'} +
- + @@ -17,11 +17,11 @@ - - - + + + @@ -33,7 +33,7 @@ diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm index 41ce2ff872..c7c968f977 100644 --- a/interface/web/monitor/templates/syslog_list.htm +++ b/interface/web/monitor/templates/syslog_list.htm @@ -7,7 +7,7 @@

  - +
{tmpl_var name="action"} {tmpl_var name="dbtable"} - +
- + @@ -17,11 +17,11 @@ - - - + + + @@ -34,10 +34,10 @@ diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm index 5981e9bb5b..b942b9e62b 100644 --- a/interface/web/sites/templates/aps_install_package.htm +++ b/interface/web/sites/templates/aps_install_package.htm @@ -35,12 +35,12 @@ {tmpl_var name='pkg_license_content'} -
+
-
checked
/>  {tmpl_var name='acceptance_text'} +
checked
/>  {tmpl_var name='acceptance_text'}
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index 70f6c209cc..50e9cc247e 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -4,7 +4,7 @@

{tmpl_var name="list_head_txt"}

  - +
{tmpl_var name="message"} - {tmpl_var name='delete_txt'} + - {tmpl_var name='delete_txt'} +
- + @@ -16,15 +16,15 @@ - - + + - + - + @@ -40,7 +40,7 @@ diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm index 318b1ce7dc..d13c92da46 100644 --- a/interface/web/sites/templates/aps_packagedetails_show.htm +++ b/interface/web/sites/templates/aps_packagedetails_show.htm @@ -80,7 +80,7 @@ {tmpl_var name='pkg_license_name'}
{tmpl_var name='pkg_license_content'} -
+
diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index 8f74d188c5..5e734acccf 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -4,7 +4,7 @@

{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})

{tmpl_var name='name_txt'} {tmpl_var name='version_txt'} 
  - +
{tmpl_var name='instance_status'} - {tmpl_var name='delete_txt'} +
- + @@ -15,13 +15,13 @@ - - - + + + - + - + diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm index 9ca7b8edda..92ff1bf294 100644 --- a/interface/web/sites/templates/cron_list.htm +++ b/interface/web/sites/templates/cron_list.htm @@ -14,7 +14,7 @@

{tmpl_var name='name_txt'} {tmpl_var name='version_txt'} 
- + @@ -28,17 +28,17 @@ - - - - - - - - - + + + + + + + + + @@ -56,7 +56,7 @@ diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index 6e76387172..7c0c330763 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="command"}
- {tmpl_var name='delete_txt'} +
- + @@ -26,16 +26,16 @@ - - - - - - - - + + + + + + + + @@ -52,10 +52,10 @@ diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index 6c2f1e9818..c00faaebfc 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="database_name"} - {tmpl_var name='admin_txt'} + - {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + +
- + @@ -42,15 +42,15 @@ - - - - - - - + + + + + + + @@ -66,10 +66,10 @@ diff --git a/interface/web/sites/templates/database_quota_stats_list.htm b/interface/web/sites/templates/database_quota_stats_list.htm index 80b0bb0c19..2fd32e5752 100644 --- a/interface/web/sites/templates/database_quota_stats_list.htm +++ b/interface/web/sites/templates/database_quota_stats_list.htm @@ -6,7 +6,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="database_name"} - {tmpl_var name='admin_txt'} + - {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + +
- + @@ -16,13 +16,13 @@ - + diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm index f6d6ca2968..4a984e77b1 100644 --- a/interface/web/sites/templates/database_user_admin_list.htm +++ b/interface/web/sites/templates/database_user_admin_list.htm @@ -14,14 +14,14 @@

{tmpl_var name='search_limit'}
        - +
- + - - + + @@ -29,8 +29,8 @@ diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm index 4f6a7e176b..b083279d50 100644 --- a/interface/web/sites/templates/database_user_list.htm +++ b/interface/web/sites/templates/database_user_list.htm @@ -30,14 +30,14 @@

{tmpl_var name='search_limit'}
{tmpl_var name="database_user"} - {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + +
- + - - + + @@ -45,8 +45,8 @@ diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index 9526c245d9..048350a409 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
{tmpl_var name="database_user"} - {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + +
- + @@ -39,12 +39,12 @@ - - - - + + + + @@ -57,9 +57,9 @@ diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index 3bc3ab8beb..4b16539341 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -51,7 +51,7 @@
-
+
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm index 23d5417699..a04469cb2e 100644 --- a/interface/web/sites/templates/shell_user_list.htm +++ b/interface/web/sites/templates/shell_user_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="username"} - {tmpl_var name='admin_txt'} + - {tmpl_var name='delete_txt'} +
- + @@ -39,12 +39,12 @@ - - - - + + + + @@ -56,7 +56,7 @@ diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm index 641f06fde7..93109856e5 100644 --- a/interface/web/sites/templates/user_quota_stats_list.htm +++ b/interface/web/sites/templates/user_quota_stats_list.htm @@ -6,7 +6,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="parent_domain_id"} {tmpl_var name="username"} - {tmpl_var name='delete_txt'} +
- + @@ -17,14 +17,14 @@ - - + + diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm index 22ea0b7b34..e46eda6d89 100644 --- a/interface/web/sites/templates/web_backup_list.htm +++ b/interface/web/sites/templates/web_backup_list.htm @@ -10,7 +10,7 @@

{tmpl_var name='search_limit'}
        - +
- + diff --git a/interface/web/sites/templates/web_childdomain_advanced.htm b/interface/web/sites/templates/web_childdomain_advanced.htm index 430fe48f4e..2f00c50f28 100644 --- a/interface/web/sites/templates/web_childdomain_advanced.htm +++ b/interface/web/sites/templates/web_childdomain_advanced.htm @@ -7,7 +7,7 @@ Options
-
 {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"} +
 {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"}
diff --git a/interface/web/sites/templates/web_childdomain_list.htm b/interface/web/sites/templates/web_childdomain_list.htm index 7a011ff27a..bb5ab52491 100644 --- a/interface/web/sites/templates/web_childdomain_list.htm +++ b/interface/web/sites/templates/web_childdomain_list.htm @@ -30,7 +30,7 @@

- + @@ -39,12 +39,12 @@ - - - - + + + + @@ -56,7 +56,7 @@ diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm index da11a0cc37..07c555658a 100644 --- a/interface/web/sites/templates/web_folder_list.htm +++ b/interface/web/sites/templates/web_folder_list.htm @@ -29,7 +29,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="parent_domain_id"} {tmpl_var name="domain"} - {tmpl_var name='delete_txt'} +
- + @@ -38,12 +38,12 @@ - - - - + + + + @@ -55,7 +55,7 @@ diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm index ca75ef80d0..6c4f53a3a9 100644 --- a/interface/web/sites/templates/web_folder_user_list.htm +++ b/interface/web/sites/templates/web_folder_user_list.htm @@ -29,7 +29,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="parent_domain_id"} {tmpl_var name="path"} - {tmpl_var name='delete_txt'} +
- + @@ -37,11 +37,11 @@ - - - + + + @@ -52,7 +52,7 @@ diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index 22c73a8f7b..c771276d18 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -7,7 +7,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="web_folder_id"} {tmpl_var name="username"} - {tmpl_var name='delete_txt'} +
- + @@ -17,13 +17,13 @@ - + diff --git a/interface/web/sites/templates/web_vhost_domain_admin_list.htm b/interface/web/sites/templates/web_vhost_domain_admin_list.htm index fea321d716..945b79e710 100644 --- a/interface/web/sites/templates/web_vhost_domain_admin_list.htm +++ b/interface/web/sites/templates/web_vhost_domain_admin_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
- + @@ -24,14 +24,14 @@ - - - - - - + + + + + + @@ -43,9 +43,9 @@ - + diff --git a/interface/web/sites/templates/web_vhost_domain_advanced.htm b/interface/web/sites/templates/web_vhost_domain_advanced.htm index fc479de37f..1374d55c35 100644 --- a/interface/web/sites/templates/web_vhost_domain_advanced.htm +++ b/interface/web/sites/templates/web_vhost_domain_advanced.htm @@ -84,19 +84,19 @@
-
 {tmpl_var name="available_php_directive_snippets_txt"}

 {tmpl_var name="php_directive_snippets_txt"} +
 {tmpl_var name="available_php_directive_snippets_txt"}

 {tmpl_var name="php_directive_snippets_txt"}
-
 {tmpl_var name="available_apache_directive_snippets_txt"}

 {tmpl_var name="apache_directive_snippets_txt"}
----
 {tmpl_var name='variables_txt'}: {DOCROOT} +
 {tmpl_var name="available_apache_directive_snippets_txt"}

 {tmpl_var name="apache_directive_snippets_txt"}
----
 {tmpl_var name='variables_txt'}: {DOCROOT}
-
 {tmpl_var name="available_nginx_directive_snippets_txt"}

 {tmpl_var name="nginx_directive_snippets_txt"}
----
 {tmpl_var name='variables_txt'}: {DOCROOT}, {FASTCGIPASS} +
 {tmpl_var name="available_nginx_directive_snippets_txt"}

 {tmpl_var name="nginx_directive_snippets_txt"}
----
 {tmpl_var name='variables_txt'}: {DOCROOT}, {FASTCGIPASS}
-
 {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"} +
 {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"}
diff --git a/interface/web/sites/templates/web_vhost_domain_list.htm b/interface/web/sites/templates/web_vhost_domain_list.htm index 8244cdde33..116b5af12d 100644 --- a/interface/web/sites/templates/web_vhost_domain_list.htm +++ b/interface/web/sites/templates/web_vhost_domain_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="sys_groupid"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"}{tmpl_var name="domain"}Link{tmpl_var name="domain"} - {tmpl_var name='delete_txt'} +
- + @@ -40,13 +40,13 @@ - - - - - + + + + + @@ -57,9 +57,9 @@ - + diff --git a/interface/web/sites/templates/web_vhost_domain_redirect.htm b/interface/web/sites/templates/web_vhost_domain_redirect.htm index a81070523e..4f10fea8ef 100644 --- a/interface/web/sites/templates/web_vhost_domain_redirect.htm +++ b/interface/web/sites/templates/web_vhost_domain_redirect.htm @@ -32,7 +32,7 @@
-
 {tmpl_var name="allowed_rewrite_rule_directives_txt"}

 break
 if
 return
 rewrite
 set

 http://wiki.nginx.org/HttpRewriteModule +
 {tmpl_var name="allowed_rewrite_rule_directives_txt"}

 break
 if
 return
 rewrite
 set

 http://wiki.nginx.org/HttpRewriteModule
diff --git a/interface/web/sites/templates/web_vhost_domain_ssl.htm b/interface/web/sites/templates/web_vhost_domain_ssl.htm index 2ff5ee8bbe..d40dfd8c00 100644 --- a/interface/web/sites/templates/web_vhost_domain_ssl.htm +++ b/interface/web/sites/templates/web_vhost_domain_ssl.htm @@ -44,19 +44,19 @@
-
+
-
+
-
+
-
+
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm index 40ad48528e..5e7b5132b6 100644 --- a/interface/web/sites/templates/webdav_user_list.htm +++ b/interface/web/sites/templates/webdav_user_list.htm @@ -30,7 +30,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"}{tmpl_var name="domain"}Link{tmpl_var name="domain"} - {tmpl_var name='delete_txt'} +
- + @@ -39,12 +39,12 @@ - - - - + + + + @@ -56,7 +56,7 @@ diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm index f2ace7f9fa..260c727b0a 100644 --- a/interface/web/themes/blue/templates/main.tpl.htm +++ b/interface/web/themes/blue/templates/main.tpl.htm @@ -143,7 +143,7 @@ -
+

ISPConfig 3

@@ -161,7 +161,7 @@
-
+
 
@@ -178,7 +178,7 @@ diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm index 4a3694bd08..5a412743e9 100644 --- a/interface/web/themes/default_combobox/templates/main.tpl.htm +++ b/interface/web/themes/default_combobox/templates/main.tpl.htm @@ -163,7 +163,7 @@ select = this.element.hide(), selected = select.children( ":selected" ), value = selected.val() ? selected.text() : ""; - var input = this.input = $( "
" ) + var input = this.input = $( "
" ) .insertAfter( select ) .width( oldWidth ) .val( value ) @@ -293,7 +293,7 @@ LOGOUT -
+

ISPConfig 3

@@ -323,7 +323,7 @@
-
+
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm index bbd956ee24..36afa4153b 100644 --- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm +++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm @@ -139,7 +139,7 @@ LOGOUT -
+

ISPConfig 3

@@ -169,7 +169,7 @@
-
+
diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm index 0efb142245..7a5f5f8083 100644 --- a/interface/web/tools/templates/dns_import_tupa.htm +++ b/interface/web/tools/templates/dns_import_tupa.htm @@ -6,25 +6,25 @@
-
+
-
+
-
+
-
+
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm index 2385eeb564..ecd9574ca5 100644 --- a/interface/web/tools/templates/import_ispconfig.htm +++ b/interface/web/tools/templates/import_ispconfig.htm @@ -10,19 +10,19 @@
-
(e.g. https://www.example.com:8080/remote/ ) +
(e.g. https://www.example.com:8080/remote/ )
-
+
-
+
@@ -45,37 +45,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/interface/web/tools/templates/import_plesk.htm b/interface/web/tools/templates/import_plesk.htm index 08a901e5be..0bf97efd2c 100644 --- a/interface/web/tools/templates/import_plesk.htm +++ b/interface/web/tools/templates/import_plesk.htm @@ -6,50 +6,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm index ec677a5262..90cd905b73 100644 --- a/interface/web/tools/templates/import_vpopmail.htm +++ b/interface/web/tools/templates/import_vpopmail.htm @@ -10,31 +10,31 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm index 6e3b2bfec7..21c29d787c 100644 --- a/interface/web/tools/templates/resync.htm +++ b/interface/web/tools/templates/resync.htm @@ -7,7 +7,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/interface/web/vm/templates/openvz_action.htm b/interface/web/vm/templates/openvz_action.htm index a3bad27b99..49ca4e879f 100644 --- a/interface/web/vm/templates/openvz_action.htm +++ b/interface/web/vm/templates/openvz_action.htm @@ -16,28 +16,28 @@
-
+
-
+
-
+
-
+
 {tmpl_var name='ostemplate_desc_txt'}
diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm index 647f14750d..a5d5f8b37f 100644 --- a/interface/web/vm/templates/openvz_ip_list.htm +++ b/interface/web/vm/templates/openvz_ip_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="parent_domain_id"} {tmpl_var name="username"} - {tmpl_var name='delete_txt'} +
- + @@ -22,12 +22,12 @@ - - - - + + + + @@ -39,7 +39,7 @@ diff --git a/interface/web/vm/templates/openvz_ostemplate_edit.htm b/interface/web/vm/templates/openvz_ostemplate_edit.htm index 8edc2b395d..317ac9ae35 100644 --- a/interface/web/vm/templates/openvz_ostemplate_edit.htm +++ b/interface/web/vm/templates/openvz_ostemplate_edit.htm @@ -33,7 +33,7 @@
-
+
diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm index c9a41fd31a..d01bd1eb79 100644 --- a/interface/web/vm/templates/openvz_ostemplate_list.htm +++ b/interface/web/vm/templates/openvz_ostemplate_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="ip_address"} {tmpl_var name="reserved"} - {tmpl_var name='delete_txt'} +
- + @@ -23,13 +23,13 @@ - - - - - + + + + + @@ -42,7 +42,7 @@ diff --git a/interface/web/vm/templates/openvz_template_edit.htm b/interface/web/vm/templates/openvz_template_edit.htm index 00285d2fee..9859d211d6 100644 --- a/interface/web/vm/templates/openvz_template_edit.htm +++ b/interface/web/vm/templates/openvz_template_edit.htm @@ -59,7 +59,7 @@
-
+
diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm index 355b88e9fc..0942c37f28 100644 --- a/interface/web/vm/templates/openvz_template_list.htm +++ b/interface/web/vm/templates/openvz_template_list.htm @@ -13,17 +13,17 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="server_id"} {tmpl_var name="allservers"} - {tmpl_var name='delete_txt'} +
- + - - + + @@ -33,7 +33,7 @@ diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm index 3eacdb0e46..b34d828878 100644 --- a/interface/web/vm/templates/openvz_vm_edit.htm +++ b/interface/web/vm/templates/openvz_vm_edit.htm @@ -89,7 +89,7 @@
-
+
diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm index ef8e004975..cb9908642f 100644 --- a/interface/web/vm/templates/openvz_vm_list.htm +++ b/interface/web/vm/templates/openvz_vm_list.htm @@ -13,7 +13,7 @@

{tmpl_var name='search_limit'}
- +
{tmpl_var name="active"} {tmpl_var name="template_name"} - {tmpl_var name='delete_txt'} +
- + @@ -25,15 +25,15 @@ - - - - - - - + + + + + + + @@ -48,8 +48,8 @@ -- GitLab
{tmpl_var name='search_limit'}
- +
{tmpl_var name="hostname"} {tmpl_var name="ip_address"} - Action - {tmpl_var name='delete_txt'} + +