mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Merge branch 'w2p-110615_minor-accessibibity-fixes_contribute-7.6' into w2p-110615_minor-accessibility-fixes_contribute-8_x
# 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
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
<ng-container *ngIf="relationTypes.length > 1">
|
||||
<ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs">
|
||||
<li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" rel="presentation">
|
||||
<a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
|
||||
<ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs" role="tablist">
|
||||
<li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" role="presentation">
|
||||
<a ngbNavLink role="tab">
|
||||
{{'item.page.relationships.' + relationType.label | translate}}
|
||||
</a>
|
||||
<ng-template ngbNavContent>
|
||||
<div class="mt-4">
|
||||
<ds-related-entities-search [item]="item"
|
||||
|
@@ -15,8 +15,7 @@
|
||||
[attr.aria-expanded]="isActive"
|
||||
[attr.aria-controls]="expandableNavbarSectionId(section.id)"
|
||||
class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
|
||||
[class.disabled]="section.model?.disabled"
|
||||
id="browseDropdown">
|
||||
[class.disabled]="section.model?.disabled">
|
||||
<span class="flex-fill">
|
||||
<ng-container
|
||||
*ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
|
||||
|
@@ -3,6 +3,7 @@
|
||||
<div class="col-12">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
|
||||
[attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
|
||||
[placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
|
||||
<div class="input-group-append" id="button-addon4">
|
||||
<button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
|
||||
|
Reference in New Issue
Block a user