Skip to content

Commit 5566c99

Browse files
Fixed accessibility issues about header ordering
1 parent 30fe424 commit 5566c99

58 files changed

Lines changed: 116 additions & 105 deletions

File tree

Some content is hidden

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

src/app/access-control/epeople-registry/epeople-registry.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="epeople-registry row">
33
<div class="col-12">
44
<div class="d-flex justify-content-between border-bottom mb-3">
5-
<h2 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h2>
5+
<h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
66

77
<div>
88
<button class="mr-auto btn btn-success addEPerson-button"
@@ -13,9 +13,9 @@ <h2 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h2>
1313
</div>
1414
</div>
1515

16-
<h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
17-
18-
</h3>
16+
<h2 id="search" class="border-bottom pb-2">
17+
{{labelPrefix + 'search.head' | translate}}
18+
</h2>
1919
<form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
2020
<div>
2121
<select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<div *ngIf="epersonService.getActiveEPerson() | async; then editHeader; else createHeader"></div>
66

77
<ng-template #createHeader>
8-
<h2 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h2>
8+
<h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
99
</ng-template>
1010

1111
<ng-template #editHeader>
12-
<h2 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h2>
12+
<h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
1313
</ng-template>
1414

1515
<ds-form [formId]="formId"
@@ -45,7 +45,7 @@ <h2 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h2>
4545
<ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
4646

4747
<div *ngIf="epersonService.getActiveEPerson() | async">
48-
<h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
48+
<h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
4949

5050
<ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
5151

src/app/access-control/group-registry/group-form/group-form.component.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<div *ngIf="groupDataService.getActiveGroup() | async; then editHeader; else createHeader"></div>
66

77
<ng-template #createHeader>
8-
<h2 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h2>
8+
<h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
99
</ng-template>
1010

1111
<ng-template #editHeader>
12-
<h2 class="border-bottom pb-2">
12+
<h1 class="border-bottom pb-2">
1313
<span
1414
*dsContextHelp="{
1515
content: 'admin.access-control.groups.form.tooltip.editGroupPage',
@@ -20,7 +20,7 @@ <h2 class="border-bottom pb-2">
2020
>
2121
{{messagePrefix + '.head.edit' | translate}}
2222
</span>
23-
</h2>
23+
</h1>
2424
</ng-template>
2525

2626
<ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
@@ -39,9 +39,8 @@ <h2 class="border-bottom pb-2">
3939
<button (click)="onCancel()" type="button"
4040
class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
4141
</div>
42-
<div after *ngIf="(canEdit$ | async) && !groupBeingEdited.permanent" class="btn-group">
43-
<button class="btn btn-danger delete-button" [disabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
44-
(click)="delete()" type="button">
42+
<div after *ngIf="(canEdit$ | async) && !groupBeingEdited?.permanent" class="btn-group">
43+
<button (click)="delete()" class="btn btn-danger delete-button" type="button">
4544
<i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
4645
</button>
4746
</div>

src/app/access-control/group-registry/group-form/members-list/members-list.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ng-container>
2-
<h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
2+
<h2 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h2>
33

4-
<h4>{{messagePrefix + '.headMembers' | translate}}</h4>
4+
<h3>{{messagePrefix + '.headMembers' | translate}}</h3>
55

66
<ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
77
[paginationOptions]="config"
@@ -55,7 +55,7 @@ <h4>{{messagePrefix + '.headMembers' | translate}}</h4>
5555
{{messagePrefix + '.no-members-yet' | translate}}
5656
</div>
5757

58-
<h4 id="search" class="border-bottom pb-2">
58+
<h3 id="search" class="border-bottom pb-2">
5959
<span
6060
*dsContextHelp="{
6161
content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
@@ -66,7 +66,7 @@ <h4 id="search" class="border-bottom pb-2">
6666
>
6767
{{messagePrefix + '.search.head' | translate}}
6868
</span>
69-
</h4>
69+
</h3>
7070

7171
<form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
7272
<div class="flex-grow-1 mr-3">

src/app/access-control/group-registry/groups-registry.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="groups-registry row">
33
<div class="col-12">
44
<div class="d-flex justify-content-between border-bottom mb-3">
5-
<h2 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h2>
5+
<h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
66
<div>
77
<button class="mr-auto btn btn-success"
88
[routerLink]="'create'">
@@ -12,7 +12,7 @@ <h2 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h2>
1212
</div>
1313
</div>
1414

15-
<h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h3>
15+
<h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h2>
1616
<form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
1717
<div class="flex-grow-1 mr-3">
1818
<div class="form-group input-group">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<div class="container">
2-
<h2>{{'admin.curation-tasks.header' |translate }}</h2>
2+
<h1>{{'admin.curation-tasks.header' |translate }}</h1>
33
<ds-curation-form></ds-curation-form>
44
</div>

src/app/admin/admin-import-metadata-page/metadata-import-page.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="container">
2-
<h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
2+
<h1 id="header">{{'admin.metadata-import.page.header' | translate}}</h1>
33
<p>{{'admin.metadata-import.page.help' | translate}}</p>
44
<div class="form-group">
55
<div class="form-check">

src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="container">
22
<div class="row">
33
<div class="col-12 mb-4">
4-
<h2 id="sub-header"
5-
class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
4+
<h1 id="sub-header"
5+
class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h1>
66

77
<ds-bitstream-format-form (updatedFormat)="createBitstreamFormat($event)"></ds-bitstream-format-form>
88

src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="bitstream-formats row">
33
<div class="col-12">
44

5-
<h2 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
5+
<h1 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h1>
66

77
<p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
88
<p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>

src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="container">
22
<div class="row">
33
<div class="col-12 mb-4">
4-
<h2 id="sub-header"
5-
class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
4+
<h1 id="sub-header"
5+
class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h1>
66

77
<ds-bitstream-format-form [bitstreamFormat]="(bitstreamFormatRD$ | async)?.payload" (updatedFormat)="updateFormat($event)"></ds-bitstream-format-form>
88

0 commit comments

Comments
 (0)