diff --git a/src/app/cdk/panel/panel-source/panel-source.component.html b/src/app/cdk/panel/panel-source/panel-source.component.html index fc5ff21e2d..89e7b3a2b9 100644 --- a/src/app/cdk/panel/panel-source/panel-source.component.html +++ b/src/app/cdk/panel/panel-source/panel-source.component.html @@ -37,12 +37,14 @@ (of {{ stackLength }})‎ - + Make preferred source diff --git a/src/app/cdk/panel/panel-source/panel-source.component.ts b/src/app/cdk/panel/panel-source/panel-source.component.ts index ae715a923b..9a6db4d917 100644 --- a/src/app/cdk/panel/panel-source/panel-source.component.ts +++ b/src/app/cdk/panel/panel-source/panel-source.component.ts @@ -17,6 +17,9 @@ import { VerificationEmailModalService } from 'src/app/core/verification-email-m preserveWhitespaces: true, }) export class PanelSourceComponent implements OnInit { + closeOtherSources = $localize`:@@record.closeOtherSources:Close other sources` + openOtherSources = $localize`:@@record.openOtherSources:Open other sources` + @Input() isPublicRecord @Input() isPreferred = true @Input() sourceName diff --git a/src/app/cdk/panel/panel.module.ts b/src/app/cdk/panel/panel.module.ts index 4f8bf934d7..89edd6504b 100644 --- a/src/app/cdk/panel/panel.module.ts +++ b/src/app/cdk/panel/panel.module.ts @@ -51,6 +51,7 @@ import { SharedModule } from '../../shared/shared.module' FormsModule, MatProgressBarModule, SharedModule, + A11yLinkModule, ], exports: [ PanelComponent, diff --git a/src/app/cdk/panel/panel/panel.component.html b/src/app/cdk/panel/panel/panel.component.html index fe83fe9c50..12c0994b9a 100644 --- a/src/app/cdk/panel/panel/panel.component.html +++ b/src/app/cdk/panel/panel/panel.component.html @@ -7,7 +7,7 @@ 'staked-header': stackedHeader, 'expand-button': !editable && !isPublicRecord && !customControls }" - id="cy-panel-component" + [attr.id]="'cy-panel-component-' + panelId + '_' + type + '_' + putCode" > @@ -26,6 +33,9 @@
-
+
info edit diff --git a/src/app/cdk/panel/panel/panel.component.ts b/src/app/cdk/panel/panel/panel.component.ts index 2b484d66b8..ce1c826649 100644 --- a/src/app/cdk/panel/panel/panel.component.ts +++ b/src/app/cdk/panel/panel/panel.component.ts @@ -38,6 +38,7 @@ import { TogglzService } from '../../../core/togglz/togglz.service' styleUrls: ['./panel.component.scss', 'panel.component.scss-theme.scss'], }) export class PanelComponent implements OnInit { + @Input() panelId @Input() showVisibilityControl = false @Input() stackSiblings: any[] @Input() stackedHeader = false diff --git a/src/app/cdk/privacy-selector/privacy-selector/privacy-selector.component.html b/src/app/cdk/privacy-selector/privacy-selector/privacy-selector.component.html index eb976fdc77..70072fc028 100644 --- a/src/app/cdk/privacy-selector/privacy-selector/privacy-selector.component.html +++ b/src/app/cdk/privacy-selector/privacy-selector/privacy-selector.component.html @@ -1,6 +1,8 @@
+
void private onTouched: (value: string) => void @Input() whiteBackground = false diff --git a/src/app/cdk/side-bar/side-bar-id/side-bar-id.component.html b/src/app/cdk/side-bar/side-bar-id/side-bar-id.component.html index 4adb34659f..3a967b617f 100644 --- a/src/app/cdk/side-bar/side-bar-id/side-bar-id.component.html +++ b/src/app/cdk/side-bar/side-bar-id/side-bar-id.component.html @@ -31,6 +31,7 @@
= new Subject() labelPreviewPublicRecord = $localize`:@@record.ariaLabelpreviewPublicRecord:Preview the public version of this record (Opens in a new tab)` environment = environment diff --git a/src/app/cdk/side-bar/side-bar/side-bar.component.html b/src/app/cdk/side-bar/side-bar/side-bar.component.html index 178fd2195b..9402b5658f 100644 --- a/src/app/cdk/side-bar/side-bar/side-bar.component.html +++ b/src/app/cdk/side-bar/side-bar/side-bar.component.html @@ -18,6 +18,7 @@

Emails

*ngFor="let website of userRecord.website.websites; let last = last" [visibility]="!isPublicRecord && website.visibility.visibility" > Other IDs !isPublicRecord && externalIdentifier.visibility.visibility " >Other IDs Keywords = new Subject() @Input() isPublicRecord: string diff --git a/src/app/cdk/top-bar-my-public-record-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.html b/src/app/cdk/top-bar-my-public-record-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.html index 0badbef5f5..4a43c0418d 100644 --- a/src/app/cdk/top-bar-my-public-record-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.html +++ b/src/app/cdk/top-bar-my-public-record-preview/top-bar-my-public-record-preview/top-bar-my-public-record-preview.component.html @@ -52,7 +52,6 @@
- preview
Switch to another account - - + + Switch to another account
diff --git a/src/app/constants.ts b/src/app/constants.ts index ecf56512cc..30f40a94f5 100644 --- a/src/app/constants.ts +++ b/src/app/constants.ts @@ -48,6 +48,7 @@ export const ITEM_ACTION_EDIT = 'edit' export const ITEM_ACTION_DELETE = 'delete' export const ITEM_ACTION_HIDE = 'hide' export const ITEM_ACTION_SHOW = 'show' +export const ITEM_ACTION_SELECT = 'select' export const ApplicationRoutes = { myOrcid: 'my-orcid', diff --git a/src/app/layout/language/language.component.html b/src/app/layout/language/language.component.html index cbfa100551..8047213f68 100644 --- a/src/app/layout/language/language.component.html +++ b/src/app/layout/language/language.component.html @@ -18,6 +18,9 @@
- - - - diff --git a/src/app/layout/user-menu/user-menu.component.html b/src/app/layout/user-menu/user-menu.component.html index 04b683d625..79471ee1a3 100644 --- a/src/app/layout/user-menu/user-menu.component.html +++ b/src/app/layout/user-menu/user-menu.component.html @@ -7,7 +7,7 @@ [matMenuTriggerFor]="menu" (menuOpened)="state = true" (menuClosed)="state = false" - [attr.aria-label]="labelUserMenu" + [attr.aria-label]="labelUserMenu + ' ' + displayName" id="cy-user-info" > diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.html b/src/app/record/components/affiliation-stack/affiliation-stack.component.html index 71456b246c..9d3a28d6d5 100644 --- a/src/app/record/components/affiliation-stack/affiliation-stack.component.html +++ b/src/app/record/components/affiliation-stack/affiliation-stack.component.html @@ -9,6 +9,7 @@ 0">
print diff --git a/src/app/record/components/top-bar-actions/top-bar-actions.component.ts b/src/app/record/components/top-bar-actions/top-bar-actions.component.ts index 9e2f8186e2..9112132f32 100644 --- a/src/app/record/components/top-bar-actions/top-bar-actions.component.ts +++ b/src/app/record/components/top-bar-actions/top-bar-actions.component.ts @@ -13,6 +13,7 @@ import { UserStatus } from '../../../types/userStatus.endpoint' styleUrls: ['./top-bar-actions.component.scss'], }) export class TopBarActionsComponent implements OnInit, OnDestroy { + labelPrintableVersion = $localize`:@@topBar.ariaLabelPrintableVersion:View printable version (Opens of a different tab)` $destroy: Subject = new Subject() platform: PlatformInfo @Input() userRecord: UserRecord diff --git a/src/app/record/components/top-bar/top-bar.component.html b/src/app/record/components/top-bar/top-bar.component.html index 537d2036d7..559bb4c0e0 100644 --- a/src/app/record/components/top-bar/top-bar.component.html +++ b/src/app/record/components/top-bar/top-bar.component.html @@ -49,6 +49,7 @@ *ngIf="userRecord?.names" > *ngIf="userRecord?.biography" >

Expand all @@ -59,6 +60,7 @@ i18n="@@shared.collapseAll" (click)="switchPanelsState()" *ngIf="globalExpandState" + [attr.aria-label]="collapseAllActivitiesArialLabel" > Collapse all diff --git a/src/app/shared/pipes/app-panel-activity-action-aria-label/app-panel-activity-action-aria-label.pipe.ts b/src/app/shared/pipes/app-panel-activity-action-aria-label/app-panel-activity-action-aria-label.pipe.ts index 233e472921..5328bca80f 100644 --- a/src/app/shared/pipes/app-panel-activity-action-aria-label/app-panel-activity-action-aria-label.pipe.ts +++ b/src/app/shared/pipes/app-panel-activity-action-aria-label/app-panel-activity-action-aria-label.pipe.ts @@ -4,6 +4,7 @@ import { ITEM_ACTION_EDIT, ITEM_ACTION_HIDE, ITEM_ACTION_SHOW, + ITEM_ACTION_SELECT, } from 'src/app/constants' @Pipe({ @@ -20,6 +21,8 @@ export class AppPanelActivityActionAriaLabelPipe implements PipeTransform { translationForAction = $localize`:@@shared.activityShowDetailsAriaLabel:Show more details for` } else if (activity === ITEM_ACTION_HIDE) { translationForAction = $localize`:@@shared.activityHideDetailsAriaLabel:Hide details for` + } else if (activity === ITEM_ACTION_SELECT) { + translationForAction = $localize`:@@shared.activitySelectAriaLabel:Select` } if (panelType === 'employment') { diff --git a/src/locale/i18n.pseudo.component.html b/src/locale/i18n.pseudo.component.html index 735cddb37c..f6c0a8ca2e 100644 --- a/src/locale/i18n.pseudo.component.html +++ b/src/locale/i18n.pseudo.component.html @@ -132,8 +132,6 @@ Maintenance message Search statistics -User menu -sign in or register Warning, testing website Institution Clear diff --git a/src/locale/properties/record/record.en.properties b/src/locale/properties/record/record.en.properties index b84583b763..c489f9317b 100644 --- a/src/locale/properties/record/record.en.properties +++ b/src/locale/properties/record/record.en.properties @@ -8,7 +8,7 @@ record.keywords=Keywords record.countries=Countries record.previewPublicRecord=Preview public record record.ariaLabelpreviewPublicRecord=Preview the public version of this record (Opens in a new tab) -record.closeOtherSources=Make preferred source +record.closeOtherSources=Close other sources record.trySearching=Try using our advanced search to find researchers by their name or ORCID iD record.pleaseGet=Please get in touch with our support team via the Help button below. They can help you find the record you are looking for. record.ifYouHave=If you have previously bookmarked this record and it has now stopped working @@ -32,3 +32,10 @@ selfService.alert=While we build this improved version for the Member Portal, Se selfService.next=What to do next selfService.p3.1=Should you need any of the Self Service features during this time, please reach out to selfService.p3.2=for assistance. +record.ariaLabelPreviewPublicRecord=Preview the public version of this record (Opens in a new tab) +record.manageYourEmails=Manage your emails +record.manageYourWebsite=Manage your websites & social links +record.labelManageYourKeyword=Manage your keywords +record.labelManageYourCountries=Manage your countries +record.labelManageYourPersonalIds=Manage your personalIds +record.openOtherSources=Open other sources diff --git a/src/locale/properties/record/record.lr.properties b/src/locale/properties/record/record.lr.properties index 0d99503651..1d2da23118 100644 --- a/src/locale/properties/record/record.lr.properties +++ b/src/locale/properties/record/record.lr.properties @@ -40,3 +40,10 @@ selfService.p3.1=LR selfService.p3.2=LR selfService.next=LR record.ariaLabelpreviewPublicRecord=LR +record.ariaLabelPreviewPublicRecord=LR +record.manageYourEmails=LR +record.manageYourWebsite=LR +record.labelManageYourKeyword=LR +record.labelManageYourCountries=LR +record.labelManageYourPersonalIds=LR +record.openOtherSources=LR diff --git a/src/locale/properties/record/record.rl.properties b/src/locale/properties/record/record.rl.properties index 99f7fcb9a1..94110de4c6 100644 --- a/src/locale/properties/record/record.rl.properties +++ b/src/locale/properties/record/record.rl.properties @@ -40,3 +40,10 @@ selfService.p3.1=RL selfService.p3.2=RL selfService.next=RL record.ariaLabelpreviewPublicRecord=RL +record.ariaLabelPreviewPublicRecord=RL +record.manageYourEmails=RL +record.manageYourWebsite=RL +record.labelManageYourKeyword=RL +record.labelManageYourCountries=RL +record.labelManageYourPersonalIds=RL +record.openOtherSources=RL diff --git a/src/locale/properties/record/record.xx.properties b/src/locale/properties/record/record.xx.properties index d2ce25e8c3..4d2494e5b0 100644 --- a/src/locale/properties/record/record.xx.properties +++ b/src/locale/properties/record/record.xx.properties @@ -40,3 +40,10 @@ selfService.p3.1=X selfService.p3.2=X selfService.next=X record.ariaLabelpreviewPublicRecord=X +record.ariaLabelPreviewPublicRecord=X +record.manageYourEmails=X +record.manageYourWebsite=X +record.labelManageYourKeyword=X +record.labelManageYourCountries=X +record.labelManageYourPersonalIds=X +record.openOtherSources=X diff --git a/src/locale/properties/shared/shared.en.properties b/src/locale/properties/shared/shared.en.properties index 39cc84b0c8..ae39cf45eb 100644 --- a/src/locale/properties/shared/shared.en.properties +++ b/src/locale/properties/shared/shared.en.properties @@ -488,9 +488,16 @@ shared.peerReviewSortAriaLabel=Sort your peer reviews shared.disabled=(Disabled) shared.editActivityAriaLabel=Edit shared.deleteActivityAriaLabel=Delete +shared.activitySelectAriaLabel=Select shared.personalInformation=Personal information shared.professionalActivities=Professional activities shared.statusBar=Status bar +shared.ariaLabelActions=Choose an action to apply to selected works +share.selectAllWorks=Select all Works on this page +share.ariaLabelPublic=set item visibility to Everyone +share.ariaLabelTrustedParty=set item visibility to Trusted Parties +share.ariaLabelPrivate=set item visibility to Only Me +share.currentSelected=(Currently selected) shared.dialogAriaLabeledByCountries=Manage your countries dialog shared.dialogAriaLabeledByEmails=Manage your emails dialog shared.dialogAriaLabeledByWebsites=Manage your websites & social links dialog diff --git a/src/locale/properties/shared/shared.lr.properties b/src/locale/properties/shared/shared.lr.properties index d7745a2acb..0e76c29630 100644 --- a/src/locale/properties/shared/shared.lr.properties +++ b/src/locale/properties/shared/shared.lr.properties @@ -510,3 +510,10 @@ shared.dialogAriaLabeledByOtherIds=LR shared.dialogAriaLabeledByBiography=LR shared.dialogAriaLabeledByNames=LR shared.dialogAriaLabeledByKeywords=LR +shared.activitySelectAriaLabel=LR +shared.ariaLabelActions=LR +share.selectAllWorks=LR +share.ariaLabelPublic=LR +share.ariaLabelTrustedParty=LR +share.ariaLabelPrivate=LR +share.currentSelected=LR diff --git a/src/locale/properties/shared/shared.rl.properties b/src/locale/properties/shared/shared.rl.properties index 1d2ada3841..9317bc6005 100644 --- a/src/locale/properties/shared/shared.rl.properties +++ b/src/locale/properties/shared/shared.rl.properties @@ -506,3 +506,10 @@ shared.dialogAriaLabeledByOtherIds=RL shared.dialogAriaLabeledByBiography=RL shared.dialogAriaLabeledByNames=RL shared.dialogAriaLabeledByKeywords=RL +shared.activitySelectAriaLabel=RL +shared.ariaLabelActions=RL +share.selectAllWorks=RL +share.ariaLabelPublic=RL +share.ariaLabelTrustedParty=RL +share.ariaLabelPrivate=RL +share.currentSelected=RL diff --git a/src/locale/properties/shared/shared.xx.properties b/src/locale/properties/shared/shared.xx.properties index 529f07a1e7..23daa0d933 100644 --- a/src/locale/properties/shared/shared.xx.properties +++ b/src/locale/properties/shared/shared.xx.properties @@ -506,3 +506,10 @@ shared.dialogAriaLabeledByOtherIds=X shared.dialogAriaLabeledByBiography=X shared.dialogAriaLabeledByNames=X shared.dialogAriaLabeledByKeywords=X +shared.activitySelectAriaLabel=X +shared.ariaLabelActions=X +share.selectAllWorks=X +share.ariaLabelPublic=X +share.ariaLabelTrustedParty=X +share.ariaLabelPrivate=X +share.currentSelected=X diff --git a/src/locale/properties/top-bar/top-bar.en.properties b/src/locale/properties/top-bar/top-bar.en.properties index b82872295d..a57945ec18 100644 --- a/src/locale/properties/top-bar/top-bar.en.properties +++ b/src/locale/properties/top-bar/top-bar.en.properties @@ -75,3 +75,4 @@ topBar.editThisRecord=Edit this record topBar.otherNames=Other names topBar.name=Name topBar.printableVersion=Printable version +topBar.ariaLabelPrintableVersion=View printable version (Opens of a different tab) diff --git a/src/locale/properties/top-bar/top-bar.lr.properties b/src/locale/properties/top-bar/top-bar.lr.properties index 2e88e6bd38..53dffabffe 100644 --- a/src/locale/properties/top-bar/top-bar.lr.properties +++ b/src/locale/properties/top-bar/top-bar.lr.properties @@ -89,3 +89,4 @@ topBar.clickTheButton=LR topBar.visitOur=LR topBar.baseOrContact=LR topBar.weHaveSent=LR +topBar.ariaLabelPrintableVersion=LR diff --git a/src/locale/properties/top-bar/top-bar.rl.properties b/src/locale/properties/top-bar/top-bar.rl.properties index b67e6e31ab..7ea24a8d41 100644 --- a/src/locale/properties/top-bar/top-bar.rl.properties +++ b/src/locale/properties/top-bar/top-bar.rl.properties @@ -89,3 +89,4 @@ topBar.clickTheButton=RL topBar.visitOur=RL topBar.baseOrContact=RL topBar.weHaveSent=RL +topBar.ariaLabelPrintableVersion=RL diff --git a/src/locale/properties/top-bar/top-bar.xx.properties b/src/locale/properties/top-bar/top-bar.xx.properties index 4fb434cd81..fb3a0ee8f1 100644 --- a/src/locale/properties/top-bar/top-bar.xx.properties +++ b/src/locale/properties/top-bar/top-bar.xx.properties @@ -89,3 +89,4 @@ topBar.clickTheButton=X topBar.visitOur=X topBar.baseOrContact=X topBar.weHaveSent=X +topBar.ariaLabelPrintableVersion=X