Skip to content

Commit 8e70a5b

Browse files
authored
Merge pull request #2805 from ORCID/aromanovv/COMMS-1502-add-label-to-global-search
PD-5329 add label to global search
2 parents 5f6ca51 + 8792f0e commit 8e70a5b

5 files changed

Lines changed: 19 additions & 11 deletions

File tree

src/app/cdk/my-orcid-alerts/my-orcid-alerts.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
<app-alert-message
33
[type]="invalidVerifyUrl ? 'warning' : 'success'"
44
role="alert"
5-
aria-labelledby="dialogTitle"
6-
aria-describedby="dialogDescription"
5+
aria-labelledby="almostDoneTitle"
6+
aria-describedby="almostDoneDescription"
77
>
8-
<h3 title id="dialogTitle" i18n="@@ngOrcid.signin.almostDone">
8+
<h3 title id="almostDoneTitle" i18n="@@ngOrcid.signin.almostDone">
99
Almost done!
1010
</h3>
1111
<div content i18n="@@ngOrcid.signin.signInToComplete" *ngIf="emailVerified">
1212
Sign in to complete your email verification
1313
</div>
1414
<div
1515
content
16+
id="almostDoneDescription"
1617
i18n="@@myOrcidAlerts.invalidVerifyUrl"
1718
*ngIf="invalidVerifyUrl"
1819
>

src/app/layout/search/search.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
class="row h-end search-box middle"
1212
(submit)="search(whereToSearchSelected, whatToSearch)"
1313
*ngIf="!hideForm"
14+
aria-describedby="cy-search"
1415
>
15-
<mat-label class="orc-ui-font-small-print text-right mr-4 w-30"
16-
>Search the ORCID registry</mat-label
16+
<label i18n class="orc-ui-font-small-print text-right mr-4 w-25"
17+
>Search the ORCID registry</label
1718
>
1819
<div id="ariaLabelWhere" hidden>Search on</div>
1920
<div class="input-box-new-info">
2021
<input
2122
autocomplete="off"
2223
name="whatToSearch"
2324
[(ngModel)]="whatToSearch"
24-
[placeholder]="searchPlaceHolder"
2525
type="text"
2626
[attr.aria-label]="labelSearchBy"
2727
id="cy-search"

src/app/layout/search/search.component.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,16 @@
9494
.columns-8,
9595
.columns-4 {
9696
:host {
97+
form {
98+
flex-wrap: wrap !important;
99+
}
100+
101+
mat-label {
102+
width: 100%;
103+
text-align: left;
104+
margin-bottom: 8px;
105+
}
106+
97107
.search-box {
98108
padding: 12px 0px;
99109
justify-content: center;

src/app/layout/search/search.component.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ export class SearchComponent implements OnInit {
3737
whereToSearchSelected = this.firstLetterUppercase(
3838
$localize`:@@layout.public-layout.registry:registry`
3939
)
40-
searchPlaceHolder = this.firstLetterUppercase(
41-
$localize`:@@layout.ariaLabelSearchRegistry:Search the ORCID registry...`
42-
)
4340
whatToSearch: string
4441
@Input() hideForm: boolean = false
4542
constructor(

src/app/password-recovery/pages/password-recovery/password-recovery.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
class="mb-6"
2323
>
2424
<div content class="content grid gap-2">
25-
<b i18n="@@recovery.lostAccessToYourEmailAddresses">
25+
<b id="dialogTitle" i18n="@@recovery.lostAccessToYourEmailAddresses">
2626
Lost access to your email addresses?
2727
</b>
28-
<div>
28+
<div id="dialogDescription">
2929
<span i18n="@@recovery.youCanAlwaysSignIn"
3030
>You can always sign in to ORCID with your</span
3131
>&nbsp;<b i18n="@@recovery.16DigitOrcidId">16-digit ORCID iD</b

0 commit comments

Comments
 (0)