Skip to content

Commit 9a24fb2

Browse files
tdonohuetdonohue
authored
Merge pull request #4244 from oscar-escire/Issue/4201
Keyboard 'tab' key navigation improved
2 parents df9c950 + 4e5b344 commit 9a24fb2

File tree

69 files changed

+149
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+149
-116
lines changed

‎src/app/breadcrumbs/breadcrumbs.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313

1414
<ng-template #breadcrumb let-text="text" let-url="url">
15-
<li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" >{{text | translate}}</a></div></li>
15+
<li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" role="link" tabindex="0">{{text | translate}}</a></div></li>
1616
</ng-template>
1717

1818
<ng-template #activeBreadcrumb let-text="text">

‎src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ <h1>
2020
<a class="btn btn-primary"
2121
[routerLink]="['/search']"
2222
[queryParams]="queryParams"
23-
[queryParamsHandling]="'merge'">
23+
[queryParamsHandling]="'merge'"
24+
role="link"
25+
tabindex="0">
2426
{{ 'browse.taxonomy.button' | translate }}</a>
2527
</section>

‎src/app/community-list-page/community-list/community-list.component.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="align-middle my-auto">
1313
@if ((dataSource.loading$ | async) !== true) {
1414
<button (click)="getNextPage(node)"
15-
class="btn btn-outline-primary btn-sm" role="button">
15+
class="btn btn-outline-primary btn-sm" role="button" tabindex="0">
1616
<i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
1717
</button>
1818
}
@@ -34,7 +34,11 @@
3434
<button type="button" class="btn btn-default btn-transparent" cdkTreeNodeToggle
3535
[attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
3636
(click)="toggleExpanded(node)"
37-
data-test="expand-button">
37+
(keyup.enter)="toggleExpanded(node)"
38+
(keyup.space)="toggleExpanded(node)"
39+
data-test="expand-button"
40+
role="button"
41+
tabindex="0">
3842
<span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
3943
aria-hidden="true"></span>
4044
<span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
@@ -48,7 +52,7 @@
4852
}
4953
<div class="d-flex flex-row">
5054
<span class="d-flex align-middle my-auto">
51-
<a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
55+
<a [routerLink]="node.route" class="lead" role="link" tabindex="0">{{ dsoNameService.getName(node.payload) }}</a>
5256
<span class="pe-2">&nbsp;</span>
5357
@if (node.payload.archivedItemsCount >= 0) {
5458
<span class="badge rounded-pill bg-secondary align-top archived-items-lead my-auto ps-2 pe-2">{{node.payload.archivedItemsCount}}</span>
@@ -88,7 +92,7 @@
8892
<span class="fa fa-chevron-right"></span>
8993
</span>
9094
<h6 class="align-middle my-auto">
91-
<a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
95+
<a [routerLink]="node.route" class="lead" role="link" tabindex="0">{{ dsoNameService.getName(node.payload) }}</a>
9296
</h6>
9397
</div>
9498
<ds-truncatable [id]="node.id">

‎src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<a
88
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
99
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
10-
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
10+
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
1111
<div>
1212
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
1313
</ds-thumbnail>
@@ -48,7 +48,7 @@ <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
4848
<div class="text-center">
4949
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
5050
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
51-
class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
51+
class="lead btn btn-primary viewButton" role="link" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
5252
</div>
5353
}
5454
</div>

‎src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<a
88
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
99
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
10-
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
10+
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
1111
<div>
1212
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
1313
</ds-thumbnail>
@@ -48,7 +48,7 @@ <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
4848
<div class="text-center">
4949
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
5050
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
51-
class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
51+
class="lead btn btn-primary viewButton" role="link" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
5252
</div>
5353
}
5454
</div>

‎src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<a
88
[target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
99
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
10-
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
10+
class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate" role="link" tabindex="0">
1111
<div>
1212
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
1313
</ds-thumbnail>
@@ -54,7 +54,7 @@ <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
5454
<div class="text-center">
5555
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
5656
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
57-
class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
57+
class="lead btn btn-primary viewButton" role="link" tabindex="0">{{ 'search.results.view-result' | translate}}</a>
5858
</div>
5959
}
6060
</div>

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@if (linkType !== linkTypes.None) {
55
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
66
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
7-
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
7+
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
88
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
99
</ds-thumbnail>
1010
</a>
@@ -26,7 +26,7 @@
2626
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
2727
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
2828
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
29-
[innerHTML]="dsoTitle"></a>
29+
[innerHTML]="dsoTitle" role="link" tabindex="0"></a>
3030
}
3131
@if (linkType === linkTypes.None) {
3232
<span

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@if (linkType !== linkTypes.None) {
55
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
66
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
7-
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
7+
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
88
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
99
</ds-thumbnail>
1010
</a>
@@ -26,7 +26,7 @@
2626
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
2727
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
2828
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
29-
[innerHTML]="dsoTitle"></a>
29+
[innerHTML]="dsoTitle" role="link" tabindex="0"></a>
3030
}
3131
@if (linkType === linkTypes.None) {
3232
<span

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="col-3 col-md-2">
44
@if (linkType !== linkTypes.None) {
55
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
6-
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
6+
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="0">
77
<ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
88
</ds-thumbnail>
99
</a>
@@ -24,7 +24,7 @@
2424
@if (linkType !== linkTypes.None) {
2525
<a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
2626
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
27-
[innerHTML]="dsoTitle"></a>
27+
[innerHTML]="dsoTitle" role="link" tabindex="0"></a>
2828
}
2929
@if (linkType === linkTypes.None) {
3030
<span

‎src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
[label]="'journalissue.page.keyword'">
5454
</ds-generic-item-page-field>
5555
<div>
56-
<a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
56+
<a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button" tabindex="0">
5757
{{"item.page.link.full" | translate}}
5858
</a>
5959
</div>

0 commit comments

Comments
 (0)