diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm index ca5cb9651cb44bbb75d2ecf958680f4630a4eac3..cc4530988225323257cde954099831114f9c179f 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 0a9e0282f48ab37161373e82d6d4c019a394d628..55ee2514a8cb2761f5a2da868b189b1dfe32f1cf 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 d4806e10f0b3d6506638c62aea44039287fc3e51..c25dcda6c92eaff781d630b876cd7cbe57398839 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 402515067fb7a6b3c83732d9a1c4b29df2958b8c..24fad5ce555ea2696471752bff4d8b61b4a3e504 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 5e076dc55937b1fc42279223cb8fb0231afd5654..909600f5ae89388f340c712a2ea1cde6d69d4fde 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 48e85f10a574d91289929e8ae4acb8fe58d0208c..c68fa361f296d17d54995bb67f35b6eb87366c24 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 1f5e6a936bffa41a4828eabfef0fc47a2726ee00..61e61233a417fbf83e47325da3fd6a479818f93c 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 a4784f967ef3f5b33b273d99195e7e7c387647f5..417da8adf013645be4c32c0264ea06d472d7dd0d 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 d9ec0ca6f0ab94b5c0199edec0d3abed52f66140..e7256b7f2476bd3bccfa4872346283d71bb1d83e 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 12ddd957bdf350446863a19419a6ff900e3574c4..ff1c0c464ed4a4c0ee000c0b884686d25fcf6355 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 0e5999c089533f833db7368e61eb769ce452cfc6..563492193cd3ea04d83349841e3d1c7e7480dd5e 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 33f528156aca247b97667913b575d01a07a49068..aca3b6fec0d943a2e4d9ad12f7112c886e376ce2 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 cd1e8c99beb19f8a3818d7405409bf8c9c0d3434..07e774c5d2a80a017a2030c589c6c60f44117557 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 cac01bd42ec0578d91d42c0ae7213aec2e0fe0b1..3dfed0aa9f11fc237531a6a2e12414e867ac08bd 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 4ff8c813e7ba409f3f3880290bb373952ef60a05..88e86165b42865b484951d12f173e5f5a285555a 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 e3aa096bcceb8e5555a3c4ea36138cc7b6a811be..a6e2650bc261071dfce807415d128272576bc1f5 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 7fc61fd098c561c2b0183d62ddd295029928d303..6b00afd893010e0d61d39efbc34cf4289aa7d694 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 31549df0d73ebb9979e50e9dfe6c91c814ea2bdb..3ce8bb098b02b3231cc371b9e8a4f69d28652be6 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 f7fb4c70a22bc30af439194bceb06e9556006012..5ded556a6c499c057c306c43ede9c07354d3e128 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 2d7a6deb7cdd20acda59fd61d057559fa8dcadf4..6b79ac01918c4860e00934627f0ebb4cba706eaa 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 3d9f09f9bf64b7f61729dab86648ce232b29df6e..d0c9746b0992bc423e00fb89a4ee1e1b9f6582ba 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">
-
-
- -
\ 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 186b03d4eca985c143e755bc4da53d3bed1a51fc..650835a32f27fc654dee58fca16460f961ddc44c 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 3274685fe518ba8c8d6f6f0acb065aef057a4b8a..b1de5c97c3f5968585692dd74e731a4958d49569 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 35e2235e62910c2a375c178e69b963b1aa04c697..23b316366c1449948519dd3a474868ffa47e026c 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 d36434941ac859770a598c142ce589d08bf05fb8..da1d93656df72995d852467716e3bdbe5144fcc6 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 882aa581d1e244e0ffefc2b4e1bd18c0780a5b0c..d7ab68eb5fdab9a28b93cb269f593e403b308ba3 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 ae5b3eecbd4981f032f51d336d3424282b37c985..aff0b2e0bd4b4bc102bda1d3d35118563ff99650 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 3407d4a71a74f252dc2541291ed113612fc5eeea..87cb73ab7d9f9a9bb04c409f0ea783fc88690a78 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 4dd0710f400531f3548747784e2da0cf0befd98a..a59f29b383b3e97d5edb96039f150b2a6975ae11 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 cd43b4d4de5d98939140a78c1903663ad206bcf8..64eef6c5efb02dde73aec6b508e77cb638d7fedf 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 22f5b9fb0aa40c28b2a989881f3a2847e221476a..e9d275618d069bbde85cdbd3297680d04b152994 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 e91d4a0ead102d73d988d385e6438eaf42eb5645..7420edd4d37ef38948132333ae8458669de7d34d 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 a25a2e70eb011aa547a271cb9355e83aaab689cd..911e34dc1e6d90b7679620834f8fec6169752141 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 3ed6b83712a02b368ddf87ddf7f94c961b1e29c3..e1698a06e3c8f70d670c4bf649a7852d213956f2 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 269c5144faef841b1d63b93296cc193f8a341759..c7443b322272b5d4cb2a72c3724a3591af957b67 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 4a38d7ffb80f810d2e97c73398c87f9aa1b684c8..053e94b9c1a56386aa95163890686af414b254d2 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 059ab155b3937e36b283dfc7489bbbdbfed06654..c9d27aa0ae8b623db6c506193836ff6ed0c9a298 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 52e5945f46a33add0dd8db87ded873fa6b0e6928..15847ae5cccee1ba3e7c8c8e3c26d3c8896d46b5 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 34b4b2de1ba5f309292c978f6e9b6ac97930aae9..d62d9c0910d37104ca56736c0f496a051478d31d 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 efb70186ff2ffff911b816d18d9638d12eada69d..beb752500416453a7534ef3c7ab6f0bba930e8d0 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 ea4d7240a986334d0063af9fd2ae73d2701ff129..1d6af875fabb943c177fa2378f91a46cc6cdf01a 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 e700557abcb911b5695122eab8185d351917ae3f..e01f571bff63f7cb7aeec4b2dba08487e26258ad 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 c320253e161093c39327f39b01cd15270000ca78..e9ac8ad0ec5382ef0bf77f924ac69a5eaf5da83a 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 34b7f0d238cf5f0cb5a59407cb9cdf638aff330d..bb4ebc7ef6805f945b4e3bc3ee0ea3d43179333e 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 3b82c464797d34306563c0674d02fb996de85a55..0ba06e8a1a5ef0d7f1c9a1523f00cd031cf689af 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 320567742ce9e74559d1a823c111867b24cb80ae..2004c2c4b1fbfdad00d49134a4fa2da944cd209a 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 07251830911e365e8a180fb9de9701ede61cb614..69d5a6c59ef4900d7b0937502377b1905da5d00e 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 b28d3a35e616abbf4452ef10ef7d23b895c2044c..48c5a3e675b38c943f6ba94fd2d188eb79a30eba 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 4fdc5f86fd98a554a2dffeaee8fd3ae109dc73ee..39e8670f951dc60cd08f28cec9b00ddb70f20142 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 480aa94712d0845a5dc805d5d752facca61f8936..2f4e1865db83dccad567ae9ca64ea9f7f7d1a11a 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 818208d647af29022110c60515007cb8e6ebc24f..9e2cd9ac3d48ec4155f0887abb25a0e8f1bb19a9 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 271d46bf59b3f7e1fde82a32244b6575cff21825..befb5ebd4f25c5a2ebb442ff89b823797a1cd936 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 27265bd137d5e4fcb69355effc07dc0fa328ce7f..5053458a68833c8e169119ba95412ca81e8bf976 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 86d33f190e1e12e9d9c374e48cbfa13a2e8e6473..31194135514de801521f7cca8987fc38a5d8c000 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 ceb419573db13061630c460b831f8bf6337de919..262425c8e639ecfae237e75e7f8f17add1f093c2 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 a14f68d0bbaa522f805bc0a04bbdb8bd649a354c..2458d14c455e2160ec55e2ae375a99926d32bf91 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 c911ced39e9947bf04939ea92975ea957848477d..8ccfee1013bd8e3ba051f75f85c1fcf5af3d30fb 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 2d9c50f6da77d6d2e8f37cd3fc0db96e8527cec1..bb659999f3baace9bd9b95b12075375eeaa15404 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'}
-
-
- -
\ 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 5456a8985009c095af8b1287c3e56585f3175ac7..9e505657024b5659b623cb99140d3c9ed0c5eba6 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 1042e711694182feff40abd67c4fa8bbd1adeb5d..26f65d16e455a6657b10393b20aee46d1938b9b6 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'}
-
-
- -
\ 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 bd8edfd428efd13e0ddf044af2ce636e75728af0..b366386019e40ded27271df994eb294b546e0188 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 20b1922cd38ea7924024698face1b027368c7f92..a27e1635846e1f13ab3b4daf93ce62ff12bd1f5d 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 42d04e3ce6920d2a951516ac6ae8769ab80bd7d1..8b5b462cd27a275df9e0673d8bc556ac49793211 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"}
-
-
- -
\ 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 d7fecea396a686b5dbe6863cc07025bf05945847..46dc57bdca12c0275971a2cf2884c6212b3e7229 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 3e1489cf92990eb7d1a3f2ee5c62353e1caf4a88..d8bb87e7ddd67ac00ab698cdb8d2329f3eec9f86 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 d525f382761b14ca7f2dafc70a66c09a95542e88..73fdc017f661b2c33ba50e0a8625eecf0d63d57d 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