forked from 4Science/dspace-angular
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request DSpace#2683 from alexandrevryghem/fix-accessibilit…
…y-issues_contribute-main Fix accessibility issues
- Loading branch information
Showing
128 changed files
with
513 additions
and
343 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 52 additions & 50 deletions
102
src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,69 @@ | ||
| <ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'"> | ||
| <ngb-panel [id]="'browse'"> | ||
| <ng-template ngbPanelHeader> | ||
| <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')" | ||
| <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')" | ||
| data-test="browse"> | ||
| <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" | ||
| [attr.aria-expanded]="!acc.isExpanded('browse')" | ||
| aria-controls="collapsePanels"> | ||
| [attr.aria-expanded]="acc.isExpanded('browse')" | ||
| aria-controls="bulk-access-browse-panel-content"> | ||
| {{ 'admin.access-control.bulk-access-browse.header' | translate }} | ||
| </button> | ||
| <div class="text-right d-flex"> | ||
| <div class="ml-3 d-inline-block"> | ||
| <div class="text-right d-flex gap-2"> | ||
| <div class="d-flex my-auto"> | ||
| <span *ngIf="acc.isExpanded('browse')" class="fas fa-chevron-up fa-fw"></span> | ||
| <span *ngIf="!acc.isExpanded('browse')" class="fas fa-chevron-down fa-fw"></span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </ng-template> | ||
| <ng-template ngbPanelContent> | ||
| <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills"> | ||
| <li [ngbNavItem]="'search'"> | ||
| <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a> | ||
| <ng-template ngbNavContent> | ||
| <div class="mx-n3"> | ||
| <ds-themed-search [configuration]="'administrativeBulkAccess'" | ||
| [selectable]="true" | ||
| [selectionConfig]="{ repeatable: true, listId: listId }" | ||
| [showThumbnails]="false"></ds-themed-search> | ||
| </div> | ||
| </ng-template> | ||
| </li> | ||
| <li [ngbNavItem]="'selected'"> | ||
| <a ngbNavLink> | ||
| {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }} | ||
| </a> | ||
| <ng-template ngbNavContent> | ||
| <ds-pagination | ||
| [paginationOptions]="(paginationOptions$ | async)" | ||
| [pageInfoState]="(objectsSelected$|async)?.payload.pageInfo" | ||
| [collectionSize]="(objectsSelected$|async)?.payload?.totalElements" | ||
| [objects]="(objectsSelected$|async)" | ||
| [showPaginator]="false" | ||
| (prev)="pagePrev()" | ||
| (next)="pageNext()"> | ||
| <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4"> | ||
| <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize, | ||
| currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last ' | ||
| class="mt-4 mb-4 d-flex" | ||
| [attr.data-test]="'list-object' | dsBrowserOnly"> | ||
| <ds-selectable-list-item-control [index]="i" | ||
| [object]="object" | ||
| [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control> | ||
| <ds-listable-object-component-loader [listID]="listId" | ||
| [index]="i" | ||
| [object]="object" | ||
| [showThumbnails]="false" | ||
| [viewMode]="'list'"></ds-listable-object-component-loader> | ||
| </li> | ||
| </ul> | ||
| </ds-pagination> | ||
| </ng-template> | ||
| </li> | ||
| </ul> | ||
| <div [ngbNavOutlet]="nav" class="mt-5"></div> | ||
| <div id="bulk-access-browse-panel-content"> | ||
| <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills"> | ||
| <li [ngbNavItem]="'search'" role="presentation"> | ||
| <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a> | ||
| <ng-template ngbNavContent> | ||
| <div class="mx-n3"> | ||
| <ds-themed-search [configuration]="'administrativeBulkAccess'" | ||
| [selectable]="true" | ||
| [selectionConfig]="{ repeatable: true, listId: listId }" | ||
| [showThumbnails]="false"></ds-themed-search> | ||
| </div> | ||
| </ng-template> | ||
| </li> | ||
| <li [ngbNavItem]="'selected'" role="presentation"> | ||
| <a ngbNavLink> | ||
| {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }} | ||
| </a> | ||
| <ng-template ngbNavContent> | ||
| <ds-pagination | ||
| [paginationOptions]="(paginationOptions$ | async)" | ||
| [pageInfoState]="(objectsSelected$|async)?.payload.pageInfo" | ||
| [collectionSize]="(objectsSelected$|async)?.payload?.totalElements" | ||
| [objects]="(objectsSelected$|async)" | ||
| [showPaginator]="false" | ||
| (prev)="pagePrev()" | ||
| (next)="pageNext()"> | ||
| <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4"> | ||
| <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize, | ||
| currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last ' | ||
| class="mt-4 mb-4 d-flex" | ||
| [attr.data-test]="'list-object' | dsBrowserOnly"> | ||
| <ds-selectable-list-item-control [index]="i" | ||
| [object]="object" | ||
| [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control> | ||
| <ds-listable-object-component-loader [listID]="listId" | ||
| [index]="i" | ||
| [object]="object" | ||
| [showThumbnails]="false" | ||
| [viewMode]="'list'"></ds-listable-object-component-loader> | ||
| </li> | ||
| </ul> | ||
| </ds-pagination> | ||
| </ng-template> | ||
| </li> | ||
| </ul> | ||
| <div [ngbNavOutlet]="nav" class="mt-5"></div> | ||
| </div> | ||
| </ng-template> | ||
| </ngb-panel> | ||
| </ngb-accordion> |
12 changes: 6 additions & 6 deletions
12
src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| <ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'"> | ||
| <ngb-panel [id]="'settings'"> | ||
| <ng-template ngbPanelHeader> | ||
| <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings"> | ||
| <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded('browse')" | ||
| aria-controls="collapsePanels"> | ||
| <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings"> | ||
| <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded('settings')" | ||
| aria-controls="bulk-access-settings-panel-content"> | ||
| {{ 'admin.access-control.bulk-access-settings.header' | translate }} | ||
| </button> | ||
| <div class="text-right d-flex"> | ||
| <div class="ml-3 d-inline-block"> | ||
| <div class="text-right d-flex gap-2"> | ||
| <div class="d-flex my-auto"> | ||
| <span *ngIf="acc.isExpanded('settings')" class="fas fa-chevron-up fa-fw"></span> | ||
| <span *ngIf="!acc.isExpanded('settings')" class="fas fa-chevron-down fa-fw"></span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </ng-template> | ||
| <ng-template ngbPanelContent> | ||
| <ds-access-control-form-container #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container> | ||
| <ds-access-control-form-container id="bulk-access-settings-panel-content" #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container> | ||
| </ng-template> | ||
| </ngb-panel> | ||
| </ngb-accordion> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <div class="container"> | ||
| <h2>{{'admin.curation-tasks.header' |translate }}</h2> | ||
| <h1>{{'admin.curation-tasks.header' |translate }}</h1> | ||
| <ds-curation-form></ds-curation-form> | ||
| </div> |
2 changes: 1 addition & 1 deletion
2
src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...min-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-12 mb-4"> | ||
| <h2 id="sub-header" | ||
| class="border-bottom mb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2> | ||
| <h1 id="sub-header" | ||
| class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h1> | ||
|
|
||
| <ds-bitstream-format-form (updatedFormat)="createBitstreamFormat($event)"></ds-bitstream-format-form> | ||
|
|
||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...n-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-12 mb-4"> | ||
| <h2 id="sub-header" | ||
| class="border-bottom mb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2> | ||
| <h1 id="sub-header" | ||
| class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h1> | ||
|
|
||
| <ds-bitstream-format-form [bitstreamFormat]="(bitstreamFormatRD$ | async)?.payload" (updatedFormat)="updateFormat($event)"></ds-bitstream-format-form> | ||
|
|
||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
Oops, something went wrong.