Skip to content

Commit 75e6b25

Browse files
cryptalithcryptalith
authored
Merge pull request #2703 from ORCID/lmendoza/PD-3860
PD-3860, PD-3859
2 parents 01db862 + a594505 commit 75e6b25

File tree

7 files changed

+79
-179
lines changed

7 files changed

+79
-179
lines changed

‎projects/orcid-ui-docs/src/app/pages/record-header-page.component.html‎

Lines changed: 24 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@
1212

1313
<mat-form-field appearance="outline">
1414
<mat-label>Subtitle</mat-label>
15-
<input
16-
matInput
17-
[(ngModel)]="config.subtitle"
18-
[disabled]="!config.showSubtitle"
19-
/>
15+
<input matInput [(ngModel)]="config.subtitle" />
2016
</mat-form-field>
2117

2218
<mat-form-field appearance="outline">
2319
<mat-label>Caption</mat-label>
2420
<input matInput [(ngModel)]="config.caption" />
2521
</mat-form-field>
2622

23+
<mat-form-field appearance="outline">
24+
<mat-label>Issue title (optional)</mat-label>
25+
<input matInput [(ngModel)]="config.issueTitle" />
26+
</mat-form-field>
27+
2728
<mat-form-field appearance="outline">
2829
<mat-label>Primary ID Text</mat-label>
2930
<input matInput [(ngModel)]="config.primaryIdText" />
@@ -34,10 +35,6 @@
3435
<input matInput [(ngModel)]="config.secondaryIdText" />
3536
</mat-form-field>
3637

37-
<mat-checkbox [(ngModel)]="config.showSubtitle">
38-
Show Subtitle
39-
</mat-checkbox>
40-
4138
<mat-checkbox [(ngModel)]="config.showEditButton">
4239
Show Edit Button
4340
</mat-checkbox>
@@ -50,10 +47,6 @@
5047
Expanded (initial state)
5148
</mat-checkbox>
5249

53-
<mat-checkbox [(ngModel)]="config.showIssue">
54-
Show Issue Banner
55-
</mat-checkbox>
56-
5750
<mat-form-field appearance="outline">
5851
<mat-label>Region Names</mat-label>
5952
<input matInput [(ngModel)]="config.regionNames" />
@@ -81,8 +74,7 @@ <h5>Loading</h5>
8174
[compactMode]="false"
8275
[isDesktop]="true"
8376
[title]="config.title"
84-
[showIssue]="config.showIssue"
85-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
77+
[subtitle]="config.subtitle"
8678
[caption]="config.caption"
8779
[primaryIdText]="config.primaryIdText"
8880
[secondaryIdText]="config.secondaryIdText"
@@ -91,6 +83,7 @@ <h5>Loading</h5>
9183
(expandedChange)="config.expanded = $event"
9284
[regionNames]="config.regionNames"
9385
[regionOrcidId]="config.regionOrcidId"
86+
[issueTitle]="config.issueTitle"
9487
[mainActionName]="mainActionName"
9588
(mainActionClicked)="onMainActionClick()"
9689
>
@@ -134,8 +127,7 @@ <h5>Loaded</h5>
134127
[compactMode]="false"
135128
[isDesktop]="true"
136129
[title]="config.title"
137-
[showIssue]="config.showIssue"
138-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
130+
[subtitle]="config.subtitle"
139131
[caption]="config.caption"
140132
[primaryIdText]="config.primaryIdText"
141133
[secondaryIdText]="config.secondaryIdText"
@@ -144,6 +136,7 @@ <h5>Loaded</h5>
144136
(expandedChange)="config.expanded = $event"
145137
[regionNames]="config.regionNames"
146138
[regionOrcidId]="config.regionOrcidId"
139+
[issueTitle]="config.issueTitle"
147140
[mainActionName]="mainActionName"
148141
(mainActionClicked)="onMainActionClick()"
149142
>
@@ -193,8 +186,7 @@ <h5>Loading</h5>
193186
[compactMode]="true"
194187
[isDesktop]="true"
195188
[title]="config.title"
196-
[showIssue]="config.showIssue"
197-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
189+
[subtitle]="config.subtitle"
198190
[caption]="config.caption"
199191
[primaryIdText]="config.primaryIdText"
200192
[secondaryIdText]="config.secondaryIdText"
@@ -203,6 +195,7 @@ <h5>Loading</h5>
203195
(expandedChange)="config.expanded = $event"
204196
[regionNames]="config.regionNames"
205197
[regionOrcidId]="config.regionOrcidId"
198+
[issueTitle]="config.issueTitle"
206199
>
207200
<img
208201
header-banner-logo
@@ -255,8 +248,7 @@ <h5>Loaded</h5>
255248
[compactMode]="true"
256249
[isDesktop]="true"
257250
[title]="config.title"
258-
[showIssue]="config.showIssue"
259-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
251+
[subtitle]="config.subtitle"
260252
[caption]="config.caption"
261253
[primaryIdText]="config.primaryIdText"
262254
[secondaryIdText]="config.secondaryIdText"
@@ -265,6 +257,7 @@ <h5>Loaded</h5>
265257
(expandedChange)="config.expanded = $event"
266258
[regionNames]="config.regionNames"
267259
[regionOrcidId]="config.regionOrcidId"
260+
[issueTitle]="config.issueTitle"
268261
>
269262
<img
270263
header-banner-logo
@@ -323,8 +316,7 @@ <h5>Loading</h5>
323316
[compactMode]="false"
324317
[isDesktop]="false"
325318
[title]="config.title"
326-
[showIssue]="config.showIssue"
327-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
319+
[subtitle]="config.subtitle"
328320
[caption]="config.caption"
329321
[primaryIdText]="config.primaryIdText"
330322
[secondaryIdText]="config.secondaryIdText"
@@ -333,6 +325,7 @@ <h5>Loading</h5>
333325
(expandedChange)="config.expanded = $event"
334326
[regionNames]="config.regionNames"
335327
[regionOrcidId]="config.regionOrcidId"
328+
[issueTitle]="config.issueTitle"
336329
[mainActionName]="mainActionName"
337330
(mainActionClicked)="onMainActionClick()"
338331
>
@@ -376,8 +369,7 @@ <h5>Loaded</h5>
376369
[compactMode]="false"
377370
[isDesktop]="false"
378371
[title]="config.title"
379-
[showIssue]="config.showIssue"
380-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
372+
[subtitle]="config.subtitle"
381373
[caption]="config.caption"
382374
[primaryIdText]="config.primaryIdText"
383375
[secondaryIdText]="config.secondaryIdText"
@@ -386,6 +378,7 @@ <h5>Loaded</h5>
386378
(expandedChange)="config.expanded = $event"
387379
[regionNames]="config.regionNames"
388380
[regionOrcidId]="config.regionOrcidId"
381+
[issueTitle]="config.issueTitle"
389382
[mainActionName]="mainActionName"
390383
(mainActionClicked)="onMainActionClick()"
391384
>
@@ -433,8 +426,7 @@ <h5>Loading</h5>
433426
[compactMode]="true"
434427
[isDesktop]="false"
435428
[title]="config.title"
436-
[showIssue]="config.showIssue"
437-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
429+
[subtitle]="config.subtitle"
438430
[caption]="config.caption"
439431
[primaryIdText]="config.primaryIdText"
440432
[secondaryIdText]="config.secondaryIdText"
@@ -443,6 +435,7 @@ <h5>Loading</h5>
443435
(expandedChange)="config.expanded = $event"
444436
[regionNames]="config.regionNames"
445437
[regionOrcidId]="config.regionOrcidId"
438+
[issueTitle]="config.issueTitle"
446439
>
447440
<img
448441
header-banner-logo
@@ -496,8 +489,7 @@ <h5>Loaded</h5>
496489
[compactMode]="true"
497490
[isDesktop]="false"
498491
[title]="config.title"
499-
[showIssue]="config.showIssue"
500-
[subtitle]="config.showSubtitle ? config.subtitle : ''"
492+
[subtitle]="config.subtitle"
501493
[caption]="config.caption"
502494
[primaryIdText]="config.primaryIdText"
503495
[secondaryIdText]="config.secondaryIdText"
@@ -506,6 +498,7 @@ <h5>Loaded</h5>
506498
(expandedChange)="config.expanded = $event"
507499
[regionNames]="config.regionNames"
508500
[regionOrcidId]="config.regionOrcidId"
501+
[issueTitle]="config.issueTitle"
509502
>
510503
<img
511504
header-banner-logo
@@ -553,134 +546,6 @@ <h5>Loaded</h5>
553546
</div>
554547
</div>
555548

556-
<div class="example-group">
557-
<h4>Issue banner</h4>
558-
<div class="example-stack">
559-
<div class="example-item">
560-
<h5>Desktop View - Normal Mode (no names)</h5>
561-
<div class="example-container desktop">
562-
<orcid-header-banner
563-
class="orcid-theme"
564-
[loading]="false"
565-
[compactMode]="false"
566-
[isDesktop]="true"
567-
[title]="''"
568-
[showIssue]="true"
569-
[subtitle]="''"
570-
[primaryIdText]="config.primaryIdText"
571-
[secondaryIdText]="config.secondaryIdText"
572-
[expanded]="config.expanded"
573-
[canToggleExpanded]="config.canToggleExpanded"
574-
(expandedChange)="config.expanded = $event"
575-
[regionNames]="config.regionNames"
576-
[regionOrcidId]="config.regionOrcidId"
577-
[issueTitle]="config.issueBannerText"
578-
>
579-
<img
580-
header-banner-logo
581-
class="orcid-logo"
582-
src="https://qa.orcid.org/assets/vectors/orcid.logo.icon.svg"
583-
alt="ORCID logo"
584-
/>
585-
</orcid-header-banner>
586-
</div>
587-
</div>
588-
<div class="example-item">
589-
<h5>Desktop View - Compact Mode (no names)</h5>
590-
<div class="example-container desktop">
591-
<orcid-header-banner
592-
class="orcid-theme"
593-
[loading]="false"
594-
[compactMode]="true"
595-
[isDesktop]="true"
596-
[title]="''"
597-
[showIssue]="true"
598-
[subtitle]="''"
599-
[primaryIdText]="config.primaryIdText"
600-
[secondaryIdText]="config.secondaryIdText"
601-
[expanded]="config.expanded"
602-
[canToggleExpanded]="config.canToggleExpanded"
603-
(expandedChange)="config.expanded = $event"
604-
[regionNames]="config.regionNames"
605-
[regionOrcidId]="config.regionOrcidId"
606-
[issueTitle]="config.issueBannerText"
607-
>
608-
<img
609-
header-banner-logo
610-
class="orcid-logo"
611-
src="https://qa.orcid.org/assets/vectors/orcid.logo.icon.svg"
612-
alt="ORCID logo"
613-
/>
614-
</orcid-header-banner>
615-
</div>
616-
</div>
617-
</div>
618-
</div>
619-
620-
<div class="example-group">
621-
<h4>Mobile banners (no names)</h4>
622-
<div class="example-grid">
623-
<div class="example-item">
624-
<h5>Mobile issue banner - Normal Mode</h5>
625-
<div class="example-container mobile">
626-
<orcid-header-banner
627-
class="orcid-theme"
628-
[loading]="false"
629-
[compactMode]="false"
630-
[isDesktop]="false"
631-
[title]="''"
632-
[showIssue]="true"
633-
[subtitle]="''"
634-
[primaryIdText]="config.primaryIdText"
635-
[secondaryIdText]="config.secondaryIdText"
636-
[expanded]="config.expanded"
637-
[canToggleExpanded]="config.canToggleExpanded"
638-
(expandedChange)="config.expanded = $event"
639-
[regionNames]="config.regionNames"
640-
[regionOrcidId]="config.regionOrcidId"
641-
[issueTitle]="config.issueBannerText"
642-
>
643-
<img
644-
header-banner-logo
645-
class="orcid-logo"
646-
src="https://qa.orcid.org/assets/vectors/orcid.logo.icon.svg"
647-
alt="ORCID logo"
648-
/>
649-
</orcid-header-banner>
650-
</div>
651-
</div>
652-
653-
<div class="example-item">
654-
<h5>Mobile issue banner - Compact Mode</h5>
655-
<div class="example-container mobile">
656-
<orcid-header-banner
657-
class="orcid-theme"
658-
[loading]="false"
659-
[compactMode]="true"
660-
[isDesktop]="false"
661-
[title]="''"
662-
[showIssue]="true"
663-
[subtitle]="''"
664-
[primaryIdText]="config.primaryIdText"
665-
[secondaryIdText]="config.secondaryIdText"
666-
[expanded]="config.expanded"
667-
[canToggleExpanded]="config.canToggleExpanded"
668-
(expandedChange)="config.expanded = $event"
669-
[regionNames]="config.regionNames"
670-
[regionOrcidId]="config.regionOrcidId"
671-
[issueTitle]="config.issueBannerText"
672-
>
673-
<img
674-
header-banner-logo
675-
class="orcid-logo"
676-
src="https://qa.orcid.org/assets/vectors/orcid.logo.icon.svg"
677-
alt="ORCID logo"
678-
/>
679-
</orcid-header-banner>
680-
</div>
681-
</div>
682-
</div>
683-
</div>
684549
</div>
685550

686551
<div inputs>
@@ -695,10 +560,8 @@ <h5>Mobile issue banner - Compact Mode</h5>
695560
<code>loading</code>: shows a progress bar and hides content while
696561
loading
697562
</li>
698-
<li>
699-
<code>regionNames</code>, <code>regionOrcidId</code>,
700-
<code>showIssue</code>
701-
</li>
563+
<li><code>regionNames</code>, <code>regionOrcidId</code></li>
564+
<li><code>issueTitle</code> (optional)</li>
702565
</ul>
703566

704567
<h3>Outputs</h3>

‎projects/orcid-ui-docs/src/app/pages/record-header-page.component.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ export class RecordHeaderPageComponent {
3838
caption: 'Senior Researcher, Example University',
3939
primaryIdText: '0000-0001-2345-6789',
4040
secondaryIdText: 'https://orcid.org/0000-0001-2345-6789',
41-
showSubtitle: true,
4241
showEditButton: true,
4342
canToggleExpanded: true,
4443
expanded: false,
4544
loading: false,
4645
regionNames: 'Names',
4746
regionOrcidId: 'Orcid iD',
48-
issueBannerText: 'This record has been deactivated',
49-
showIssue: false,
47+
issueTitle: '',
5048
}
5149

5250
get mainActionName(): string {

0 commit comments

Comments
 (0)