Skip to content

EspoCRM – Open Source CRM Application

Email/Phone field opted-out invalid status style impr

Yuriiac879bc909d9
diff --git a/client/res/templates/fields/email/detail.tpl b/client/res/templates/fields/email/detail.tpl
index b78a094d24..8a1fac1238 100644
--- a/client/res/templates/fields/email/detail.tpl
+++ b/client/res/templates/fields/email/detail.tpl
@@ -1,8 +1,15 @@
{{#if emailAddressData}}
{{#each emailAddressData}}
<div>
- {{#unless invalid}}
- {{#unless erased}}
+ {{~#if invalid~}}
+ <span
+ class="fas fa-exclamation-circle fa-sm text-muted"
+ title="{{translate 'Invalid' scope='EmailAddress'}}"
+ ></span>
+ {{~null~}}<span style="user-select: none">&nbsp;</span>{{~null~}}
+ {{/if~}}
+ {{~#unless invalid}}
+ {{~#unless erased}}
<a
role="button"
tabindex="0"
@@ -10,9 +17,11 @@
data-action="mailTo"
class="selectable"
>
- {{/unless}}
- {{/unless}}
- <span {{#if lineThrough}}style="text-decoration: line-through"{{/if}}>{{emailAddress}}</span>
+ {{~/unless~}}
+ {{~/unless~}}
+ <span
+ class="{{#if optOut}} text-strikethrough {{/if}}"
+ >{{emailAddress}}</span>
{{#unless invalid}}
{{#unless erased}}
</a>
diff --git a/client/res/templates/fields/email/list.tpl b/client/res/templates/fields/email/list.tpl
index 8325471ec4..f8f12bc6c9 100644
--- a/client/res/templates/fields/email/list.tpl
+++ b/client/res/templates/fields/email/list.tpl
@@ -9,9 +9,18 @@
data-action="mailTo"
title="{{value}}"
class="selectable text-default"
- {{#if isOptedOut}}style="text-decoration: line-through;"{{/if}}
- >{{value}}</a>
+ ><span
+ class="{{#if isOptedOut}} text-strikethrough {{/if}}"
+ >{{value}}</span></a>
{{else}}
- <span title="{{value}}" style="text-decoration: line-through;">{{value}}</span>
+ <span
+ class="fas fa-exclamation-circle fa-sm text-muted"
+ title="{{translate 'Invalid' scope='EmailAddress'}}"
+ ></span>
+ {{~null~}}<span style="user-select: none">&nbsp;</span>{{~null~}}
+ <span
+ title="{{value}}"
+ class="text-soft {{#if isOptedOut}} text-strikethrough {{/if}}"
+ >{{value}}</span>
{{/unless}}
{{/if}}
diff --git a/client/res/templates/fields/phone/detail.tpl b/client/res/templates/fields/phone/detail.tpl
index 6295504094..db73734395 100644
--- a/client/res/templates/fields/phone/detail.tpl
+++ b/client/res/templates/fields/phone/detail.tpl
@@ -1,8 +1,15 @@
{{#if phoneNumberData}}
{{#each phoneNumberData}}
<div>
- {{#unless invalid}}
- {{#unless erased}}
+ {{~#if invalid~}}
+ <span
+ class="fas fa-exclamation-circle fa-sm text-muted"
+ title="{{translate 'Invalid' scope='EmailAddress'}}"
+ ></span>
+ {{~null~}}<span style="user-select: none">&nbsp;</span>{{~null~}}
+ {{/if~}}
+ {{~#unless invalid~}}
+ {{~#unless erased~}}
<a
href="tel:{{valueForLink}}"
data-phone-number="{{valueForLink}}"
@@ -10,9 +17,11 @@
style="display: inline-block;"
class="selectable"
>
- {{/unless}}
- {{/unless}}
- <span {{#if lineThrough}}style="text-decoration: line-through"{{/if}}>{{phoneNumber}}</span>
+ {{~/unless~}}
+ {{~/unless~}}
+ <span
+ class="{{#if optOut}} text-strikethrough {{/if}}"
+ >{{phoneNumber}}</span>
{{#unless invalid}}
{{#unless erased}}
</a>
diff --git a/client/res/templates/fields/phone/list.tpl b/client/res/templates/fields/phone/list.tpl
index fd2cb086ba..8045f1ea1b 100644
--- a/client/res/templates/fields/phone/list.tpl
+++ b/client/res/templates/fields/phone/list.tpl
@@ -8,9 +8,18 @@
data-action="dial"
title="{{value}}"
class="selectable text-default"
- {{#if isOptedOut}}style="text-decoration: line-through;"{{/if}}
- >{{value}}</a>
+ ><span
+ class="{{#if isOptedOut}} text-strikethrough {{/if}}"
+ >{{value}}</span></a>
{{else}}
- <span title="{{value}}" style="text-decoration: line-through;">{{value}}</span>
+ <span
+ class="fas fa-exclamation-circle fa-sm text-muted"
+ title="{{translate 'Invalid' scope='EmailAddress'}}"
+ ></span>
+ {{~null~}}<span style="user-select: none">&nbsp;</span>{{~null~}}
+ <span
+ title="{{value}}"
+ class="text-soft {{#if isOptedOut}} text-strikethrough {{/if}}"
+ >{{value}}</span>
{{/unless}}
{{/if}}
diff --git a/frontend/less/espo/elements/type.less b/frontend/less/espo/elements/type.less
index a1ef8e9ffd..7acaa7ef28 100644
--- a/frontend/less/espo/elements/type.less
+++ b/frontend/less/espo/elements/type.less
@@ -77,6 +77,15 @@ b, strong {
text-decoration: line-through;
}
+a.text-strikethrough {
+ text-decoration: line-through;
+
+ &:focus,
+ &:hover {
+ text-decoration: line-through;
+ }
+}
+
.text-large {
font-size: 1.4em;
}