From ba731655369b9b5dd5d8514a4256905c7640f0ae Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Wed, 7 Jan 2015 11:03:09 +0100 Subject: [PATCH] Layout fixes --- .../templates/directive_snippets_edit.htm | 6 ++--- .../templates/directive_snippets_list.htm | 6 ++--- .../web/admin/templates/firewall_edit.htm | 4 +-- .../web/admin/templates/firewall_list.htm | 6 ++--- interface/web/admin/templates/groups_edit.htm | 6 ++--- interface/web/admin/templates/groups_list.htm | 6 ++--- .../web/admin/templates/iptables_edit.htm | 5 ++-- .../web/admin/templates/iptables_list.htm | 6 ++--- .../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 | 2 +- .../templates/remote_action_ispcupdate.htm | 2 +- .../templates/remote_action_osupdate.htm | 2 +- .../web/admin/templates/remote_user_edit.htm | 4 +-- .../web/admin/templates/remote_user_list.htm | 6 ++--- .../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 | 2 +- .../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 | 6 ++--- .../admin/templates/server_edit_services.htm | 4 +-- .../web/admin/templates/server_ip_edit.htm | 4 +-- .../web/admin/templates/server_ip_list.htm | 6 ++--- interface/web/admin/templates/server_list.htm | 2 +- .../templates/server_php_fastcgi_edit.htm | 4 +-- .../admin/templates/server_php_fpm_edit.htm | 4 +-- .../web/admin/templates/server_php_list.htm | 6 ++--- .../admin/templates/server_php_name_edit.htm | 4 +-- .../admin/templates/software_package_edit.htm | 4 +-- .../templates/software_package_install.htm | 4 +-- .../admin/templates/software_package_list.htm | 8 +++--- .../admin/templates/software_repo_edit.htm | 4 +-- .../admin/templates/software_repo_list.htm | 6 ++--- .../admin/templates/software_update_list.htm | 2 +- .../templates/system_config_domains_edit.htm | 6 ++--- .../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 | 8 +++--- .../web/admin/templates/users_user_edit.htm | 4 +-- .../client/templates/client_circle_edit.htm | 6 ++--- .../client/templates/client_circle_list.htm | 6 ++--- interface/web/client/templates/client_del.htm | 4 +-- .../client/templates/client_edit_address.htm | 6 ++--- .../client/templates/client_edit_limits.htm | 4 +-- .../web/client/templates/client_message.htm | 6 ++--- .../client_message_template_list.htm | 6 ++--- .../templates/client_template_edit_limits.htm | 4 +-- .../client_template_edit_template.htm | 4 +-- .../client/templates/client_template_list.htm | 6 ++--- .../web/client/templates/clients_list.htm | 10 +++---- .../web/client/templates/domain_edit.htm | 4 +-- .../web/client/templates/domain_list.htm | 6 ++--- .../web/client/templates/message_template.htm | 6 ++--- .../templates/message_template_list.htm | 6 ++--- .../templates/reseller_edit_address.htm | 6 ++--- .../client/templates/reseller_edit_limits.htm | 4 +-- .../web/client/templates/resellers_list.htm | 8 +++--- interface/web/dns/templates/dns_a_edit.htm | 4 +-- interface/web/dns/templates/dns_a_list.htm | 26 +++++++++---------- 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 +-- interface/web/dns/templates/dns_dkim_edit.htm | 6 ++--- .../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 +-- .../dns/templates/dns_slave_admin_list.htm | 6 ++--- .../web/dns/templates/dns_slave_edit.htm | 4 +-- .../web/dns/templates/dns_slave_list.htm | 6 ++--- .../web/dns/templates/dns_soa_admin_list.htm | 8 +++--- interface/web/dns/templates/dns_soa_edit.htm | 4 +-- interface/web/dns/templates/dns_soa_list.htm | 8 +++--- interface/web/dns/templates/dns_srv_edit.htm | 4 +-- .../web/dns/templates/dns_template_edit.htm | 6 ++--- .../web/dns/templates/dns_template_list.htm | 6 ++--- interface/web/dns/templates/dns_txt_edit.htm | 4 +-- interface/web/dns/templates/dns_wizard.htm | 4 +-- interface/web/help/templates/faq_edit.htm | 6 ++--- .../templates/faq_manage_questions_list.htm | 8 +++--- .../web/help/templates/faq_sections_edit.htm | 4 +-- .../help/templates/help_faq_sections_list.htm | 8 +++--- .../help/templates/support_message_edit.htm | 6 ++--- .../help/templates/support_message_list.htm | 6 ++--- .../help/templates/support_message_view.htm | 2 +- interface/web/login/templates/index.htm | 2 +- .../web/mail/templates/mail_alias_edit.htm | 4 +-- .../web/mail/templates/mail_alias_list.htm | 6 ++--- .../mail/templates/mail_aliasdomain_edit.htm | 4 +-- .../mail/templates/mail_aliasdomain_list.htm | 6 ++--- .../mail/templates/mail_blacklist_edit.htm | 4 +-- .../mail/templates/mail_blacklist_list.htm | 6 ++--- .../templates/mail_content_filter_edit.htm | 4 +-- .../templates/mail_content_filter_list.htm | 6 ++--- .../mail/templates/mail_domain_admin_list.htm | 6 ++--- .../templates/mail_domain_catchall_edit.htm | 4 +-- .../templates/mail_domain_catchall_list.htm | 6 ++--- .../web/mail/templates/mail_domain_edit.htm | 10 +++---- .../web/mail/templates/mail_domain_list.htm | 6 ++--- .../web/mail/templates/mail_forward_edit.htm | 6 ++--- .../web/mail/templates/mail_forward_list.htm | 6 ++--- .../web/mail/templates/mail_get_edit.htm | 4 +-- .../web/mail/templates/mail_get_list.htm | 6 ++--- .../mail/templates/mail_mailinglist_edit.htm | 4 +-- .../mail/templates/mail_mailinglist_list.htm | 6 ++--- .../templates/mail_relay_recipient_edit.htm | 4 +-- .../templates/mail_relay_recipient_list.htm | 6 ++--- .../mail/templates/mail_transport_edit.htm | 4 +-- .../mail/templates/mail_transport_list.htm | 6 ++--- .../mail_user_autoresponder_edit.htm | 8 +++--- .../web/mail/templates/mail_user_backup.htm | 4 +-- .../mail/templates/mail_user_backup_list.htm | 4 +-- .../templates/mail_user_custom_rules_edit.htm | 6 ++--- .../mail/templates/mail_user_filter_edit.htm | 4 +-- .../mail/templates/mail_user_filter_list.htm | 6 ++--- .../web/mail/templates/mail_user_list.htm | 6 ++--- .../mail/templates/mail_user_mailbox_edit.htm | 4 +-- .../templates/mail_user_mailfilter_edit.htm | 4 +-- .../mail/templates/mail_user_stats_list.htm | 2 +- .../mail/templates/mail_whitelist_edit.htm | 4 +-- .../mail/templates/mail_whitelist_list.htm | 6 ++--- .../templates/spamfilter_blacklist_edit.htm | 4 +-- .../templates/spamfilter_blacklist_list.htm | 6 ++--- .../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 | 6 ++--- .../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 | 6 ++--- .../templates/spamfilter_whitelist_edit.htm | 4 +-- .../templates/spamfilter_whitelist_list.htm | 6 ++--- .../mail/templates/user_quota_stats_list.htm | 2 +- .../mail_user_autoresponder_edit.htm | 6 ++--- .../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 | 4 +-- .../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 | 6 ++--- .../sites/templates/aps_instances_list.htm | 2 +- .../templates/aps_packagedetails_show.htm | 6 ++--- .../web/sites/templates/aps_packages_list.htm | 2 +- .../templates/aps_update_packagelist.htm | 4 +-- interface/web/sites/templates/cron_edit.htm | 4 +-- interface/web/sites/templates/cron_list.htm | 6 ++--- .../sites/templates/database_admin_list.htm | 8 +++--- .../web/sites/templates/database_edit.htm | 4 +-- .../web/sites/templates/database_list.htm | 8 +++--- .../templates/database_quota_stats_list.htm | 2 +- .../templates/database_user_admin_list.htm | 8 +++--- .../sites/templates/database_user_edit.htm | 4 +-- .../sites/templates/database_user_list.htm | 8 +++--- .../web/sites/templates/ftp_user_advanced.htm | 4 +-- .../templates/ftp_user_advanced_client.htm | 4 +-- .../web/sites/templates/ftp_user_edit.htm | 4 +-- .../web/sites/templates/ftp_user_list.htm | 6 ++--- .../sites/templates/shell_user_advanced.htm | 4 +-- .../web/sites/templates/shell_user_edit.htm | 6 ++--- .../web/sites/templates/shell_user_list.htm | 6 ++--- .../sites/templates/user_quota_stats_list.htm | 2 +- .../web/sites/templates/web_backup_list.htm | 4 +-- .../templates/web_childdomain_advanced.htm | 6 ++--- .../sites/templates/web_childdomain_edit.htm | 4 +-- .../sites/templates/web_childdomain_list.htm | 6 ++--- .../web/sites/templates/web_folder_edit.htm | 4 +-- .../web/sites/templates/web_folder_list.htm | 6 ++--- .../sites/templates/web_folder_user_edit.htm | 4 +-- .../sites/templates/web_folder_user_list.htm | 6 ++--- .../sites/templates/web_sites_stats_list.htm | 4 +-- .../templates/web_vhost_domain_admin_list.htm | 6 ++--- .../templates/web_vhost_domain_advanced.htm | 12 ++++----- .../templates/web_vhost_domain_backup.htm | 4 +-- .../sites/templates/web_vhost_domain_edit.htm | 4 +-- .../sites/templates/web_vhost_domain_list.htm | 6 ++--- .../templates/web_vhost_domain_redirect.htm | 6 ++--- .../sites/templates/web_vhost_domain_ssl.htm | 12 ++++----- .../templates/web_vhost_domain_stats.htm | 4 +-- .../web/sites/templates/webdav_user_edit.htm | 4 +-- .../web/sites/templates/webdav_user_list.htm | 6 ++--- .../default/assets/stylesheets/ispconfig.css | 8 +++--- .../assets/stylesheets/ispconfig.min.css | 2 +- .../web/tools/templates/dns_import_tupa.htm | 4 +-- .../web/tools/templates/import_ispconfig.htm | 8 +++--- .../web/tools/templates/import_plesk.htm | 4 +-- .../web/tools/templates/import_vpopmail.htm | 4 +-- .../tools/templates/interface_settings.htm | 4 +-- interface/web/tools/templates/resync.htm | 6 ++--- interface/web/tools/templates/tpl_default.htm | 4 +-- .../web/tools/templates/user_settings.htm | 4 +-- 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 | 6 ++--- .../vm/templates/openvz_ostemplate_edit.htm | 6 ++--- .../vm/templates/openvz_ostemplate_list.htm | 6 ++--- .../openvz_template_advanced_edit.htm | 4 +-- .../web/vm/templates/openvz_template_edit.htm | 6 ++--- .../web/vm/templates/openvz_template_list.htm | 6 ++--- .../vm/templates/openvz_vm_advanced_edit.htm | 4 +-- interface/web/vm/templates/openvz_vm_edit.htm | 6 ++--- interface/web/vm/templates/openvz_vm_list.htm | 8 +++--- 223 files changed, 496 insertions(+), 623 deletions(-) diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm index cc45309882..204f60d4a4 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}
@@ -36,8 +36,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index f5aa526661..be37a3e539 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -22,9 +22,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -50,7 +48,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="domain"} diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm index 909600f5ae..505a694ca7 100644 --- a/interface/web/mail/templates/mail_forward_edit.htm +++ b/interface/web/mail/templates/mail_forward_edit.htm @@ -15,7 +15,7 @@
- +
@@ -29,6 +29,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index 3dd6993b49..d8bf33eea3 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -22,9 +22,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -50,7 +48,7 @@ - + {tmpl_var name="active"} {tmpl_var name="source"} {tmpl_var name="destination"} diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm index 61e61233a4..c17bdebb3b 100644 --- a/interface/web/mail/templates/mail_get_edit.htm +++ b/interface/web/mail/templates/mail_get_edit.htm @@ -52,6 +52,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index 380049a7d1..054c67d438 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -22,9 +22,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -54,7 +52,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="source_server"} diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm index e7256b7f24..0dd1f53005 100644 --- a/interface/web/mail/templates/mail_mailinglist_edit.htm +++ b/interface/web/mail/templates/mail_mailinglist_edit.htm @@ -78,6 +78,6 @@
- - + +
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm index d37c5d1ffe..230bb7eac9 100644 --- a/interface/web/mail/templates/mail_mailinglist_list.htm +++ b/interface/web/mail/templates/mail_mailinglist_list.htm @@ -21,9 +21,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -47,7 +45,7 @@ - + {tmpl_var name="listname"} {tmpl_var name="domain"} diff --git a/interface/web/mail/templates/mail_relay_recipient_edit.htm b/interface/web/mail/templates/mail_relay_recipient_edit.htm index 563492193c..ae491de11d 100644 --- a/interface/web/mail/templates/mail_relay_recipient_edit.htm +++ b/interface/web/mail/templates/mail_relay_recipient_edit.htm @@ -27,6 +27,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm index 4f6e89b051..c05240a985 100644 --- a/interface/web/mail/templates/mail_relay_recipient_list.htm +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -21,9 +21,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -49,7 +47,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="source"} diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm index 07e774c5d2..4a09c24719 100644 --- a/interface/web/mail/templates/mail_transport_edit.htm +++ b/interface/web/mail/templates/mail_transport_edit.htm @@ -48,6 +48,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm index a788c8cb6b..2b2d89bba0 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -22,9 +22,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -54,7 +52,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="domain"} diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm index 88e86165b4..794158c9bb 100644 --- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm @@ -11,7 +11,7 @@
- +
@@ -30,9 +30,7 @@
- - +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_backup.htm b/interface/web/mail/templates/mail_user_backup.htm index a6e2650bc2..873a040468 100644 --- a/interface/web/mail/templates/mail_user_backup.htm +++ b/interface/web/mail/templates/mail_user_backup.htm @@ -31,6 +31,6 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_backup_list.htm b/interface/web/mail/templates/mail_user_backup_list.htm index 6b00afd893..3cee7c2b21 100644 --- a/interface/web/mail/templates/mail_user_backup_list.htm +++ b/interface/web/mail/templates/mail_user_backup_list.htm @@ -20,14 +20,14 @@ - + {tmpl_var name="date"} {tmpl_var name="filename"} {tmpl_var name="filesize"}
-
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 3ce8bb098b..268211f163 100644 --- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm +++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm @@ -7,13 +7,13 @@
- +
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm index 5ded556a6c..a88b180db2 100644 --- a/interface/web/mail/templates/mail_user_filter_edit.htm +++ b/interface/web/mail/templates/mail_user_filter_edit.htm @@ -30,6 +30,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm index a45ddab25e..61440b83e1 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -17,9 +17,7 @@
{tmpl_var name="toolsarea_head_txt"} - +
@@ -41,7 +39,7 @@ - + {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 300fc3f1a9..24c4c97443 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -22,9 +22,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -60,7 +58,7 @@ - + {tmpl_var name="email"} diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 650835a32f..4888b04cfa 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -83,6 +83,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_mailfilter_edit.htm b/interface/web/mail/templates/mail_user_mailfilter_edit.htm index b1de5c97c3..ebf6a4d270 100644 --- a/interface/web/mail/templates/mail_user_mailfilter_edit.htm +++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm @@ -18,6 +18,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm index b97f621a19..80267e6995 100644 --- a/interface/web/mail/templates/mail_user_stats_list.htm +++ b/interface/web/mail/templates/mail_user_stats_list.htm @@ -29,7 +29,7 @@ - + {tmpl_var name="email"} {tmpl_var name="this_month"} {tmpl_var name="last_month"} diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm index da1d93656d..f417c61d72 100644 --- a/interface/web/mail/templates/mail_whitelist_edit.htm +++ b/interface/web/mail/templates/mail_whitelist_edit.htm @@ -33,6 +33,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index 0bb0a15cf4..fd3d718307 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -6,9 +6,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -36,7 +34,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="source"} diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm index aff0b2e0bd..3fe3ff5c36 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm @@ -41,6 +41,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index f496e12f3c..65d76d7018 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -6,9 +6,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -38,7 +36,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="priority"} diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm index a59f29b383..ea5f6e9d5f 100644 --- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm @@ -14,6 +14,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm index a056020c67..5ef5f8eace 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -6,9 +6,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -30,7 +28,7 @@ - + {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 e9d275618d..1dfe747842 100644 --- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm @@ -58,6 +58,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm index 7420edd4d3..fcd80d45b2 100644 --- a/interface/web/mail/templates/spamfilter_config_server_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm @@ -30,6 +30,6 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm index 911e34dc1e..4ef6ac8575 100644 --- a/interface/web/mail/templates/spamfilter_other_edit.htm +++ b/interface/web/mail/templates/spamfilter_other_edit.htm @@ -72,6 +72,6 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm index e1698a06e3..5eab1be952 100644 --- a/interface/web/mail/templates/spamfilter_policy_edit.htm +++ b/interface/web/mail/templates/spamfilter_policy_edit.htm @@ -56,6 +56,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm index e7788be47e..8ed6e5cef8 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -6,9 +6,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -38,7 +36,7 @@ - + {tmpl_var name="policy_name"} {tmpl_var name="virus_lover"} {tmpl_var name="spam_lover"} diff --git a/interface/web/mail/templates/spamfilter_quarantine_edit.htm b/interface/web/mail/templates/spamfilter_quarantine_edit.htm index 053e94b9c1..b35a5b7e7f 100644 --- a/interface/web/mail/templates/spamfilter_quarantine_edit.htm +++ b/interface/web/mail/templates/spamfilter_quarantine_edit.htm @@ -36,6 +36,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm index c9d27aa0ae..f82dad7816 100644 --- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm +++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm @@ -44,6 +44,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm index 15847ae5cc..359a197829 100644 --- a/interface/web/mail/templates/spamfilter_users_edit.htm +++ b/interface/web/mail/templates/spamfilter_users_edit.htm @@ -42,6 +42,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm index 4f03774104..afe49cd232 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -6,9 +6,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -38,7 +36,7 @@ - + {tmpl_var name="local"} {tmpl_var name="server_id"} {tmpl_var name="priority"} diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm index beb7525004..26832901a0 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm @@ -41,6 +41,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm index 094a7d9a3d..a2b08e317d 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -6,9 +6,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -38,7 +36,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="priority"} diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm index 1945ab0d65..b07845e675 100644 --- a/interface/web/mail/templates/user_quota_stats_list.htm +++ b/interface/web/mail/templates/user_quota_stats_list.htm @@ -28,7 +28,7 @@ - + {tmpl_var name="email"} {tmpl_var name="name"} {tmpl_var name="used"} diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm index bb4ebc7ef6..484f4ada60 100644 --- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm @@ -11,7 +11,7 @@
- +
@@ -29,6 +29,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mailuser/templates/mail_user_cc_edit.htm b/interface/web/mailuser/templates/mail_user_cc_edit.htm index 0ba06e8a1a..56908ac2a9 100644 --- a/interface/web/mailuser/templates/mail_user_cc_edit.htm +++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm @@ -18,6 +18,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm index 2004c2c4b1..73ef2a95ee 100644 --- a/interface/web/mailuser/templates/mail_user_filter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm @@ -30,6 +30,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm index e280daae3b..139439e9ad 100644 --- a/interface/web/mailuser/templates/mail_user_filter_list.htm +++ b/interface/web/mailuser/templates/mail_user_filter_list.htm @@ -5,9 +5,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -29,7 +27,7 @@ - + {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 48c5a3e675..9c6d187284 100644 --- a/interface/web/mailuser/templates/mail_user_password_edit.htm +++ b/interface/web/mailuser/templates/mail_user_password_edit.htm @@ -29,6 +29,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm index 39e8670f95..7b73286297 100644 --- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm @@ -20,6 +20,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm index 8dd1e4c9de..f5437b0153 100644 --- a/interface/web/monitor/templates/datalog_list.htm +++ b/interface/web/monitor/templates/datalog_list.htm @@ -27,7 +27,7 @@ - + {tmpl_var name="tstamp"} {tmpl_var name="server_id"} {tmpl_var name="action"} diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm index d9e3b46e34..41ce2ff872 100644 --- a/interface/web/monitor/templates/syslog_list.htm +++ b/interface/web/monitor/templates/syslog_list.htm @@ -27,7 +27,7 @@ - + {tmpl_var name="tstamp"} {tmpl_var name="server_id"} {tmpl_var name="loglevel"} diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm index 8ccfee1013..5981e9bb5b 100644 --- a/interface/web/sites/templates/aps_install_package.htm +++ b/interface/web/sites/templates/aps_install_package.htm @@ -35,7 +35,7 @@ {tmpl_var name='pkg_license_content'} - +
@@ -46,6 +46,6 @@
- - + +
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index 4810e86e65..70f6c209cc 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -30,7 +30,7 @@ - + {tmpl_var name='package_name'} {tmpl_var name='package_version'}-{tmpl_var name='package_release'} diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm index 9e50565702..318b1ce7dc 100644 --- a/interface/web/sites/templates/aps_packagedetails_show.htm +++ b/interface/web/sites/templates/aps_packagedetails_show.htm @@ -10,9 +10,7 @@
- +

 

 

@@ -82,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 60daf35392..8f74d188c5 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -26,7 +26,7 @@ - + {tmpl_var name='name'} {tmpl_var name='version'}-{tmpl_var name='release'} {tmpl_var name='category'} diff --git a/interface/web/sites/templates/aps_update_packagelist.htm b/interface/web/sites/templates/aps_update_packagelist.htm index b366386019..1ce4110746 100644 --- a/interface/web/sites/templates/aps_update_packagelist.htm +++ b/interface/web/sites/templates/aps_update_packagelist.htm @@ -7,6 +7,6 @@ {tmpl_var name="legend_txt"}
- - + +
diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm index a27e163584..705ce4e63f 100644 --- a/interface/web/sites/templates/cron_edit.htm +++ b/interface/web/sites/templates/cron_edit.htm @@ -66,6 +66,6 @@
- - + +
\ No newline at end of file diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm index 3914beecc9..9ca7b8edda 100644 --- a/interface/web/sites/templates/cron_list.htm +++ b/interface/web/sites/templates/cron_list.htm @@ -6,9 +6,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -46,7 +44,7 @@ - + {tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"} diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index 1ad0516fb8..6e76387172 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -5,9 +5,7 @@

{tmpl_var name="toolsarea_head_txt"}

- + @@ -43,7 +41,7 @@ - + {tmpl_var name="active"} {tmpl_var name="remote_access"} {tmpl_var name="type"} @@ -56,7 +54,7 @@ {tmpl_var name='admin_txt'} - {tmpl_var name='edit_txt'} + {tmpl_var name='edit_txt'} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index d8bb87e7dd..4958e05929 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -113,8 +113,8 @@
- - + +