From d38f5a4b72a1e15892f2504c3333ff2a226fa8fe Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Wed, 22 May 2024 13:04:03 -0600 Subject: [PATCH 1/6] fix: Display identifiers in trusted summary --- .../component/trusted-summary/trusted-summary.component.html | 2 +- .../component/trusted-summary/trusted-summary.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html index 686d1066d..e75b2071f 100644 --- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html +++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html @@ -335,7 +335,7 @@

[standaloneMode]="standaloneMode" [activitySection]="'other-identifiers'" [trustedSummary]="trustedSummary" - *ngIf="!trustedSummary" + *ngIf="!loading" > diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.ts b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.ts index 0b7920c78..a4b2813a2 100644 --- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.ts +++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.ts @@ -77,7 +77,7 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { modifiedToday: boolean creationDateWithOffset: any lastUpdateDate: any - loading = false + loading = true constructor( private _trustedSummary: TrustedSummaryService, @@ -113,7 +113,7 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { this._trustedSummary.getSummary(this.orcid).subscribe((data) => { this.trustedSummary = data - this.loading = true + this.loading = false if (this.trustedSummary.creation) { this.creationDateWithOffset = this.dateWithOffset( From 89c4d8e9b1c9a256e4c0ffb1c9fec063706df81c Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Wed, 22 May 2024 13:04:30 -0600 Subject: [PATCH 2/6] style: Override color in cookie settings button onetrust --- src/app/layout/footer/footer.component.scss-theme.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/layout/footer/footer.component.scss-theme.scss b/src/app/layout/footer/footer.component.scss-theme.scss index b51bec55a..3ea0a2a87 100644 --- a/src/app/layout/footer/footer.component.scss-theme.scss +++ b/src/app/layout/footer/footer.component.scss-theme.scss @@ -10,6 +10,7 @@ footer { background-color: map-get($background, light-grey); a { + color: mat.get-color-from-palette($primary, 700)!important; font-weight: normal !important; } .social { From 02af7300eb43a98eb63c6299112e657b8e06419f Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Wed, 22 May 2024 13:11:20 -0600 Subject: [PATCH 3/6] style: Justify links to the center --- src/app/layout/footer/footer.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/layout/footer/footer.component.scss b/src/app/layout/footer/footer.component.scss index 06e38d96f..20b3375bf 100644 --- a/src/app/layout/footer/footer.component.scss +++ b/src/app/layout/footer/footer.component.scss @@ -84,7 +84,7 @@ footer.mobile { .links { > .url-lists { - justify-content: space-around; + justify-content: center; a { .columns-4 :host &, From 810b5d3ef279d29855fa7bc2a5bf1815d08bde08 Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Wed, 22 May 2024 13:16:41 -0600 Subject: [PATCH 4/6] fix: Open social link on new tab --- src/app/layout/footer/footer.component.html | 48 +++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/src/app/layout/footer/footer.component.html b/src/app/layout/footer/footer.component.html index 2e65c7f53..a0bdb5afe 100644 --- a/src/app/layout/footer/footer.component.html +++ b/src/app/layout/footer/footer.component.html @@ -19,52 +19,84 @@ > Orcid - + - + - + - + - + - - - + Date: Wed, 22 May 2024 13:42:09 -0600 Subject: [PATCH 5/6] style: Fix alignment for edge cases in view port size --- src/app/layout/footer/footer.component.html | 34 ++++++++++++--------- src/app/layout/footer/footer.component.scss | 6 +++- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/app/layout/footer/footer.component.html b/src/app/layout/footer/footer.component.html index a0bdb5afe..91978a037 100644 --- a/src/app/layout/footer/footer.component.html +++ b/src/app/layout/footer/footer.component.html @@ -111,23 +111,27 @@ class="CC0 orc-font-body-small" [ngClass]="{ 'col desktop': isDesktop }" > -
+
public domain
- The text of this website is published under a CC0 license. Images and marks are subject to copyright and trademark - protection. +

+ public domain + + The text of this website is published under a CC0 license. Images and marks are subject to copyright and trademark + protection. +

Date: Wed, 22 May 2024 14:13:31 -0600 Subject: [PATCH 6/6] fix: Update aria label in summary links --- .../summary-panel/summary-panel.component.html | 2 +- .../component/summary-panel/summary-panel.component.ts | 10 +--------- .../summary-simple-panel.component.ts | 9 +-------- .../trusted-summary/trusted-summary.component.html | 3 +++ 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.html b/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.html index d35bfe77e..f02485b05 100644 --- a/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.html +++ b/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.html @@ -118,7 +118,7 @@ tabindex="0" (click)="goToActivitySection(activitySection)" (keydown)="goToActivitySection(activitySection, $event)" - [attr.aria-label]="ariaLabelMore" + [attr.aria-label]="ariaLabelActivitySection" >+ {{ count - 3 }} {{ moreLabelSingular diff --git a/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts b/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts index 566e16f3c..c7dbfb64b 100644 --- a/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts +++ b/src/app/cdk/trusted-summary/component/summary-panel/summary-panel.component.ts @@ -19,6 +19,7 @@ export class SummaryPanelComponent implements OnInit { @Input() count: number = 0 @Input() moreLabel: string = '' @Input() moreLabelSingular: string = '' + @Input() ariaLabelActivitySection: string = '' @Input() showToPresent = true @Input() hoverEffect = false @Input() standaloneMode: boolean @@ -29,7 +30,6 @@ export class SummaryPanelComponent implements OnInit { validatedSourceAriaLabel = $localize`:@@summary.validatedSource:Validated source` selftAssertedSource = $localize`:@@summary.selfAssertedSource:Self-asserted source` - ariaLabelMore: string constructor(@Inject(WINDOW) private _window: Window) {} @@ -44,14 +44,6 @@ export class SummaryPanelComponent implements OnInit { this.activitiesToDisplay = this.activitySummary.slice(0, 3) this.acitivityCountOverflow = this.count > 3 - - if (this.standaloneMode) { - if (this.count - 3 > 1) { - this.ariaLabelMore = RecordUtil.appendOpensInNewTab(this.moreLabel) - } else { - this.ariaLabelMore = RecordUtil.appendOpensInNewTab(this.moreLabelSingular) - } - } } } goToUrl(url: string, event?: KeyboardEvent) { diff --git a/src/app/cdk/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.ts b/src/app/cdk/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.ts index 9f725144d..05755fa27 100644 --- a/src/app/cdk/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.ts +++ b/src/app/cdk/trusted-summary/component/summary-simple-panel/summary-simple-panel.component.ts @@ -29,6 +29,7 @@ export class SummarySimplePanelComponent implements OnInit { @Input() count: number = 0 @Input() moreLabel: string = '' @Input() moreLabelSingular: string = '' + @Input() ariaLabelActivitySection: string = '' @Input() hoverEffect = false @Input() overflowUrl: string = '' @Input() standaloneMode: boolean @@ -38,7 +39,6 @@ export class SummarySimplePanelComponent implements OnInit { unsubscribe = new Subject() mobile: boolean acitivityCountOverflow = false - ariaLabelActivitySection: string validatedSourceAriaLabel = $localize`:@@summary.validatedSource:Validated source` selfAssertedSource = $localize`:@@summary.selfAssertedSource:Self-asserted source` @@ -49,13 +49,6 @@ export class SummarySimplePanelComponent implements OnInit { this.acitivityCountOverflow = this.simpleActivities.length > 3 this.simpleActivities = this.simpleActivities.slice(0, 3) - if (this.standaloneMode) { - if (this.count - 3 > 1) { - this.ariaLabelActivitySection = RecordUtil.appendOpensInNewTab(this.moreLabel) - } else { - this.ariaLabelActivitySection = RecordUtil.appendOpensInNewTab(this.moreLabelSingular) - } - } } goToUrl(url?: string, event?: KeyboardEvent) { if (!url) { diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html index e75b2071f..c12875ade 100644 --- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html +++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html @@ -138,6 +138,7 @@

[count]="trustedSummary.employmentAffiliationsCount" [moreLabel]="labelMoreAffiliations" [moreLabelSingular]="labelMoreAffiliation" + [ariaLabelActivitySection]="ariaLabelAffiliations" [hoverEffect]="affiliationsHover" [standaloneMode]="standaloneMode" [activitySection]="'affiliations'" @@ -305,6 +306,7 @@

[count]="trustedSummary.professionalActivitiesCount" [moreLabel]="labelMoreProfessionalActivities" [moreLabelSingular]="labelMoreProfessionalActivitie" + [ariaLabelActivitySection]="ariaLabelProfessionalActivities" [standaloneMode]="standaloneMode" [activitySection]="'professional-activities'" > @@ -331,6 +333,7 @@

[overflowUrl]="trustedSummary?.orcid + '#other-identifiers'" [moreLabel]="labelMoreOtherIdentifiers" [moreLabelSingular]="labelMoreOtherIdentifier" + [ariaLabelActivitySection]="ariaLabelIdentifiers" [hoverEffect]="externalIdentifiersHover" [standaloneMode]="standaloneMode" [activitySection]="'other-identifiers'"