diff --git a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html index 24a3c6b35d..f940f125d8 100644 --- a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html +++ b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.html @@ -11,13 +11,22 @@ occasionally send you emails with service messages relating to your ORCID account. As the information in these emails may affect your privacy settings and the functioning of your ORCID account, you cannot opt-out of - these service messages per our Privacy Policy + these service messages per our + + Privacy Policy +

-

+

Notification email address -

+

Your ORCID notification emails will be sent to:

@@ -29,6 +38,7 @@

cdkDragHandle src="./assets/vectors/email-verified-icon.svg" aria-labelledby="email-verified-address" + height="32" /> -
+
- -

+

+ Email frequency +

+

How often should we send you ORCID notification emails about:

-

+

Items added or edited in your record by a trusted party

- +
-

Adminstrative changes, such as being made a trusted individual -

+ - +
-
-

+

Tips & features email -

-

+

+

We occasionally send out an email with information on new features and tips for getting the best out of your ORCID record.

diff --git a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss index 8c8b2162a9..a613b07d93 100644 --- a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss +++ b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.scss @@ -53,6 +53,7 @@ mat-checkbox { .email-container { display: flex; gap: 16px; + align-items: center; label { font-weight: bold; } @@ -62,4 +63,32 @@ mat-checkbox { display: flex; } } + .email-manage-emails-link { + padding-right: 16px; + } } + +h4 { + margin-top: 32px; + margin-bottom: 8px; +} + +#email-verified-address { + margin-top: 2px; +} + +.margin-top-0 { + margin-top: 0; +} + +.margin-bottom-16 { + margin-bottom: 16px; +} + +.margin-bottom-8 { + margin-bottom: 8px; +} + +.margin-bottom-32 { + margin-bottom: 32px; +} \ No newline at end of file diff --git a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts index cc6207e5be..689960afa2 100644 --- a/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts +++ b/src/app/account-settings/components/settings-defaults-email-frequency/settings-defaults-email-frequency.component.ts @@ -42,6 +42,10 @@ export class SettingsDefaultsEmailFrequencyComponent form: UntypedFormGroup primaryEmail: string primaryEmailVerified: string + + arialabelSetTheFrequency = $localize`:@@account.setTheFrequency:Set the frequency for update notifications` + ariaLabelSetTheFrequencyAdministrative = $localize`:@@account.setTheFrequencyAdministrative:Set the frequency for administrative change notifications` + ariaLabelSetTheFrequencyPermission = $localize`:@@account.setTheFrequencyMember:Set the frequency for permission request notifications` @Output() loading = new EventEmitter() constructor( diff --git a/src/app/account-settings/components/settings-defaults/settings-defaults.component.ts b/src/app/account-settings/components/settings-defaults/settings-defaults.component.ts index 82d2dafcec..6d8b966b2e 100644 --- a/src/app/account-settings/components/settings-defaults/settings-defaults.component.ts +++ b/src/app/account-settings/components/settings-defaults/settings-defaults.component.ts @@ -13,7 +13,7 @@ export class SettingsDefaultsComponent implements OnInit { visibilityFrequencyLoading = false visibilityExpanded = false languageExpanded = false - titleEmailFrequency = $localize`:@@account.emailFrequency:Email frequency` + titleEmailFrequency = $localize`:@@account.emailFrequency:Notification email frequency` titleLanguage = $localize`:@@account.language:Language` titleVisibility = $localize`:@@account.visibility:Visibility` diff --git a/src/locale/properties/account/account.en.properties b/src/locale/properties/account/account.en.properties index a2f42a7596..b615123e6c 100644 --- a/src/locale/properties/account/account.en.properties +++ b/src/locale/properties/account/account.en.properties @@ -199,7 +199,7 @@ account.scopePathType.readLimited=Read your information with visibility set to T account.scopePathType.readPublic=Read public info only account.scopePathType.webhook=Notifies Application if there are changes to your record account.notifications=Notifications keep you up-to-date with activity in your ORCID record. Updates are automatically sent to your ORCID inbox but you can also have them sent to you by email. You can choose the kind of notifications you wish to receive by email and how often you want to receive them -account.inAdditionToTheOptional=In addition to the optional account and record notifications, we may occasionally send you emails with service messages relating to your ORCID account. As the information in these emails may affect your privacy settings and the functioning of your ORCID account, you cannot opt-out of these service messages per our Privacy Policy +account.inAdditionToTheOptional=In addition to the optional account and record notifications, we may occasionally send you emails with service messages relating to your ORCID account. As the information in these emails may affect your privacy settings and the functioning of your ORCID account, you cannot opt-out of these service messages per our account.notificationEmailAddress=Notification email address account.yourOrcidNotification=Your ORCID notification emails will be sent to: account.unverifiedEmailAddress=Unverified email address @@ -209,3 +209,8 @@ account.howOftenShouldWeSend=How often should we send you ORCID notification ema account.administrativeChangesSuchAs=Adminstrative changes, such as being made a trusted individual account.tipsAndFeatures=Tips & features email account.idLikeToReceiveTheOrcidTips=I’d like to receive the ORCID tips & features email +account.privacypolicy=Privacy Policy +account.setTheFrequency=Set the frequency for update notifications +account.setTheFrequencyAdministrative=Set the frequency for administrative change notifications +account.setTheFrequencyMember=Set the frequency for permission request notifications + \ No newline at end of file