diff --git a/src/app/authorize/components/form-authorize/form-authorize.component.html b/src/app/authorize/components/form-authorize/form-authorize.component.html index b8c28ca1e9..2d7ee5a8c9 100644 --- a/src/app/authorize/components/form-authorize/form-authorize.component.html +++ b/src/app/authorize/components/form-authorize/form-authorize.component.html @@ -251,6 +251,37 @@

>
{{ getDescription(scope) }}
+
+

+ + If authorized, this organization will have access to your + ORCID record, as outlined above and described in further + detail in + ORCID’s privacy policy. +

+

+ + You can manage access permissions for this and other Trusted + Organizations in your + + account settings. +

+
diff --git a/src/app/authorize/components/form-authorize/form-authorize.component.scss b/src/app/authorize/components/form-authorize/form-authorize.component.scss index 21d48cb495..32201580be 100644 --- a/src/app/authorize/components/form-authorize/form-authorize.component.scss +++ b/src/app/authorize/components/form-authorize/form-authorize.component.scss @@ -131,3 +131,12 @@ mat-card-content.authorize-content { justify-content: center; } } + +.disclaimer-box { + margin: 24px 0px; + display: flex; + flex-direction: column; + :first-child { + margin-bottom: 12px; + } +} \ No newline at end of file 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 63940936dd..b67adae0b2 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 @@ -8,7 +8,7 @@ class="orc-font-body-large" [ngClass]="{ 'sr-only': - !loadingUserRecord && isPublicRecord ? !newRecordHeaderTogglz : true + !loadingUserRecord && isPublicRecord ? false : true }" i18n="@@shared.personalInformation" > @@ -18,15 +18,13 @@ i18n="@@record.noPersonalInformation" *ngIf=" !loadingUserRecord && isPublicRecord - ? newRecordHeaderTogglz - ? !displaySideBar - : false + ? !displaySideBar : false " > No personal information available

- + -
-
-
- You are previewing a public version of this record -
-
- You are previewing the public version of your record -
- orcid logo - {{ effectiveRecord }} - Edit this record -
-
- - -
- - @@ -151,134 +137,12 @@

mobile: !platform.columns12 }" > -
-
-
-
- Published Name -
-

{{ creditName }}

-
-
-
- Name -
-

- {{ givenNames + ' ' + familyName }} -

-
-
-
-
-
- Name -
-
- - {{ givenNames + ' ' }} - - {{ familyName }} -
-
-
-
-
-
-
-
- Also known as -
-

- {{ otherNames }} -

- -
-
- - {{ otherNames.content }} - -
- - -
-
-
-
-
- -
-
-
-
-
-
- @@ -288,10 +152,7 @@

[attr.aria-label]="regionBiography" *ngIf="userRecord?.biography?.biography" > -
+

Biography

diff --git a/src/app/record/components/top-bar/top-bar.component.ts b/src/app/record/components/top-bar/top-bar.component.ts index f93578aa03..086a16055c 100644 --- a/src/app/record/components/top-bar/top-bar.component.ts +++ b/src/app/record/components/top-bar/top-bar.component.ts @@ -47,7 +47,6 @@ export class TopBarComponent implements OnInit, OnDestroy { checkEmailValidated: boolean inDelegationMode: boolean @Input() loadingUserRecord = true - @Input() newRecordHeaderTogglz: boolean regionNames = $localize`:@@topBar.names:Names` regionBiography = $localize`:@@topBar.biography:Biography` diff --git a/src/app/record/pages/my-orcid/my-orcid.component.html b/src/app/record/pages/my-orcid/my-orcid.component.html index 0103e376e3..f4860a7079 100644 --- a/src/app/record/pages/my-orcid/my-orcid.component.html +++ b/src/app/record/pages/my-orcid/my-orcid.component.html @@ -2,10 +2,9 @@
@@ -54,14 +50,9 @@ [isPublicRecord]="publicOrcid" class="row" [loadingUserRecord]="loadingUserRecord" - [newRecordHeaderTogglz]="newRecordHeaderTogglz" >

- -
- error - No public information available. - -
-
- - - Record last modified - - {{ userRecord?.lastModifiedTime | date : 'medium' : 'UTC' }} - UTC - -
-
+