Skip to content

Commit f61e865

Browse files
Merge branch 'w2p-110615_minor-accessibibity-fixes_contribute-7.6' into w2p-110615_minor-accessibibity-fixes_contribute-main
# Conflicts: # src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html # src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html # src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
2 parents ee7e835 + 54d99a8 commit f61e865

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<ng-container *ngIf="relationTypes.length > 1">
2-
<ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs">
3-
<li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" rel="presentation">
4-
<a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
2+
<ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs" role="tablist">
3+
<li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" role="presentation">
4+
<a ngbNavLink role="tab">
5+
{{'item.page.relationships.' + relationType.label | translate}}
6+
</a>
57
<ng-template ngbNavContent>
68
<div class="mt-4">
79
<ds-related-entities-search [item]="item"

src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
[attr.aria-expanded]="isActive"
1616
[attr.aria-controls]="expandableNavbarSectionId(section.id)"
1717
class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
18-
[class.disabled]="section.model?.disabled"
19-
id="browseDropdown">
18+
[class.disabled]="section.model?.disabled">
2019
<span class="flex-fill">
2120
<ng-container
2221
*ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<div class="col-12">
44
<div class="input-group">
55
<input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
6+
[attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
67
[placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
78
<div class="input-group-append" id="button-addon4">
89
<button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">

0 commit comments

Comments
 (0)