From 4b99ec74a68836166d94b2d1f229aa7cc42dd1eb Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Wed, 17 Jul 2024 11:11:48 -0600 Subject: [PATCH 1/4] 9306-notification-email-frequency-account-settings-v2 --- ...gs-defaults-email-frequency.component.html | 72 +++++++++++++------ ...gs-defaults-email-frequency.component.scss | 34 ++++++++- ...ings-defaults-email-frequency.component.ts | 4 ++ .../settings-defaults.component.html | 2 +- .../settings-defaults.component.ts | 4 +- .../properties/account/account.en.properties | 3 +- 6 files changed, 89 insertions(+), 30 deletions(-) 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 60d10e2824..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,14 +53,42 @@ mat-checkbox { .email-container { display: flex; gap: 16px; + align-items: center; label { font-weight: bold; } caption { - font-style: italic ; + font-style: italic; width: 100%; - display: flex; - + 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.html b/src/app/account-settings/components/settings-defaults/settings-defaults.component.html index 97d534b974..e80667b4f4 100644 --- a/src/app/account-settings/components/settings-defaults/settings-defaults.component.html +++ b/src/app/account-settings/components/settings-defaults/settings-defaults.component.html @@ -11,7 +11,7 @@

Defaults

[title]="titleEmailFrequency" > 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..49293c959a 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 @@ -8,12 +8,12 @@ import { WINDOW } from 'src/app/cdk/window' }) export class SettingsDefaultsComponent implements OnInit { emailFrequencyLoading = false - emailFrequencyExpanded = false + emailFrequencyExpanded = true languageFrequencyLoading = false 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 5caca32da5..ce378fd263 100644 --- a/src/locale/properties/account/account.en.properties +++ b/src/locale/properties/account/account.en.properties @@ -210,4 +210,5 @@ account.howOftenShouldWeSend=How often should we send you ORCID notification ema account.itemsAddedOrEdited=Items added or edited in your record by a trusted party 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 \ No newline at end of file +account.idLikeToReceiveTheOrcidTips=I’d like to receive the ORCID tips & features email +account.privacypolicy=Privacy Policy \ No newline at end of file From 151ca30deedfc87b55062cc6640774afeab7f3bc Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Wed, 17 Jul 2024 11:13:02 -0600 Subject: [PATCH 2/4] 9306-notification-email-frequency-account-settings-v2 --- .../components/settings-defaults/settings-defaults.component.ts | 2 +- src/locale/properties/account/account.en.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 49293c959a..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 @@ -8,7 +8,7 @@ import { WINDOW } from 'src/app/cdk/window' }) export class SettingsDefaultsComponent implements OnInit { emailFrequencyLoading = false - emailFrequencyExpanded = true + emailFrequencyExpanded = false languageFrequencyLoading = false visibilityFrequencyLoading = false visibilityExpanded = false diff --git a/src/locale/properties/account/account.en.properties b/src/locale/properties/account/account.en.properties index ce378fd263..5410510cdb 100644 --- a/src/locale/properties/account/account.en.properties +++ b/src/locale/properties/account/account.en.properties @@ -211,4 +211,4 @@ account.itemsAddedOrEdited=Items added or edited in your record by a trusted par 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 \ No newline at end of file +account.privacypolicy=Privacy Policy From 081008793ef00abf1337ada77251c09d3a79b8a0 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Wed, 17 Jul 2024 11:14:09 -0600 Subject: [PATCH 3/4] 9306-notification-email-frequency-account-settings-v2 --- .../settings-defaults/settings-defaults.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/account-settings/components/settings-defaults/settings-defaults.component.html b/src/app/account-settings/components/settings-defaults/settings-defaults.component.html index e80667b4f4..97d534b974 100644 --- a/src/app/account-settings/components/settings-defaults/settings-defaults.component.html +++ b/src/app/account-settings/components/settings-defaults/settings-defaults.component.html @@ -11,7 +11,7 @@

Defaults

[title]="titleEmailFrequency" > From ddeaedfac9c56f231be3eb7471c312de3b63c908 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Wed, 17 Jul 2024 11:31:45 -0600 Subject: [PATCH 4/4] 9306-notification-email-frequency-account-settings-v2 --- src/locale/properties/account/account.en.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/locale/properties/account/account.en.properties b/src/locale/properties/account/account.en.properties index 5410510cdb..c1114b2113 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 @@ -212,3 +212,7 @@ account.administrativeChangesSuchAs=Adminstrative changes, such as being made a 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