From 825dd6792d2d46b7d97e1f1626a9071382977cd2 Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Fri, 19 Dec 2014 21:15:19 +0100 Subject: [PATCH] - First run of template converting for new layout --- .../templates/directive_snippets_edit.htm | 55 +-- .../templates/directive_snippets_list.htm | 67 ++- .../web/admin/templates/firewall_edit.htm | 53 +- .../web/admin/templates/firewall_list.htm | 73 ++- interface/web/admin/templates/groups_edit.htm | 35 +- interface/web/admin/templates/groups_list.htm | 61 ++- .../web/admin/templates/iptables_edit.htm | 102 ++-- .../web/admin/templates/iptables_list.htm | 96 ++-- .../web/admin/templates/language_add.htm | 37 +- .../web/admin/templates/language_complete.htm | 24 +- .../web/admin/templates/language_edit.htm | 19 +- .../web/admin/templates/language_export.htm | 32 +- .../web/admin/templates/language_import.htm | 48 +- .../web/admin/templates/language_list.htm | 52 +- .../templates/remote_action_ispcupdate.htm | 26 +- .../templates/remote_action_osupdate.htm | 29 +- .../web/admin/templates/remote_user_edit.htm | 47 +- .../web/admin/templates/remote_user_list.htm | 63 ++- .../templates/server_config_cron_edit.htm | 47 +- .../templates/server_config_dns_edit.htm | 63 ++- .../templates/server_config_fastcgi_edit.htm | 87 ++-- .../templates/server_config_getmail_edit.htm | 31 +- .../templates/server_config_jailkit_edit.htm | 55 +-- .../admin/templates/server_config_list.htm | 40 +- .../templates/server_config_mail_edit.htm | 201 ++++---- .../templates/server_config_rescue_edit.htm | 31 +- .../templates/server_config_server_edit.htm | 185 ++++--- .../templates/server_config_ufw_edit.htm | 79 ++- .../templates/server_config_vlogger_edit.htm | 31 +- .../templates/server_config_web_edit.htm | 431 +++++++++-------- .../admin/templates/server_edit_config.htm | 27 +- .../admin/templates/server_edit_services.htm | 83 ++-- .../web/admin/templates/server_ip_edit.htm | 67 ++- .../web/admin/templates/server_ip_list.htm | 85 ++-- interface/web/admin/templates/server_list.htm | 78 +-- .../templates/server_php_fastcgi_edit.htm | 37 +- .../admin/templates/server_php_fpm_edit.htm | 45 +- .../web/admin/templates/server_php_list.htm | 67 ++- .../admin/templates/server_php_name_edit.htm | 45 +- .../admin/templates/software_package_edit.htm | 34 +- .../templates/software_package_install.htm | 24 +- .../admin/templates/software_package_list.htm | 61 ++- .../admin/templates/software_repo_edit.htm | 57 ++- .../admin/templates/software_repo_list.htm | 67 ++- .../admin/templates/software_update_list.htm | 52 +- .../templates/system_config_domains_edit.htm | 33 +- .../templates/system_config_mail_edit.htm | 139 +++--- .../templates/system_config_misc_edit.htm | 187 ++++---- .../templates/system_config_sites_edit.htm | 123 +++-- .../web/admin/templates/tpl_default_basic.htm | 29 +- .../web/admin/templates/users_groups_edit.htm | 37 +- interface/web/admin/templates/users_list.htm | 75 ++- .../web/admin/templates/users_user_edit.htm | 89 ++-- .../client/templates/client_circle_edit.htm | 45 +- .../client/templates/client_circle_list.htm | 73 ++- interface/web/client/templates/client_del.htm | 19 +- .../client/templates/client_edit_address.htm | 291 ++++++----- .../client/templates/client_edit_limits.htm | 436 ++++++++--------- .../web/client/templates/client_message.htm | 51 +- .../client_message_template_list.htm | 53 +- .../templates/client_template_edit_limits.htm | 413 ++++++++-------- .../client_template_edit_template.htm | 37 +- .../client/templates/client_template_list.htm | 67 ++- .../web/client/templates/clients_list.htm | 95 ++-- .../web/client/templates/domain_edit.htm | 37 +- .../web/client/templates/domain_list.htm | 55 ++- .../web/client/templates/message_template.htm | 44 +- .../templates/message_template_list.htm | 53 +- .../templates/reseller_edit_address.htm | 291 ++++++----- .../client/templates/reseller_edit_limits.htm | 452 +++++++++--------- .../web/client/templates/resellers_list.htm | 93 ++-- .../dashboard/dashlets/templates/limits.htm | 4 +- .../dashlets/templates/mailquota.htm | 6 +- .../dashboard/dashlets/templates/quota.htm | 6 +- interface/web/dns/templates/dns_a_edit.htm | 51 +- interface/web/dns/templates/dns_a_list.htm | 91 ++-- interface/web/dns/templates/dns_aaaa_edit.htm | 51 +- .../web/dns/templates/dns_alias_edit.htm | 51 +- .../web/dns/templates/dns_cname_edit.htm | 51 +- interface/web/dns/templates/dns_dkim_edit.htm | 48 +- .../web/dns/templates/dns_hinfo_edit.htm | 51 +- interface/web/dns/templates/dns_import.htm | 61 ++- interface/web/dns/templates/dns_mx_edit.htm | 59 ++- interface/web/dns/templates/dns_ns_edit.htm | 51 +- interface/web/dns/templates/dns_ptr_edit.htm | 51 +- .../web/dns/templates/dns_records_edit.htm | 4 +- interface/web/dns/templates/dns_rp_edit.htm | 51 +- .../dns/templates/dns_slave_admin_list.htm | 77 ++- .../web/dns/templates/dns_slave_edit.htm | 85 ++-- .../web/dns/templates/dns_slave_list.htm | 71 ++- .../web/dns/templates/dns_soa_admin_list.htm | 89 ++-- interface/web/dns/templates/dns_soa_edit.htm | 163 ++++--- interface/web/dns/templates/dns_soa_list.htm | 81 ++-- interface/web/dns/templates/dns_srv_edit.htm | 75 ++- .../web/dns/templates/dns_template_edit.htm | 45 +- .../web/dns/templates/dns_template_list.htm | 61 ++- interface/web/dns/templates/dns_txt_edit.htm | 51 +- interface/web/dns/templates/dns_wizard.htm | 115 +++-- interface/web/help/templates/faq_edit.htm | 37 +- .../templates/faq_manage_questions_list.htm | 51 +- .../web/help/templates/faq_sections_edit.htm | 25 +- .../web/help/templates/help_faq_list.htm | 4 +- .../help/templates/help_faq_sections_list.htm | 53 +- .../help/templates/support_message_edit.htm | 41 +- .../help/templates/support_message_list.htm | 67 ++- .../help/templates/support_message_view.htm | 31 +- interface/web/login/templates/index.htm | 38 +- .../web/login/templates/password_reset.htm | 32 +- .../web/mail/templates/mail_alias_edit.htm | 47 +- .../web/mail/templates/mail_alias_list.htm | 67 ++- .../mail/templates/mail_aliasdomain_edit.htm | 43 +- .../mail/templates/mail_aliasdomain_list.htm | 67 ++- .../mail/templates/mail_blacklist_edit.htm | 51 +- .../mail/templates/mail_blacklist_list.htm | 73 ++- .../templates/mail_content_filter_edit.htm | 67 ++- .../templates/mail_content_filter_list.htm | 73 ++- .../mail/templates/mail_domain_admin_list.htm | 73 ++- .../templates/mail_domain_catchall_edit.htm | 45 +- .../templates/mail_domain_catchall_list.htm | 67 ++- .../web/mail/templates/mail_domain_edit.htm | 114 +++-- .../web/mail/templates/mail_domain_list.htm | 67 ++- .../web/mail/templates/mail_forward_edit.htm | 43 +- .../web/mail/templates/mail_forward_list.htm | 67 ++- .../web/mail/templates/mail_get_edit.htm | 75 ++- .../web/mail/templates/mail_get_list.htm | 79 ++- .../mail/templates/mail_mailinglist_edit.htm | 97 ++-- .../mail/templates/mail_mailinglist_list.htm | 63 ++- .../templates/mail_relay_recipient_edit.htm | 43 +- .../templates/mail_relay_recipient_list.htm | 67 ++- .../mail/templates/mail_transport_edit.htm | 77 ++- .../mail/templates/mail_transport_list.htm | 79 ++- .../mail_user_autoresponder_edit.htm | 56 +-- .../web/mail/templates/mail_user_backup.htm | 37 +- .../mail/templates/mail_user_backup_list.htm | 38 +- .../templates/mail_user_custom_rules_edit.htm | 25 +- .../mail/templates/mail_user_filter_edit.htm | 45 +- .../mail/templates/mail_user_filter_list.htm | 42 +- .../web/mail/templates/mail_user_list.htm | 101 ++-- .../mail/templates/mail_user_mailbox_edit.htm | 113 +++-- .../templates/mail_user_mailfilter_edit.htm | 27 +- .../mail/templates/mail_user_stats_list.htm | 62 +-- .../mail/templates/mail_whitelist_edit.htm | 51 +- .../mail/templates/mail_whitelist_list.htm | 73 ++- .../templates/spamfilter_blacklist_edit.htm | 59 ++- .../templates/spamfilter_blacklist_list.htm | 79 ++- .../spamfilter_config_getmail_edit.htm | 21 +- .../mail/templates/spamfilter_config_list.htm | 55 ++- .../templates/spamfilter_config_mail_edit.htm | 83 ++-- .../spamfilter_config_server_edit.htm | 43 +- .../mail/templates/spamfilter_other_edit.htm | 133 +++--- .../mail/templates/spamfilter_policy_edit.htm | 85 ++-- .../mail/templates/spamfilter_policy_list.htm | 79 ++- .../templates/spamfilter_quarantine_edit.htm | 69 ++- .../templates/spamfilter_taglevel_edit.htm | 85 ++-- .../mail/templates/spamfilter_users_edit.htm | 69 ++- .../mail/templates/spamfilter_users_list.htm | 79 ++- .../templates/spamfilter_whitelist_edit.htm | 59 ++- .../templates/spamfilter_whitelist_list.htm | 79 ++- .../mail/templates/user_quota_stats_list.htm | 62 +-- interface/web/mailuser/templates/index.htm | 32 +- .../mail_user_autoresponder_edit.htm | 51 +- .../mailuser/templates/mail_user_cc_edit.htm | 33 +- .../templates/mail_user_filter_edit.htm | 49 +- .../templates/mail_user_filter_list.htm | 57 ++- .../templates/mail_user_password_edit.htm | 37 +- .../templates/mail_user_spamfilter_edit.htm | 33 +- .../web/monitor/templates/datalog_list.htm | 60 +-- interface/web/monitor/templates/show_data.htm | 8 +- interface/web/monitor/templates/show_log.htm | 28 +- .../web/monitor/templates/show_monit.htm | 4 +- .../web/monitor/templates/show_munin.htm | 4 +- .../web/monitor/templates/show_sys_state.htm | 28 +- .../web/monitor/templates/syslog_list.htm | 62 +-- .../sites/templates/aps_install_package.htm | 45 +- .../sites/templates/aps_instances_list.htm | 66 ++- .../templates/aps_packagedetails_show.htm | 42 +- .../web/sites/templates/aps_packages_list.htm | 54 +-- .../templates/aps_update_packagelist.htm | 26 +- interface/web/sites/templates/cron_edit.htm | 95 ++-- interface/web/sites/templates/cron_list.htm | 103 ++-- .../sites/templates/database_admin_list.htm | 101 ++-- .../web/sites/templates/database_edit.htm | 135 +++--- .../web/sites/templates/database_list.htm | 93 ++-- .../templates/database_quota_stats_list.htm | 62 +-- .../templates/database_user_admin_list.htm | 55 ++- .../sites/templates/database_user_edit.htm | 57 ++- .../sites/templates/database_user_list.htm | 55 ++- .../web/sites/templates/ftp_user_advanced.htm | 89 ++-- .../templates/ftp_user_advanced_client.htm | 33 +- .../web/sites/templates/ftp_user_edit.htm | 61 ++- .../web/sites/templates/ftp_user_list.htm | 75 ++- .../sites/templates/shell_user_advanced.htm | 53 +- .../web/sites/templates/shell_user_edit.htm | 79 ++- .../web/sites/templates/shell_user_list.htm | 73 ++- .../sites/templates/user_quota_stats_list.htm | 70 +-- .../web/sites/templates/web_backup_list.htm | 42 +- .../templates/web_childdomain_advanced.htm | 25 +- .../sites/templates/web_childdomain_edit.htm | 113 +++-- .../sites/templates/web_childdomain_list.htm | 73 ++- .../templates/web_directive_snippets.htm | 8 +- .../web/sites/templates/web_folder_edit.htm | 43 +- .../web/sites/templates/web_folder_list.htm | 73 ++- .../sites/templates/web_folder_user_edit.htm | 55 +-- .../sites/templates/web_folder_user_list.htm | 67 ++- .../sites/templates/web_sites_stats_list.htm | 74 +-- .../templates/web_vhost_domain_admin_list.htm | 85 ++-- .../templates/web_vhost_domain_advanced.htm | 143 +++--- .../templates/web_vhost_domain_backup.htm | 45 +- .../sites/templates/web_vhost_domain_edit.htm | 249 +++++----- .../sites/templates/web_vhost_domain_list.htm | 79 ++- .../templates/web_vhost_domain_redirect.htm | 49 +- .../sites/templates/web_vhost_domain_ssl.htm | 99 ++-- .../templates/web_vhost_domain_stats.htm | 45 +- .../web/sites/templates/webdav_user_edit.htm | 65 ++- .../web/sites/templates/webdav_user_list.htm | 73 ++- .../web/themes/blue/templates/main.tpl.htm | 10 +- .../web/themes/default/templates/main.tpl.htm | 14 +- .../themes/default/templates/module.tpl.htm | 2 +- .../default/templates/module_tree.tpl.htm | 2 +- .../default_64_navimg/templates/main.tpl.htm | 6 +- .../default_combobox/templates/main.tpl.htm | 10 +- .../default_no_navimg/templates/main.tpl.htm | 6 +- .../web/tools/templates/dns_import_tupa.htm | 59 ++- .../web/tools/templates/import_ispconfig.htm | 134 +++--- .../web/tools/templates/import_plesk.htm | 99 ++-- .../web/tools/templates/import_vpopmail.htm | 66 +-- interface/web/tools/templates/index.htm | 12 +- .../tools/templates/interface_settings.htm | 37 +- interface/web/tools/templates/resync.htm | 201 ++++---- interface/web/tools/templates/tpl_default.htm | 23 +- .../web/tools/templates/user_settings.htm | 41 +- interface/web/vm/templates/openvz_action.htm | 65 ++- interface/web/vm/templates/openvz_ip_edit.htm | 51 +- interface/web/vm/templates/openvz_ip_list.htm | 73 ++- .../vm/templates/openvz_ostemplate_edit.htm | 61 ++- .../vm/templates/openvz_ostemplate_list.htm | 79 ++- .../openvz_template_advanced_edit.htm | 205 ++++---- .../web/vm/templates/openvz_template_edit.htm | 117 +++-- .../web/vm/templates/openvz_template_list.htm | 61 ++- .../vm/templates/openvz_vm_advanced_edit.htm | 107 ++--- interface/web/vm/templates/openvz_vm_edit.htm | 123 +++-- interface/web/vm/templates/openvz_vm_list.htm | 93 ++-- 242 files changed, 8249 insertions(+), 8699 deletions(-) mode change 100755 => 100644 interface/web/mail/templates/mail_domain_edit.htm diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm index ca5cb9651c..cc45309882 100644 --- a/interface/web/admin/templates/directive_snippets_edit.htm +++ b/interface/web/admin/templates/directive_snippets_edit.htm @@ -1,47 +1,44 @@ -

+
+

+

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

{tmpl_var name='customer_viewable_txt'}

-
+
+ +
{tmpl_var name='customer_viewable'}
-
-

{tmpl_var name='active_txt'}

-
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- -
+
+ + +
diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm index 0a9e0282f4..55ee2514a8 100644 --- a/interface/web/dns/templates/dns_hinfo_edit.htm +++ b/interface/web/dns/templates/dns_hinfo_edit.htm @@ -1,38 +1,35 @@ -

+
+

+

-
-
-
-
- - -
-
- - -
-
- - -
-
-

{tmpl_var name='active_txt'}

-
+ +
+ +
+
+
+ +
+
+
+ +
+
+
+ +
{tmpl_var name='active'}
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ No newline at end of file diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm index d4806e10f0..c25dcda6c9 100644 --- a/interface/web/dns/templates/dns_import.htm +++ b/interface/web/dns/templates/dns_import.htm @@ -1,48 +1,48 @@ -

+
+

+

-
-
-
+ -
- - {tmpl_var name='server_id'} -
-
- - {tmpl_var name='client_group_id'} -
+
-
- - {tmpl_var name='server_id'} -
+
-
- +
+ - {tmpl_var name='domain_option'} - - - +
+
+

-
- +
+
@@ -55,15 +55,10 @@ -
- - -
- - -
- -
+
+ + +
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index 402515067f..24fad5ce55 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -1,9 +1,9 @@ -

+
+

+

-
-
@@ -20,42 +20,42 @@

-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + - - - - - + + + + - - - - + + + @@ -67,11 +67,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="domain"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="domain"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm index 5e076dc559..909600f5ae 100644 --- a/interface/web/mail/templates/mail_forward_edit.htm +++ b/interface/web/mail/templates/mail_forward_edit.htm @@ -1,37 +1,34 @@ -

+
+

+

-
-
-
-
-

* {tmpl_var name='email_txt'}

-
- - - + +
+ +
+ + +
-
- +
+
-
-

{tmpl_var name='active_txt'}

-
+
+ +
{tmpl_var name='active'}
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 48e85f10a5..c68fa361f2 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -1,9 +1,9 @@ -

+
+

+

-
-
@@ -20,42 +20,42 @@

-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + - - - - - + + + + - - - - + + + @@ -67,11 +67,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="source"}{tmpl_var name="destination"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm index 1f5e6a936b..61e61233a4 100644 --- a/interface/web/mail/templates/mail_get_edit.htm +++ b/interface/web/mail/templates/mail_get_edit.htm @@ -1,60 +1,57 @@ -

+
+

+

-
-
-
-
- - {tmpl_var name='type'} -
-
- - -
-
- - -
-
- +
+
+ +
+
+
+ +
+
+
+
-
-

{tmpl_var name='source_delete_txt'}

-
+
+ +
{tmpl_var name='source_delete'} {tmpl_var name="source_delete_note_txt"}
-
-

{tmpl_var name='source_read_all_txt'}

-
+
+ +
{tmpl_var name='source_read_all'}
-
- - {tmpl_var name='destination'} -
-
-

{tmpl_var name='active_txt'}

-
+
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 a4784f967e..417da8adf0 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -1,9 +1,9 @@ -

+
+

+

-
-
@@ -20,48 +20,48 @@

-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + @@ -73,11 +73,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source_server"}{tmpl_var name="source_username"}{tmpl_var name="destination"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source_server"}{tmpl_var name="source_username"}{tmpl_var name="destination"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm index d9ec0ca6f0..e7256b7f24 100644 --- a/interface/web/mail/templates/mail_mailinglist_edit.htm +++ b/interface/web/mail/templates/mail_mailinglist_edit.htm @@ -1,86 +1,83 @@ -

+
+

+

-
-
-
Mailing List + Mailing List -
- - {tmpl_var name='client_group_id'} -
+
-
- - {tmpl_var name='client_group_id'} -
+
-
- - {tmpl_var name='domain_option'} - +
-
- - - +
+ +
+
-
- - - +
+ +
+
-
- - {tmpl_var name='domain_option'} -
-
- - -
-
- - -
+
+
+ +
+
+
+ +
+
-
- +
+  {tmpl_var name='generate_password_txt'}
-
-

{tmpl_var name='password_strength_txt'}

+
+

 

-
- +
+
- + -
- - -
-
- -
+
+ + +
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm index 12ddd957bd..ff1c0c464e 100644 --- a/interface/web/mail/templates/mail_mailinglist_list.htm +++ b/interface/web/mail/templates/mail_mailinglist_list.htm @@ -1,8 +1,8 @@ -

+
+

+
-
-
@@ -19,42 +19,42 @@

-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + - - - - + + + - - - + + @@ -66,11 +66,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="listname"}{tmpl_var name="domain"} + {tmpl_var name="listname"}{tmpl_var name="domain"} - {tmpl_var name='mailinglist_txt'} + {tmpl_var name='mailinglist_txt'} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_relay_recipient_edit.htm b/interface/web/mail/templates/mail_relay_recipient_edit.htm index 0e5999c089..563492193c 100644 --- a/interface/web/mail/templates/mail_relay_recipient_edit.htm +++ b/interface/web/mail/templates/mail_relay_recipient_edit.htm @@ -1,35 +1,32 @@ -

+
+

+

-
-
-
Relay recipient -
- - {tmpl_var name='server_id'} -
-
- - -
-
-

{tmpl_var name='active_txt'}

-
+
+
+ +
+
+
+ +
{tmpl_var name='active'}
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 33f528156a..aca3b6fec0 100644 --- a/interface/web/mail/templates/mail_relay_recipient_list.htm +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -1,8 +1,8 @@ -

+
+

+
-
-
@@ -19,42 +19,42 @@

-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + - - - - - + + + + - - - - + + + @@ -66,11 +66,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm index cd1e8c99be..07e774c5d2 100644 --- a/interface/web/mail/templates/mail_transport_edit.htm +++ b/interface/web/mail/templates/mail_transport_edit.htm @@ -1,56 +1,53 @@ -

+
+

+

-
-
-
-
- - {tmpl_var name='server_id'} -
-
- - -
-
- - +
+
+ +
+
+
+ +
+
+
-
-

{tmpl_var name='mx_txt'}

-
- -
-
-
- - -
-
- - +
+
+ +
-
-
-

{tmpl_var name='active_txt'}

-
+
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- - \ No newline at end of file +
+ + +
\ 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 cac01bd42e..3dfed0aa9f 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -1,9 +1,9 @@ -

+
+

+

-
-
@@ -20,48 +20,48 @@

-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + @@ -73,11 +73,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="domain"}{tmpl_var name="transport"}{tmpl_var name="sort_order"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="domain"}{tmpl_var name="transport"}{tmpl_var name="sort_order"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm index 4ff8c813e7..88e86165b4 100644 --- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm @@ -1,44 +1,38 @@ -

+
+

+

-
- -
-
-
- - -
-
- + + +
+ +
+
+
+
-
- - + +
-
-
- +
+
+ {tmpl_var name='autoresponder_start_date'}  {tmpl_var name='now_txt'}
-
- +
+ {tmpl_var name='autoresponder_end_date'}
-
+ -
- - + -
-
- -
\ No newline at end of file + \ 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 e3aa096bcc..a6e2650bc2 100644 --- a/interface/web/mail/templates/mail_user_backup.htm +++ b/interface/web/mail/templates/mail_user_backup.htm @@ -1,4 +1,6 @@ -

+
+

+

@@ -10,30 +12,25 @@ -
-
-
Backup -
- - {tmpl_var name='backup_interval'} -
-
- - {tmpl_var name='backup_copies'} -
-
+
+ {tmpl_var name='backup_records'} -
- - -
- - - +
+ + +
diff --git a/interface/web/mail/templates/mail_user_backup_list.htm b/interface/web/mail/templates/mail_user_backup_list.htm index 7fc61fd098..6b00afd893 100644 --- a/interface/web/mail/templates/mail_user_backup_list.htm +++ b/interface/web/mail/templates/mail_user_backup_list.htm @@ -6,29 +6,28 @@

-
- -
-
- - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + - - - - + + + @@ -41,7 +40,6 @@
{tmpl_var name='search_limit'}
{tmpl_var name="date"}{tmpl_var name="filename"}{tmpl_var name="filesize"} + {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 31549df0d7..3ce8bb098b 100644 --- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm +++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm @@ -1,22 +1,19 @@ -

+
+

+

-
-
-
-
- + +
+
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 f7fb4c70a2..5ded556a6c 100644 --- a/interface/web/mail/templates/mail_user_filter_edit.htm +++ b/interface/web/mail/templates/mail_user_filter_edit.htm @@ -1,38 +1,35 @@ -

+
+

+

-
-
-
-
- - -
-
- + +
+ +
+
+
+

-
+
-
- +
+

-
+
-
- +
+ {tmpl_var name='active'}
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 2d7a6deb7c..6b79ac0191 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -16,35 +16,35 @@
{tmpl_var name="toolsarea_head_txt"} -
- -
+
- -
-
- - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + - - - + + - - + @@ -56,9 +56,9 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="rulename"} - {tmpl_var name='delete_txt'} + {tmpl_var name="rulename"} + {tmpl_var name='delete_txt'}
-
-
\ No newline at end of file + + diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index 3d9f09f9bf..d0c9746b09 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -1,9 +1,9 @@ -

+
+

+

-
-
@@ -20,64 +20,64 @@

-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + + + + - - - - - - + + + + + - + - - - - - - - - + + + + + + @@ -89,11 +89,10 @@ - +
{tmpl_var name='search_limit'}
- - - - - +
+ + + + +
{tmpl_var name="email"}{tmpl_var name="email"} + {tmpl_var name="login"} {tmpl_var name="name"}{tmpl_var name="autoresponder"}{tmpl_var name="postfix"}{tmpl_var name="disablesmtp"}{tmpl_var name="disableimap"}{tmpl_var name="disablepop3"} + {tmpl_var name="name"}{tmpl_var name="autoresponder"}{tmpl_var name="postfix"}{tmpl_var name="disablesmtp"}{tmpl_var name="disableimap"}{tmpl_var name="disablepop3"} - {tmpl_var name="webmail_txt"} + {tmpl_var name="webmail_txt"} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'}
98">98">
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index 186b03d4ec..650835a32f 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -1,91 +1,88 @@ -

+
+

+

-
-
-
-
- -   {tmpl_var name='name_optional_txt'} -
-
-

* {tmpl_var name='email_txt'}

-
- - - + +
+ +
  {tmpl_var name='name_optional_txt'} +
+
+ +
+ + +
-
- - +
+ +
-
- +
+  {tmpl_var name='generate_password_txt'}
-
-

{tmpl_var name='password_strength_txt'}

+
+

 

-
- +
+
-
- -

MB

-
-
- -   {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'} -
-
- -   {tmpl_var name='name_optional_txt'} {tmpl_var name='sender_cc_note_txt'} +
+ +
-
- -   {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'} +
+
+ +
  {tmpl_var name='name_optional_txt'} {tmpl_var name='sender_cc_note_txt'} +
+
+ +
-
-
-

{tmpl_var name='postfix_txt'}

-
+
+
+ +
{tmpl_var name='postfix'}
-
-

{tmpl_var name='disablesmtp_txt'}

-
+
+ +
{tmpl_var name='disablesmtp'}
-
-

{tmpl_var name='disableimap_txt'}

-
+
+ +
{tmpl_var name='disableimap'}
-
-

{tmpl_var name='disablepop3_txt'}

-
+
+ +
{tmpl_var name='disablepop3'}
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 3274685fe5..b1de5c97c3 100644 --- a/interface/web/mail/templates/mail_user_mailfilter_edit.htm +++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm @@ -1,26 +1,23 @@ -

+
+

+

-
-
-
-
-

{tmpl_var name='move_junk_txt'}

-
+ +
+ +
{tmpl_var name='move_junk'}
-
+ {tmpl_var name='filter_records'} -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 35e2235e62..23b316366c 100644 --- a/interface/web/mail/templates/mail_user_stats_list.htm +++ b/interface/web/mail/templates/mail_user_stats_list.htm @@ -1,40 +1,41 @@ -

+
+

+

-
-
-
- - - - - - - - - +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + @@ -46,11 +47,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="email"}{tmpl_var name="this_month"}{tmpl_var name="last_month"}{tmpl_var name="this_year"}{tmpl_var name="last_year"}{tmpl_var name="email"}{tmpl_var name="this_month"}{tmpl_var name="last_month"}{tmpl_var name="this_year"}{tmpl_var name="last_year"}
-
-
-
+ + diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm index d36434941a..da1d93656d 100644 --- a/interface/web/mail/templates/mail_whitelist_edit.htm +++ b/interface/web/mail/templates/mail_whitelist_edit.htm @@ -1,41 +1,38 @@ -

+
+

+

-
-
-
-
- - {tmpl_var name='server_id'} -
-
- - -
-
- - +
+
+ +
-
-
-

{tmpl_var name='active_txt'}

-
+
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 882aa581d1..d7ab68eb5f 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -1,48 +1,48 @@ -

+
+

+

-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + - - - - - - + + + + + - - - - - + + + + @@ -54,11 +54,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"}{tmpl_var name="type"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"}{tmpl_var name="type"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm index ae5b3eecbd..aff0b2e0bd 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm @@ -1,49 +1,46 @@ -

+
+

+

-
-
-
+ -
- - {tmpl_var name='rid'} -
-
- - -
-
- - +
+
+ +
-
-
-

{tmpl_var name='active_txt'}

-
+
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 3407d4a71a..87cb73ab7d 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -1,51 +1,51 @@ -

+
+

+

-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + @@ -57,11 +57,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm index 4dd0710f40..a59f29b383 100644 --- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm @@ -1,22 +1,19 @@ -

+
+

+

-
-
- - - + +
+
- - -
-
- -
\ No newline at end of file + + + \ 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 cd43b4d4de..64eef6c5ef 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -1,39 +1,39 @@ -

+
+

+

-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - + +

+
+
 
+ + + + - - - + + - - + @@ -45,11 +45,10 @@ - +
 
- +
+
{tmpl_var name="server_name"} - {tmpl_var name='delete_txt'} + {tmpl_var name="server_name"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm index 22f5b9fb0a..e9d275618d 100644 --- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm @@ -1,66 +1,63 @@ -

+
+

+

-
-
- + - - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - -
-
- -
\ No newline at end of file + + + \ 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 e91d4a0ead..7420edd4d3 100644 --- a/interface/web/mail/templates/spamfilter_config_server_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm @@ -1,38 +1,35 @@ -

+
+

+

-
-
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - - + +
+
- - + +
-
- -
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm index a25a2e70eb..911e34dc1e 100644 --- a/interface/web/mail/templates/spamfilter_other_edit.htm +++ b/interface/web/mail/templates/spamfilter_other_edit.htm @@ -1,80 +1,77 @@ -

+
+

+

-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
-
-
- - {tmpl_var name='warnbannedrecip'} -
-
- - {tmpl_var name='warnbadhrecip'} -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -  Bytes -
-
- - -
- +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
 Bytes +
+
+ +
+
+ -
- - -
- - - +
+ + +
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm index 3ed6b83712..e1698a06e3 100644 --- a/interface/web/mail/templates/spamfilter_policy_edit.htm +++ b/interface/web/mail/templates/spamfilter_policy_edit.htm @@ -1,64 +1,61 @@ -

+
+

+

-
-
-
-
- - -
-
- - +
+
+ +
-
-
- - {tmpl_var name='spam_lover'} -
-
- - {tmpl_var name='banned_files_lover'} -
-
- - {tmpl_var name='bad_header_lover'} -
-
- - {tmpl_var name='bypass_virus_checks'} -
-
- - {tmpl_var name='bypass_banned_checks'} -
-
- - {tmpl_var name='bypass_header_checks'} -
- +
+ -
- - -
- - - \ No newline at end of file +
+ + +
\ 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 269c5144fa..c7443b3222 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -1,51 +1,51 @@ -

+
+

+

-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + @@ -58,11 +58,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="policy_name"}{tmpl_var name="virus_lover"}{tmpl_var name="spam_lover"}{tmpl_var name="banned_files_lover"}{tmpl_var name="bad_header_lover"} - {tmpl_var name='delete_txt'} + {tmpl_var name="policy_name"}{tmpl_var name="virus_lover"}{tmpl_var name="spam_lover"}{tmpl_var name="banned_files_lover"}{tmpl_var name="bad_header_lover"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_quarantine_edit.htm b/interface/web/mail/templates/spamfilter_quarantine_edit.htm index 4a38d7ffb8..053e94b9c1 100644 --- a/interface/web/mail/templates/spamfilter_quarantine_edit.htm +++ b/interface/web/mail/templates/spamfilter_quarantine_edit.htm @@ -1,44 +1,41 @@ -

+
+

+

-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
+ +
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 059ab155b3..c9d27aa0ae 100644 --- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm +++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm @@ -1,52 +1,49 @@ -

+
+

+

-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
-
-
- - -
-
- - -
- +
+
+ +
+
+
+ +
+
+ -
- - -
- - - \ No newline at end of file +
+ + +
\ 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 52e5945f46..15847ae5cc 100644 --- a/interface/web/mail/templates/spamfilter_users_edit.htm +++ b/interface/web/mail/templates/spamfilter_users_edit.htm @@ -1,50 +1,47 @@ -

+
+

+

-
-
-
-
- - {tmpl_var name='server_id'} -
-
- - {tmpl_var name='priority'} -
-
- - {tmpl_var name='policy_id'} -
-
- - -
-
- - -
-
- - +
+
+ +
+
+
+ +
-
- +
+ -
- - -
- - - \ No newline at end of file +
+ + +
\ 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 34b4b2de1b..d62d9c0910 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -1,51 +1,51 @@ -

+
+

+

-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + @@ -57,11 +57,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="local"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="policy_id"}{tmpl_var name="fullname"} - {tmpl_var name='delete_txt'} + {tmpl_var name="local"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="policy_id"}{tmpl_var name="fullname"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm index efb70186ff..beb7525004 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm @@ -1,49 +1,46 @@ -

+
+

+

-
-
-
+ -
- - {tmpl_var name='rid'} -
-
- - -
-
- - +
+
+ +
-
-
-

{tmpl_var name='active_txt'}

-
+
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 ea4d7240a9..1d6af875fa 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -1,51 +1,51 @@ -

+
+

+

-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + @@ -58,11 +58,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"} - {tmpl_var name='delete_txt'} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="priority"}{tmpl_var name="rid"}{tmpl_var name="email"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm index e700557abc..e01f571bff 100644 --- a/interface/web/mail/templates/user_quota_stats_list.htm +++ b/interface/web/mail/templates/user_quota_stats_list.htm @@ -1,39 +1,40 @@ -

+
+

+
-
-
-
- - - - - - - - - +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + @@ -44,11 +45,10 @@ - +
{tmpl_var name='search_limit'}
    - +
    +
{tmpl_var name="email"}{tmpl_var name="name"}{tmpl_var name="used"}{tmpl_var name="quota"}{tmpl_var name="percentage"}{tmpl_var name="email"}{tmpl_var name="name"}{tmpl_var name="used"}{tmpl_var name="quota"}{tmpl_var name="percentage"}
-
-
-
+ + diff --git a/interface/web/mailuser/templates/index.htm b/interface/web/mailuser/templates/index.htm index c320253e16..e9ac8ad0ec 100644 --- a/interface/web/mailuser/templates/index.htm +++ b/interface/web/mailuser/templates/index.htm @@ -1,34 +1,36 @@ -

+
+

+

-
-
-

{tmpl_var name='email_txt'}

+ +
+

{tmpl_var name='email'}

-
-

{tmpl_var name='login_txt'}

+
+

{tmpl_var name='login'}

-
-

{tmpl_var name='server_address_txt'}

+
+

{tmpl_var name='server_name'}

-
-

{tmpl_var name='quota_txt'}

+
+

{tmpl_var name='quota'}

-
-

{tmpl_var name='cc_txt'}

+
+

{tmpl_var name='cc'}

-
+
  -
-
+
+ \ No newline at end of file diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm index 34b7f0d238..bb4ebc7ef6 100644 --- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm @@ -1,37 +1,34 @@ -

+
+

+

-
- -
-
-
- - -
-
- + + +
+ +
+
+
+
-
- - -
-
- +
+ +
+
+
+ {tmpl_var name='autoresponder_start_date'}  {tmpl_var name='now_txt'}
-
- +
+ {tmpl_var name='autoresponder_end_date'}
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 3b82c46479..0ba06e8a1a 100644 --- a/interface/web/mailuser/templates/mail_user_cc_edit.htm +++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm @@ -1,26 +1,23 @@ -

+
+

+

-
-
-
-
-

{tmpl_var name='email_txt'}

+ +
+

{tmpl_var name='email'}

-
- -   {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'} -
-
+
+ +
  {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'} +
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 320567742c..2004c2c4b1 100644 --- a/interface/web/mailuser/templates/mail_user_filter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm @@ -1,38 +1,35 @@ -

+
+

+

-
-
-
-
- - -
-
- + +
+ +
+
+
+ - -
-
- +
+
+
+ - -
-
- +
+
+
+ {tmpl_var name='active'}
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 0725183091..69d5a6c59e 100644 --- a/interface/web/mailuser/templates/mail_user_filter_list.htm +++ b/interface/web/mailuser/templates/mail_user_filter_list.htm @@ -1,38 +1,38 @@ -

+
+

+
-
- -
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - + +

+
+
 
+ + + + - - - + + - - + @@ -45,11 +45,10 @@ - +
 
- +
+
{tmpl_var name="rulename"} - {tmpl_var name='delete_txt'} + {tmpl_var name="rulename"} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm index b28d3a35e6..48c5a3e675 100644 --- a/interface/web/mailuser/templates/mail_user_password_edit.htm +++ b/interface/web/mailuser/templates/mail_user_password_edit.htm @@ -1,37 +1,34 @@ -

+
+

+

-
-
-
-
-

{tmpl_var name='email_txt'}

+ +
+

{tmpl_var name='email'}

-
- +
+  {tmpl_var name='generate_password_txt'}
-
-

{tmpl_var name='password_strength_txt'}

+
+

 

-
- +
+
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 4fdc5f86fd..39e8670f95 100644 --- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm @@ -1,28 +1,25 @@ -

+
+

+

-
-
-
-
-

{tmpl_var name='email_txt'}

+ +
+

{tmpl_var name='email'}

-
- - {tmpl_var name='policy'} -
-
+
+ -
- - -
- - - \ No newline at end of file +
+ + +
\ 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 480aa94712..2f4e1865db 100644 --- a/interface/web/monitor/templates/datalog_list.htm +++ b/interface/web/monitor/templates/datalog_list.htm @@ -1,38 +1,39 @@ -

+
+

+

-
-
-
- - - - - - - - +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + - - - - - - + + + + + - - - - - + + + + @@ -44,11 +45,10 @@ - +
{tmpl_var name='search_limit'}
  - +
 
 +
{tmpl_var name="tstamp"}{tmpl_var name="server_id"}{tmpl_var name="action"}{tmpl_var name="dbtable"} - + {tmpl_var name="tstamp"}{tmpl_var name="server_id"}{tmpl_var name="action"}{tmpl_var name="dbtable"} +
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/monitor/templates/show_data.htm b/interface/web/monitor/templates/show_data.htm index 818208d647..9e2cd9ac3d 100644 --- a/interface/web/monitor/templates/show_data.htm +++ b/interface/web/monitor/templates/show_data.htm @@ -1,12 +1,14 @@ -

+
+

+

-
+

-
+
\ No newline at end of file diff --git a/interface/web/monitor/templates/show_log.htm b/interface/web/monitor/templates/show_log.htm index 271d46bf59..befb5ebd4f 100644 --- a/interface/web/monitor/templates/show_log.htm +++ b/interface/web/monitor/templates/show_log.htm @@ -1,25 +1,23 @@ -

+
+

+

-
-
-
-
-
- - {tmpl_var name='refresh'} -
+
-
+
-
+

-
-
- -
\ No newline at end of file + + \ No newline at end of file diff --git a/interface/web/monitor/templates/show_monit.htm b/interface/web/monitor/templates/show_monit.htm index 27265bd137..5053458a68 100644 --- a/interface/web/monitor/templates/show_monit.htm +++ b/interface/web/monitor/templates/show_monit.htm @@ -1,4 +1,6 @@ -

+
+

+

diff --git a/interface/web/monitor/templates/show_munin.htm b/interface/web/monitor/templates/show_munin.htm index 86d33f190e..3119413551 100644 --- a/interface/web/monitor/templates/show_munin.htm +++ b/interface/web/monitor/templates/show_munin.htm @@ -1,4 +1,6 @@ -

+
+

+

diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm index ceb419573d..262425c8e6 100644 --- a/interface/web/monitor/templates/show_sys_state.htm +++ b/interface/web/monitor/templates/show_sys_state.htm @@ -1,25 +1,23 @@ -

+
+

+

-
-
-
-
-
- - {tmpl_var name='refresh'} -
+
-
+
-
+

-
-
- -
\ No newline at end of file + +
\ No newline at end of file diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm index a14f68d0bb..2458d14c45 100644 --- a/interface/web/monitor/templates/syslog_list.htm +++ b/interface/web/monitor/templates/syslog_list.htm @@ -1,42 +1,43 @@ -

+
+

+

-
-
-
- - - - - - - - +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + - - - - - - + + + + + - - - - - + + + + @@ -49,11 +50,10 @@ - +
{tmpl_var name='search_limit'}
  - +
 
 +
{tmpl_var name="tstamp"}{tmpl_var name="server_id"}{tmpl_var name="loglevel"}{tmpl_var name="message"} + {tmpl_var name="tstamp"}{tmpl_var name="server_id"}{tmpl_var name="loglevel"}{tmpl_var name="message"} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm index c911ced39e..8ccfee1013 100644 --- a/interface/web/sites/templates/aps_install_package.htm +++ b/interface/web/sites/templates/aps_install_package.htm @@ -11,28 +11,26 @@

ERROR

    {tmpl_var name='error'}
-
- -
-
+ + {tmpl_var name='basic_settings_txt'} -
- +
+
http(s):// 
DOMAIN_LIST_SPACE
 / 
- -
+
+
-
- - -
+
+ +
+
PKG_SETTINGS_SPACE {tmpl_var name='license_txt'} -
- +
+ {tmpl_var name='pkg_license_name'}
 {tmpl_var name='pkg_license_content'} @@ -40,17 +38,14 @@
-
- - 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 2d9c50f6da..bb659999f3 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -1,50 +1,49 @@

{tmpl_var name="list_head_txt"}

-
- -
-
{tmpl_var name="list_head_txt"} - - - - - + +

{tmpl_var name="list_head_txt"}

+
+
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}
+ + + + - + - - - + + + - - - + + + - + - - - + + - - + + - + - - - + + @@ -52,11 +51,10 @@ - +
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'} {tmpl_var name='install_location_txt'}{tmpl_var name='status_txt'} {tmpl_var name='install_location_txt'}{tmpl_var name='status_txt'} 
  - +   +
{tmpl_var name='package_name'}{tmpl_var name='package_version'}-{tmpl_var name='package_release'}{tmpl_var name='package_name'}{tmpl_var name='package_version'}-{tmpl_var name='package_release'} {tmpl_var name='install_location_short'}{tmpl_var name='instance_status'} + {tmpl_var name='install_location_short'}{tmpl_var name='instance_status'} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'} - {tmpl_var name='reinstall_txt'} + {tmpl_var name='reinstall_txt'}
{tmpl_var name='paging'}{tmpl_var name='paging'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm index 5456a89850..9e50565702 100644 --- a/interface/web/sites/templates/aps_packagedetails_show.htm +++ b/interface/web/sites/templates/aps_packagedetails_show.htm @@ -9,13 +9,12 @@
-
- -
+
-

 

 

@@ -42,41 +41,42 @@
-
- + +
+
- + - + - + - + - + - + - + - + - + + - + - + - + - +
{tmpl_var name='version_txt'} {tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})
{tmpl_var name='category_txt'} {tmpl_var name='pkg_category'}
{tmpl_var name='description_txt'} {tmpl_var name='pkg_description'}
{tmpl_var name='homepage_txt'} {tmpl_var name='pkg_homepage'}
{tmpl_var name='installed_size_txt'} {tmpl_var name='pkg_installed_size'}
{tmpl_var name='supported_languages_txt'} {tmpl_var name='pkg_languages'}
{tmpl_var name='config_script_txt'} {tmpl_var name='pkg_config_script'}
{tmpl_var name='license_txt'} {tmpl_var name='pkg_license_name'}
 @@ -88,7 +88,7 @@
{tmpl_var name='ScreenDescription'}
@@ -99,7 +99,7 @@ -
    @@ -115,27 +115,27 @@
{tmpl_var name='php_extensions_txt'} {tmpl_var name='pkg_requirements_php_extensions'}
{tmpl_var name='php_settings_txt'} {tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}
{tmpl_var name='supported_php_versions_txt'} {tmpl_var name='pkg_requirements_supported_php_versions'}
{tmpl_var name='database_txt'} {tmpl_var name='pkg_requirements_database'}
+
- \ No newline at end of file diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index 1042e71169..26f65d16e4 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -1,40 +1,39 @@

{tmpl_var name="list_head_txt"}

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

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

+
+
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='category_txt'}
+ + + + + - + - + - - - - + + + + - + - + - - - + + + - + - + @@ -45,11 +44,10 @@ - +
{tmpl_var name='name_txt'}{tmpl_var name='version_txt'}{tmpl_var name='category_txt'} {tmpl_var name='status_txt'}{tmpl_var name='status_txt'}   
{tmpl_var name='name'}{tmpl_var name='version'}-{tmpl_var name='release'}{tmpl_var name='category'}{tmpl_var name='name'}{tmpl_var name='version'}-{tmpl_var name='release'}{tmpl_var name='category'} {tmpl_var name='package_status'}{tmpl_var name='package_status'}   
{tmpl_var name='paging'}{tmpl_var name='paging'}
-
-
- -
\ No newline at end of file + + + \ No newline at end of file diff --git a/interface/web/sites/templates/aps_update_packagelist.htm b/interface/web/sites/templates/aps_update_packagelist.htm index bd8edfd428..b366386019 100644 --- a/interface/web/sites/templates/aps_update_packagelist.htm +++ b/interface/web/sites/templates/aps_update_packagelist.htm @@ -1,20 +1,12 @@ -

+
+

+

-
- -
-
{tmpl_var name="legend_txt"} - -
- - -
-
- - - -
- -
+ {tmpl_var name="legend_txt"} + +
+ + +
diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm index 20b1922cd3..a27e163584 100644 --- a/interface/web/sites/templates/cron_edit.htm +++ b/interface/web/sites/templates/cron_edit.htm @@ -1,74 +1,71 @@ -

+
+

+

-
-
-
Cron Job -
+ Cron Job +
- - {tmpl_var name='parent_domain_id'} - +
- - {tmpl_var name='parent_domain_id'} - +
-
- - -

e.g. *, */3, 10-20

+
+ +
+

e.g. *, */3, 10-20

-
- - -

e.g. *, */2, 0, 10-12

+
+ +
+

e.g. *, */2, 0, 10-12

-
- - -

e.g. *, */4, 1-5

+
+ +
+

e.g. *, */4, 1-5

-
- - -

e.g. *, 1-6

+
+ +
+

e.g. *, 1-6

-
- - -

e.g. *, 0, 1-5

+
+ +
+

e.g. *, 0, 1-5

-
- - -

{tmpl_var name='command_hint_txt'}

+
+ +
+

{tmpl_var name='command_hint_txt'}

-
-

{tmpl_var name='log_output_txt'}

-
+
+ +
{tmpl_var name='log'}
-
-

{tmpl_var name='active_txt'}

-
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- -
\ No newline at end of file +
+ + +
\ 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 42d04e3ce6..8b5b462cd2 100644 --- a/interface/web/sites/templates/cron_list.htm +++ b/interface/web/sites/templates/cron_list.htm @@ -1,64 +1,64 @@ -

+
+

+

-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + @@ -71,11 +71,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="run_min"}{tmpl_var name="run_hour"}{tmpl_var name="run_mday"}{tmpl_var name="run_month"}{tmpl_var name="run_wday"}{tmpl_var name="command"} + {tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="run_min"}{tmpl_var name="run_hour"}{tmpl_var name="run_mday"}{tmpl_var name="run_month"}{tmpl_var name="run_wday"}{tmpl_var name="command"}
- {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index d7fecea396..46dc57bdca 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -1,63 +1,63 @@ -

+
+

+
-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + @@ -69,11 +69,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="active"}{tmpl_var name="remote_access"}{tmpl_var name="type"}{tmpl_var name="sys_groupid"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="database_user_id"}{tmpl_var name="database_name"} + {tmpl_var name="active"}{tmpl_var name="remote_access"}{tmpl_var name="type"}{tmpl_var name="sys_groupid"}{tmpl_var name="server_id"}{tmpl_var name="parent_domain_id"}{tmpl_var name="database_user_id"}{tmpl_var name="database_name"} - {tmpl_var name='admin_txt'} + {tmpl_var name='admin_txt'} - {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} + {tmpl_var name='edit_txt'} + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index 3e1489cf92..d8bb87e7dd 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -1,124 +1,121 @@ -

+
+

+

-
-
-
+ -
+
- - {tmpl_var name='server_id'} - +
- - {tmpl_var name='server_id'} - +
-
+
- - {tmpl_var name='server_id'} - +
- - {tmpl_var name='server_id'} - +
-
- - {tmpl_var name='parent_domain_id'} -
-
- - {tmpl_var name='type'} -
-
- +
+
+

{tmpl_var name='database_name_prefix'}

- - +
+
- - +
+
-
- -  MB -
-
- -  MB +
+
+ +
-
-
- - {tmpl_var name='database_ro_user_id'}  {tmpl_var name='optional_txt'} -
-
+
+
- - {tmpl_var name='database_charset'} - +
- - {tmpl_var name='database_charset'} - +
-
-

{tmpl_var name='remote_access_txt'}

-
+
+ +
{tmpl_var name='remote_access'}
-
- - -
-
-

{tmpl_var name='active_txt'}

-
+
+ +
+
+
+ +
{tmpl_var name='active'}
- + -
- - -
-
- -
+
+ + +
\ No newline at end of file diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm index d525f38276..73fdc017f6 100644 --- a/interface/web/vm/templates/openvz_vm_list.htm +++ b/interface/web/vm/templates/openvz_vm_list.htm @@ -1,57 +1,57 @@ -

+
+

+
-
-
-
{tmpl_var name="toolsarea_head_txt"} -
- -
-
-
+ + -
-
- - - - - - - - - - - + +

+
+
{tmpl_var name='search_limit'}
+ + + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + @@ -63,11 +63,10 @@ - +
{tmpl_var name='search_limit'}
- +
+
{tmpl_var name="veid"}{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="ostemplate_id"}{tmpl_var name="template_id"}{tmpl_var name="hostname"}{tmpl_var name="ip_address"} - Action - {tmpl_var name='delete_txt'} + {tmpl_var name="veid"}{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="ostemplate_id"}{tmpl_var name="template_id"}{tmpl_var name="hostname"}{tmpl_var name="ip_address"} + Action + {tmpl_var name='delete_txt'}
-
-
- -
\ No newline at end of file +
+ + \ No newline at end of file -- GitLab