Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/9256-qa-other-identifiers-not-displayed-in-record-summary #2264

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
tabindex="0"
(click)="goToActivitySection(activitySection)"
(keydown)="goToActivitySection(activitySection, $event)"
[attr.aria-label]="ariaLabelMore"
[attr.aria-label]="ariaLabelActivitySection"
>+ {{ count - 3 }}
<ng-container *ngIf="count - 3 === 1">{{
moreLabelSingular
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {}

Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ <h1 class="orc-font-body-large">
[count]="trustedSummary.employmentAffiliationsCount"
[moreLabel]="labelMoreAffiliations"
[moreLabelSingular]="labelMoreAffiliation"
[ariaLabelActivitySection]="ariaLabelAffiliations"
[hoverEffect]="affiliationsHover"
[standaloneMode]="standaloneMode"
[activitySection]="'affiliations'"
Expand Down Expand Up @@ -305,6 +306,7 @@ <h3 class="orc-font-small-print" i18n="@@summary.keyDates">
[count]="trustedSummary.professionalActivitiesCount"
[moreLabel]="labelMoreProfessionalActivities"
[moreLabelSingular]="labelMoreProfessionalActivitie"
[ariaLabelActivitySection]="ariaLabelProfessionalActivities"
[standaloneMode]="standaloneMode"
[activitySection]="'professional-activities'"
></app-summary-panel>
Expand All @@ -331,11 +333,12 @@ <h3 class="orc-font-small-print" i18n="@@summary.keyDates">
[overflowUrl]="trustedSummary?.orcid + '#other-identifiers'"
[moreLabel]="labelMoreOtherIdentifiers"
[moreLabelSingular]="labelMoreOtherIdentifier"
[ariaLabelActivitySection]="ariaLabelIdentifiers"
[hoverEffect]="externalIdentifiersHover"
[standaloneMode]="standaloneMode"
[activitySection]="'other-identifiers'"
[trustedSummary]="trustedSummary"
*ngIf="!trustedSummary"
*ngIf="!loading"
></app-summary-simple-panel>
</ng-container>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy {
modifiedToday: boolean
creationDateWithOffset: any
lastUpdateDate: any
loading = false
loading = true

constructor(
private _trustedSummary: TrustedSummaryService,
Expand Down Expand Up @@ -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(
Expand Down
82 changes: 59 additions & 23 deletions src/app/layout/footer/footer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,52 +19,84 @@
>
<img src="./assets/vectors/orcid.logo.svg" alt="Orcid" />
</a>
<a href="https://www.linkedin.com/company/orcid">
<a
href="https://www.linkedin.com/company/orcid"
target="_blank"
rel="noopener noreferrer"
>
<img
src="./assets/vectors/social/Linkedin.svg"
class="social"
alt="{{linkedin}}"
/>
</a>
<a href="https://www.facebook.com/ORCID.org">
<a
href="https://www.facebook.com/ORCID.org"
target="_blank"
rel="noopener noreferrer"
>
<img
src="./assets/vectors/social/Facebook.svg"
class="social"
alt="{{facebook}}"
/>
</a>
<a href="https://scicomm.xyz/@ORCID_Org">
<a
href="https://scicomm.xyz/@ORCID_Org"
target="_blank"
rel="noopener noreferrer"
>
<img
src="./assets/vectors/social/Mastodon.svg"
class="social"
alt="{{mastodon}}"
/>
</a>
<a href="https://vimeo.com/orcidvideos">
<a
href="https://vimeo.com/orcidvideos"
target="_blank"
rel="noopener noreferrer"
>
<img
src="./assets/vectors/social/Vimeo.svg"
class="social"
alt="{{vimeo}}"
/>
</a>
<a href="https://www.youtube.com/@orcid_org">
<a
href="https://www.youtube.com/@orcid_org"
target="_blank"
rel="noopener noreferrer"
>
<img
src="./assets/vectors/social/Youtube.svg"
class="social"
alt="{{youtube}}"
/>
</a>
<a href="{{ infoSiteBaseUrl }}blog/feed" class="social">
<a
href="{{ infoSiteBaseUrl }}blog/feed"
target="_blank"
rel="noopener noreferrer"
>
<img src="./assets/vectors/social/RSS.svg" class="social" alt="Rss" />
</a>
<a href="https://github.com/ORCID" class="social">
<a
href="https://github.com/ORCID"
target="_blank"
rel="noopener noreferrer"
>
<img
src="./assets/vectors/social/Github.svg"
class="social"
alt="{{github}}"
/>
</a>
<a href="https://twitter.com/orcid_org">
<a
href="https://twitter.com/orcid_org"
target="_blank"
rel="noopener noreferrer"
>
<img
src="./assets/vectors/social/Twitter.svg"
class="social"
Expand All @@ -79,23 +111,27 @@
class="CC0 orc-font-body-small"
[ngClass]="{ 'col desktop': isDesktop }"
>
<div [ngClass]="{ 'row mobile': !isDesktop }">
<div class='row mobile' *ngIf="!isDesktop">
<img src="./assets/vectors/cc-zero.svg" alt="public domain" />
</div>
<ng-container i18n="@@footer.copyright_cc0_1"
>The text of this website is published under a</ng-container
>&nbsp;<a
i18n="@@ngOrcid.copyright"
href="http://creativecommons.org/publicdomain/zero/1.0/"
rel="license noreferrer"
target="footer.copyright_cc0"
class="mat-button-font underline"
[attr.aria-label]="'CC0' + license"
>CC0 license.</a
>&nbsp;<ng-container i18n="@@footer.copyright_cc0_3"
>Images and marks are subject to copyright and trademark
protection</ng-container
><ng-container i18n="@@common.period">.</ng-container>
<p>
<img src="./assets/vectors/cc-zero.svg" alt="public domain" *ngIf="isDesktop"/>

<ng-container i18n="@@footer.copyright_cc0_1"
>The text of this website is published under a</ng-container
>&nbsp;<a
i18n="@@ngOrcid.copyright"
href="http://creativecommons.org/publicdomain/zero/1.0/"
rel="license noreferrer"
target="footer.copyright_cc0"
class="mat-button-font underline"
[attr.aria-label]="'CC0' + license"
>CC0 license.</a
>&nbsp;<ng-container i18n="@@footer.copyright_cc0_3"
>Images and marks are subject to copyright and trademark
protection</ng-container
><ng-container i18n="@@common.period">.</ng-container>
</p>
</div>
</div>
<div
Expand Down
8 changes: 6 additions & 2 deletions src/app/layout/footer/footer.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,15 @@ footer.mobile {
}

.public-domain {
p {
margin: 0;
}

img {
object-fit: cover;
height: 32px;
margin-right: 8px;
vertical-align: middle;
}

.CC0 {
Expand All @@ -73,7 +78,6 @@ footer.mobile {
.desktop {
display: flex;
align-items: center;
height: 32px;
}

.mobile {
Expand All @@ -84,7 +88,7 @@ footer.mobile {

.links {
> .url-lists {
justify-content: space-around;
justify-content: center;

a {
.columns-4 :host &,
Expand Down
1 change: 1 addition & 0 deletions src/app/layout/footer/footer.component.scss-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading