diff --git a/src/views/email.html b/src/views/email.html index 889b1b9c6..a62aedb50 100644 --- a/src/views/email.html +++ b/src/views/email.html @@ -312,397 +312,351 @@
-

{{ 'email.incoming.title' | tr }}

+

{{ 'email.incoming.title' | tr }}

-
-
-
- -
-
-
-
-
- {{ 'email.config.connectionDetails' | tr }} -
-
-
-
-
-
-

{{ 'email.incoming.incomingServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 993 (TLS)

-

{{ 'email.incoming.outgointServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 587 (STARTTLS) or 465 (TLS)

-

{{ 'email.incoming.sieveServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 4190 (STARTTLS)

-

-
-
-
-
-
- -
- -
-

{{ 'email.incoming.mailboxes.title' | tr }} - - -
- - -
- - -

-
- -
-
-
- - - - - - - - - - - - - - - - - - - - -
{{ 'email.incoming.mailboxes.name' | tr }}{{ 'email.incoming.mailboxes.owner' | tr }}{{ 'email.incoming.mailboxes.aliases' | tr }}{{ 'email.incoming.mailboxes.usage' | tr }}{{ 'main.actions' | tr }}
- {{ mailbox.name }} - - {{ mailbox.ownerDisplayName }} - - {{ alias.name + '@' + alias.domain }} - - {{ mailbox.usage | prettyByteSize }} - - - -
-
+
+
+
+

- -
-

{{ 'email.incoming.mailinglists.title' | tr }} - -
- - -
- - -

+
+
+ {{ 'email.config.connectionDetails' | tr }} +
- -
-
-
- {{ 'email.incoming.mailinglists.description' | tr }} +
+
+

-
- - - - - - - - - - - - - - - - - -
{{ 'email.incoming.mailinglists.name' | tr }}{{ 'email.incoming.mailinglists.members' | tr }}{{ 'main.actions' | tr }}
- - - - {{ list.name }} - - {{ list.members.join(', ') }} - - - -
+

{{ 'email.incoming.incomingServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 993 (TLS)

+

{{ 'email.incoming.outgointServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 587 (STARTTLS) or 465 (TLS)

+

{{ 'email.incoming.sieveServerInfo' | tr }}
{{ 'email.incoming.server' | tr }}: {{config.mailFqdn}}
{{ 'email.incoming.port' | tr }}: 4190 (STARTTLS)

+

-
+
-
-

{{ 'email.incoming.catchall.title' | tr }}

-
+
-
-
-
+
+

{{ 'email.incoming.mailboxes.title' | tr }} + + +
+ +
-
+ +

+
-
-
-
- -
-
- - -
+
+
+
+ + + + + + + + + + + + + + + + + + + +
{{ 'email.incoming.mailboxes.name' | tr }}{{ 'email.incoming.mailboxes.owner' | tr }}{{ 'email.incoming.mailboxes.aliases' | tr }}{{ 'email.incoming.mailboxes.usage' | tr }}{{ 'main.actions' | tr }}
+ {{ mailbox.name }} + + {{ mailbox.ownerDisplayName }} + + {{ alias.name + '@' + alias.domain }} + + {{ mailbox.usage | prettyByteSize }} + + + +
- +
- -
-

{{ 'email.outbound.title' | tr }}

+
-
-
+
+

{{ 'email.incoming.mailinglists.title' | tr }} + +
+ +
-
+ +

+
-
-
-
- -
- -

- {{ 'email.outbound.noopAdminDomainWarning' | tr }} - {{ 'email.outbound.noopNonAdminDomainWarning' | tr }} -

- -
-
- -
-
-
-
-
- -
- {{ mailRelay.error.host }} -
- -
-
- -
- {{ mailRelay.error.port }} -
- -
- -
- -
- - -
- -
- {{ mailRelay.error.serverApiToken }} -
- -
- - -
- -
- {{ mailRelay.error.username }} -
- -
- -
- -
- {{ mailRelay.error.password }} -
- -
- - -
-
-
-
- -
-
- - - {{ mailRelay.error }} - {{ 'email.outbound.mailRelay.saveSuccess' | tr }} -
-
- -
+
+
+
+ {{ 'email.incoming.mailinglists.description' | tr }}
-
- +
+ + + + + + + + + + + + + + + + + +
{{ 'email.incoming.mailinglists.name' | tr }}{{ 'email.incoming.mailinglists.members' | tr }}{{ 'main.actions' | tr }}
+ + + + {{ list.name }} + + {{ list.members.join(', ') }} + + + +
+
+
+
+ +
+ +
+

{{ 'email.incoming.catchall.title' | tr }}

+
+ +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ + + +
+

{{ 'email.outbound.title' | tr }}

+ +
+
+
+ +
+ +
+
+
+
+ +

+ {{ 'email.outbound.noopAdminDomainWarning' | tr }} + {{ 'email.outbound.noopNonAdminDomainWarning' | tr }} +

+
- - - -
-

{{ 'email.masquerading.title' | tr }}

- -
-
-
- -
-
-
- -
-

{{ 'email.signature.title' | tr }}

-

- -
-
-
- -
-
-
-
-
- - +
+
+
+ +
+ +
+ {{ mailRelay.error.host }}
- -
- - + +
+
+ +
+ {{ mailRelay.error.port }}
+ +
- -
+
+ +
+ + +
+ +
+ {{ mailRelay.error.serverApiToken }} +
+ +
+ + +
+ +
+ {{ mailRelay.error.username }} +
+ +
+ +
+ +
+ {{ mailRelay.error.password }} +
+ +
+ +
-
-
-
+ +
+
+ + + {{ mailRelay.error }} + {{ 'email.outbound.mailRelay.saveSuccess' | tr }} +
+
+ +
+
+
+ +
+
+
+ + + +
+

{{ 'email.masquerading.title' | tr }}

+ +
+
+
+ +
+
+
+ +
+

{{ 'email.signature.title' | tr }}

+

+ +
+
+
+ +
+
+
+
+
+ + +
+ +
+ + +
+ + +
+
+
+
+
+
+ +
+
+
+ + + + +
+
+
+

{{ 'email.dnsStatus.title' | tr }} + -

-
-
- - - - -
-
-
-

{{ 'email.dnsStatus.title' | tr }} - -

- -
-
-
-
-
-

-   - {{ record.name }} record - -

-
-
-

{{ 'email.dnsStatus.namecheapInfo' | tr }}

-

{{ 'email.dnsStatus.ptrInfo' | tr }}

-

{{ 'email.dnsStatus.hostname' | tr }}: {{ expectedDnsRecords[record.value].name }}

-

{{ 'email.dnsStatus.domain' | tr }}: {{ expectedDnsRecords[record.value].domain }}

-

{{ 'email.dnsStatus.type' | tr }}: {{ expectedDnsRecords[record.value].type }}

-

{{ 'email.dnsStatus.expected' | tr }}: {{ expectedDnsRecords[record.value].expected }}

-

{{ 'email.dnsStatus.current' | tr }}: {{ expectedDnsRecords[record.value].value ? expectedDnsRecords[record.value].value : ('['+('email.dnsStatus.recordNotSet' | tr)+']') }}

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

{{ 'email.smtpStatus.title' | tr }}

- -
+ + +
+
+
+

-   - - {{ domain.mailConfig.relay.provider === 'cloudron-smtp' ? ('email.smtpStatus.outboudDirect' | tr) : ('email.smtpStatus.outboudRelay' | tr) }} - - +   + {{ record.name }} record +

-
+
-

{{ domain.mailStatus.relay.value }}

-
-
-
-
- -
-
-

-   - {{ 'email.smtpStatus.blacklistCheck' | tr }} - -

-
-
-
-
- +

{{ 'email.dnsStatus.namecheapInfo' | tr }}

+

{{ 'email.dnsStatus.ptrInfo' | tr }}

+

{{ 'email.dnsStatus.hostname' | tr }}: {{ expectedDnsRecords[record.value].name }}

+

{{ 'email.dnsStatus.domain' | tr }}: {{ expectedDnsRecords[record.value].domain }}

+

{{ 'email.dnsStatus.type' | tr }}: {{ expectedDnsRecords[record.value].type }}

+

{{ 'email.dnsStatus.expected' | tr }}: {{ expectedDnsRecords[record.value].expected }}

+

{{ 'email.dnsStatus.current' | tr }}: {{ expectedDnsRecords[record.value].value ? expectedDnsRecords[record.value].value : ('['+('email.dnsStatus.recordNotSet' | tr)+']') }}

@@ -710,7 +664,51 @@
+
- +
+
+
+

{{ 'email.smtpStatus.title' | tr }}

+ +
+
+

+   + + {{ domain.mailConfig.relay.provider === 'cloudron-smtp' ? ('email.smtpStatus.outboudDirect' | tr) : ('email.smtpStatus.outboudRelay' | tr) }} + + +

+
+
+

{{ domain.mailStatus.relay.value }}

+
+
+
+
+ +
+
+

+   + {{ 'email.smtpStatus.blacklistCheck' | tr }} + +

+
+
+
+
+ +
+
+
+
+
+
+
+