Skip to content

Commit 5acb5e9

Browse files
authored
Merge pull request #2849 from Azure/shpaster/a11y
Accessibility Bug Fixes
2 parents a8e4a55 + e33d6d6 commit 5acb5e9

File tree

8 files changed

+31
-20
lines changed

8 files changed

+31
-20
lines changed

desktop/i18n/resources.resjson

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,8 @@
309309
"pool-details.deprecationWarning.imagePassedEndOfLife": "This pool's image is past its end-of-life date of {imageEndOfLifeDate}. Please recreate this pool using a different image afterwards.",
310310
"pool-details.estimatedCost": "Estimated cost of this pool at this current state",
311311
"pool-details.graphs": "Graphs",
312+
"pool-details.learnMore": "Learn more",
313+
"pool-details.learnMoreTitle": "Documentation on image end-of-life",
312314
"pool-details.openInNewWindow": "Open in a new window",
313315
"pool-graphs.application-insights": "Application Insights",
314316
"pool-graphs.available-nodes": "Available nodes",

desktop/src/@batch-flask/ui/duration-picker/duration-picker.html

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
</bl-select>
1717
</div>
1818
</div>
19-
<div class="error" *ngIf="invalidTimeNumber">
20-
Input should be a valid positive number
21-
</div>
22-
<div class="error" *ngIf="required && !this.time">
23-
Input is required
24-
</div>
25-
<div class="error" *ngIf="invalidCustomDuration">
26-
This is not a valid ISO 8601 duration <i>(e.g. PT1M, P1D)</i>
27-
</div>
28-
<div class="error" *ngIf="invalidDurationValue">
29-
Input must be less than 10675199 days
19+
<div class="error-container" role="alert">
20+
<div class="error" *ngIf="invalidTimeNumber">
21+
Input should be a valid positive number
22+
</div>
23+
<div class="error" *ngIf="required && !this.time">
24+
Input is required
25+
</div>
26+
<div class="error" *ngIf="invalidCustomDuration">
27+
This is not a valid ISO 8601 duration <i>(e.g. PT1M, P1D)</i>
28+
</div>
29+
<div class="error" *ngIf="invalidDurationValue">
30+
Input must be less than 10675199 days
31+
</div>
3032
</div>
31-

desktop/src/@batch-flask/ui/duration-picker/duration-picker.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bl-duration-picker {
1313
}
1414
}
1515

16-
> .error {
16+
> .error-container > .error {
1717
color: $danger-color;
1818
}
1919
}

desktop/src/app/components/job-schedule/action/add/job-schedule-job-specification.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ <h4>Job advanced settings</h4>
6868
</div>
6969
</div>
7070
<div class="form-element">
71-
<bl-select>
71+
<bl-form-field>
7272
<bl-select formControlName="onAllTasksComplete" color="primary" placeholder="When all tasks complete">
7373
<bl-option [value]="AllTasksCompleteAction.noaction" label="NoAction"></bl-option>
7474
<bl-option [value]="AllTasksCompleteAction.terminatejob" label="TerminateJob"></bl-option>
7575
</bl-select>
76-
</bl-select>
76+
</bl-form-field>
7777
</div>
7878
<div class="form-element">
7979
<bl-form-field>

desktop/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
(mouseup)="handleMiddleMouseUp($event, favorite)"
1111
(contextmenu)="onContextMenu(favorite)">
1212

13-
<bl-clickable class="dropdown-item favorite-item" (do)="gotoFavorite(favorite)">
14-
<span attr.aria-label="{{favorite.name || favorite.id}}">
13+
<bl-clickable class="dropdown-item favorite-item" (do)="gotoFavorite(favorite)"
14+
attr.aria-label="{{favorite.name || favorite.id}}">
15+
<div>
1516
<i class="entity-type fa" [ngClass]="entityIcon(favorite)"
1617
[title]="entityType(favorite)"></i>
1718
{{favorite.name || favorite.id}}
1819
<i *ngIf="favorite.url === currentUrl" class="extra fa fa-check"></i>
19-
</span>
20+
</div>
2021
</bl-clickable>
2122
<bl-clickable class="dropdown-item delete" (do)="removeFavorite(favorite)" title="Remove from favorites" name="remove">
2223
<i class="fa fa-times" aria-hidden="true"></i>

desktop/src/app/components/layout/pinned-entity-dropdown/pinned-dropdown.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ bl-pinned-dropdown {
3535
color: $primary-color-dark;
3636
}
3737

38-
> span {
38+
> div {
3939
flex: 1 1 auto;
4040
text-align: left;
4141
min-width: 20px;

desktop/src/app/components/pool/details/pool-details.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@
4141
<b *i18nParam="'imageEndOfLifeDate'">{{selectedImageEndOfLifeDate}}</b>
4242
</bl-i18n>
4343
</span>
44-
<a class="pool-details-summary-warning-alternative-link" *ngIf="hasDeprecationLink" (click)="openDeprecationLink()" href="javascript:void(0)">Learn more </a>
44+
<a class="pool-details-summary-warning-alternative-link"
45+
[title]="'pool-details.learnMoreTitle' | i18n"
46+
*ngIf="hasDeprecationLink" (click)="openDeprecationLink()"
47+
href="javascript:void(0)">
48+
{{ 'pool-details.learnMore' | i18n }}
49+
</a>
4550
</div>
4651
</bl-banner>
4752
</ng-container>

desktop/src/app/components/pool/details/pool-details.i18n.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ pool-details:
22
graphs: Graphs
33
openInNewWindow: Open in a new window
44
estimatedCost: Estimated cost of this pool at this current state
5+
learnMore: Learn more
6+
learnMoreTitle: Documentation on image end-of-life
57
deprecationWarning:
68
imageNearingEndOfLife: This pool's image is nearing its end-of-life date of {imageEndOfLifeDate}. After this date, it will not appear as an option when creating new pools. API calls to create or scale pools using the image may continue to function for up to 60 days afterwards.
79
imageFarAwayFromEndOfLife: This pool's image has an end-of-life date of {imageEndOfLifeDate}. After this date, it will not appear as an option when creating new pools. API calls to create or scale pools using the image may continue to function for up to 60 days afterwards.

0 commit comments

Comments
 (0)