Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Improve video manage and admin config form a11y

Chocobozzz28a0c774f1cb
diff --git a/client/src/app/+admin/config/pages/admin-config-advanced.component.html b/client/src/app/+admin/config/pages/admin-config-advanced.component.html
index d26e371fec..f9c3b2917e 100644
--- a/client/src/app/+admin/config/pages/admin-config-advanced.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-advanced.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="Advanced configuration" (save)="save()" [form]="form" [formErrors]="formErrors"></my-admin-save-bar>
-<form [formGroup]="form">
+<form [formGroup]="form" id="admin-config-form">
<div class="pt-two-cols">
diff --git a/client/src/app/+admin/config/pages/admin-config-customization.component.html b/client/src/app/+admin/config/pages/admin-config-customization.component.html
index 9bd5adeed8..a27f09a6b1 100644
--- a/client/src/app/+admin/config/pages/admin-config-customization.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-customization.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="Platform customization" (save)="save()" [form]="form" [formErrors]="formErrors"></my-admin-save-bar>
-<form [formGroup]="form">
+<form [formGroup]="form" id="admin-config-form">
<div class="pt-two-cols">
<div class="title-col">
<h2 i18n>APPEARANCE</h2>
diff --git a/client/src/app/+admin/config/pages/admin-config-general.component.html b/client/src/app/+admin/config/pages/admin-config-general.component.html
index 0ce83a89df..f64d5bba06 100644
--- a/client/src/app/+admin/config/pages/admin-config-general.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-general.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="General configuration" (save)="save()" [form]="form" [formErrors]="formErrors"></my-admin-save-bar>
-<form [formGroup]="form">
+<form [formGroup]="form" id="admin-config-form">
<div class="pt-two-cols">
<div class="title-col">
<h2 i18n>BEHAVIOR</h2>
diff --git a/client/src/app/+admin/config/pages/admin-config-homepage.component.html b/client/src/app/+admin/config/pages/admin-config-homepage.component.html
index 8a5b81f3ff..ec5b8a0c0d 100644
--- a/client/src/app/+admin/config/pages/admin-config-homepage.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-homepage.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="Edit your homepage" (save)="save()" [form]="form" [formErrors]="formErrors"></my-admin-save-bar>
-<form class="homepage pt-two-cols" [formGroup]="form">
+<form class="homepage pt-two-cols" [formGroup]="form" id="admin-config-form">
<div class="title-col">
<h2 i18n>HOMEPAGE</h2>
</div>
diff --git a/client/src/app/+admin/config/pages/admin-config-information.component.html b/client/src/app/+admin/config/pages/admin-config-information.component.html
index 0c285f0e39..8428111e89 100644
--- a/client/src/app/+admin/config/pages/admin-config-information.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-information.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="Platform information" (save)="save()" [form]="form" [formErrors]="formErrors"></my-admin-save-bar>
-<form [formGroup]="form">
+<form [formGroup]="form" id="admin-config-form">
<div class="pt-two-cols mt-4">
<div class="title-col">
diff --git a/client/src/app/+admin/config/pages/admin-config-live.component.html b/client/src/app/+admin/config/pages/admin-config-live.component.html
index 96b85d3eb5..d469dde863 100644
--- a/client/src/app/+admin/config/pages/admin-config-live.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-live.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="Live configuration" (save)="save()" [form]="form" [formErrors]="formErrors" [inconsistentOptions]="checkTranscodingConsistentOptions()"></my-admin-save-bar>
-<form [formGroup]="form">
+<form [formGroup]="form" id="admin-config-form">
<div class="pt-two-cols">
<div class="title-col">
diff --git a/client/src/app/+admin/config/pages/admin-config-logo.component.html b/client/src/app/+admin/config/pages/admin-config-logo.component.html
index fabe01d30d..da932a4d41 100644
--- a/client/src/app/+admin/config/pages/admin-config-logo.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-logo.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="Upload logos" (save)="save()" [form]="form" [formErrors]="formErrors"></my-admin-save-bar>
-<form [formGroup]="form">
+<form [formGroup]="form" id="admin-config-form">
<div class="pt-two-cols mt-4">
<div class="title-col">
<h2 i18n>LOGO</h2>
diff --git a/client/src/app/+admin/config/pages/admin-config-vod.component.html b/client/src/app/+admin/config/pages/admin-config-vod.component.html
index fe05587345..e100233f5f 100644
--- a/client/src/app/+admin/config/pages/admin-config-vod.component.html
+++ b/client/src/app/+admin/config/pages/admin-config-vod.component.html
@@ -1,6 +1,6 @@
<my-admin-save-bar i18n-title title="VOD configuration" (save)="save()" [form]="form" [formErrors]="formErrors" [inconsistentOptions]="checkTranscodingConsistentOptions()"></my-admin-save-bar>
-<form [formGroup]="form">
+<form [formGroup]="form" id="admin-config-form">
<div class="pt-two-cols">
<div class="title-col">
diff --git a/client/src/app/+admin/config/shared/admin-save-bar.component.html b/client/src/app/+admin/config/shared/admin-save-bar.component.html
index cdee01b1a3..207b72b3c8 100644
--- a/client/src/app/+admin/config/shared/admin-save-bar.component.html
+++ b/client/src/app/+admin/config/shared/admin-save-bar.component.html
@@ -5,7 +5,7 @@
<div class="buttons">
<my-button theme="secondary" class="pre-config" (click)="openConfigWizard()" i18n>Open config wizard</my-button>
- <my-button theme="primary" class="save-button" icon="circle-tick" [disabled]="!canUpdate()" (click)="onSave($event)" i18n>Save</my-button>
+ <my-button form="admin-config-form" theme="primary" class="save-button" icon="circle-tick" [disabled]="!canUpdate()" (click)="onSave($event)" i18n>Save</my-button>
</div>
</div>
diff --git a/client/src/app/+videos-publish-manage/shared-manage/captions/video-captions.component.html b/client/src/app/+videos-publish-manage/shared-manage/captions/video-captions.component.html
index 2b481c07f6..702f122c32 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/captions/video-captions.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/captions/video-captions.component.html
@@ -7,7 +7,7 @@
@if (isLive()) {
<my-alert type="primary" i18n>Captions are not available on a live.</my-alert>
} @else {
- <div class="captions">
+ <form class="captions" id="video-manage-form">
<my-alert type="primary" *ngIf="displayTranscriptionInfo && isTranscriptionEnabled() && !hasCaptions()" i18n>
Subtitles will be automatically generated from your video.
</my-alert>
@@ -69,7 +69,7 @@
</button>
</div>
- </div>
+ </form>
}
<my-video-caption-add-modal
diff --git a/client/src/app/+videos-publish-manage/shared-manage/chapters/video-chapters.component.html b/client/src/app/+videos-publish-manage/shared-manage/chapters/video-chapters.component.html
index 6c619c7980..f73932d8b5 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/chapters/video-chapters.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/chapters/video-chapters.component.html
@@ -7,7 +7,7 @@
@if (isLive()) {
<my-alert type="primary" i18n>Chapters are not available on a live.</my-alert>
} @else {
- <div [formGroup]="form">
+ <form [formGroup]="form" id="video-manage-form">
<div class="row mb-5">
<div class="chapters col-md-12 col-xl-6" formArrayName="chapters">
<my-alert type="primary" i18n>
@@ -58,5 +58,5 @@
<my-embed *ngIf="videoEdit.isPublishedVOD()" class="col-md-12 col-xl-6" [video]="videoEdit.getVideoAttributes()" [version]="getEmbedVersion()"></my-embed>
</div>
- </div>
+ </form>
}
diff --git a/client/src/app/+videos-publish-manage/shared-manage/customization/video-customization.component.html b/client/src/app/+videos-publish-manage/shared-manage/customization/video-customization.component.html
index 9024b71b82..b571ab0402 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/customization/video-customization.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/customization/video-customization.component.html
@@ -4,7 +4,7 @@
<ng-container i18n>Customization</ng-container>
</h2>
-<div [formGroup]="form">
+<div [formGroup]="form" id="video-manage-form">
<div class="form-columns">
<div>
<div *ngIf="videoEdit.getVideoSource()" class="form-group">
diff --git a/client/src/app/+videos-publish-manage/shared-manage/live-settings/video-live-settings.component.html b/client/src/app/+videos-publish-manage/shared-manage/live-settings/video-live-settings.component.html
index 14411606bf..02652624c7 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/live-settings/video-live-settings.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/live-settings/video-live-settings.component.html
@@ -9,7 +9,7 @@
} @else if (hasEnded()) {
<my-alert type="primary" i18n>Your live has ended.</my-alert>
} @else {
- <div [formGroup]="form">
+ <form [formGroup]="form" id="video-manage-form">
<my-alert class="d-block mb-4" type="primary">
@if (isStreaming()) {
<ng-container i18n>Live configuration is unavailable because you are streaming in this live.</ng-container>
@@ -138,5 +138,5 @@
</div>
</div>
</div>
- </div>
+ </form>
}
diff --git a/client/src/app/+videos-publish-manage/shared-manage/main-info/video-main-info.component.html b/client/src/app/+videos-publish-manage/shared-manage/main-info/video-main-info.component.html
index 917c5d7b28..45c5a0f6a4 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/main-info/video-main-info.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/main-info/video-main-info.component.html
@@ -4,7 +4,7 @@
<ng-container i18n>Main information</ng-container>
</h2>
-<div [formGroup]="form">
+<form [formGroup]="form" id="video-manage-form">
<ng-template #pluginSettingTemplate let-pluginSetting>
<div [hidden]="isPluginFieldHidden(pluginSetting)">
diff --git a/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.html b/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.html
index 7281571b3b..feeb352e70 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.html
@@ -4,7 +4,7 @@
<ng-container i18n>Moderation</ng-container>
</h2>
-<div [formGroup]="form">
+<form [formGroup]="form" id="video-manage-form">
<div class="form-columns">
<div>
@@ -54,4 +54,4 @@
</my-peertube-checkbox>
</div>
</div>
-</div>
+</form>
diff --git a/client/src/app/+videos-publish-manage/shared-manage/replace-file/video-replace-file.component.html b/client/src/app/+videos-publish-manage/shared-manage/replace-file/video-replace-file.component.html
index c7ba2f165b..6592ad37a8 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/replace-file/video-replace-file.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/replace-file/video-replace-file.component.html
@@ -7,7 +7,7 @@
@if (getUnavailability()) {
<my-alert type="primary" i18n>{{ getUnavailability() }}</my-alert>
} @else {
- <div class="root" myDragDrop (fileDropped)="onFileDropped($event)">
+ <form class="root" myDragDrop (fileDropped)="onFileDropped($event)" id="video-manage-form">
<div *ngIf="videoEdit.getVideoSource()" class="current-filename">
<div class="fs-7" i18n>Current uploaded file:</div>
@@ -30,5 +30,5 @@
</my-reactive-file>
</div>
</div>
- </div>
+ </form>
}
diff --git a/client/src/app/+videos-publish-manage/shared-manage/studio/video-studio.component.html b/client/src/app/+videos-publish-manage/shared-manage/studio/video-studio.component.html
index ba55d4d1c2..b2e565b394 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/studio/video-studio.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/studio/video-studio.component.html
@@ -8,7 +8,7 @@
<my-alert type="primary">{{ getUnavailability() }}</my-alert>
} @else {
<div class="grid-container">
- <form [formGroup]="form">
+ <form [formGroup]="form" id="video-manage-form">
<div class="section cut" formGroupName="cut">
<h3 class="section-label" i18n>CUT VIDEO</h3>
diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html
index 59688afb82..3601755d26 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html
+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html
@@ -20,6 +20,7 @@
theme="primary" class="save-button"
icon="circle-tick"
[disabled]="!canUpdate() || !hasPendingChanges()" (click)="onWantToUpdate()"
+ form="video-manage-form"
>
@if (hasStudioTasks()) {
<ng-container i18n>Save and run studio tasks</ng-container>
diff --git a/client/src/app/shared/shared-main/buttons/button.component.html b/client/src/app/shared/shared-main/buttons/button.component.html
index 2c2a8594d8..43f011daa4 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.html
+++ b/client/src/app/shared/shared-main/buttons/button.component.html
@@ -15,7 +15,7 @@
<ng-container *ngTemplateOutlet="content"></ng-container>
</a>
} @else {
- <button type="button" class="action-button ellipsis" [ngClass]="classes" [disabled]="disabled()" [ngbTooltip]="tooltip()" [attr.title]="title()">
+ <button type="button" class="action-button ellipsis" [ngClass]="classes" [disabled]="disabled()" [ngbTooltip]="tooltip()" [attr.title]="title()" [attr.form]="form()">
<ng-container *ngTemplateOutlet="content"></ng-container>
</button>
}
diff --git a/client/src/app/shared/shared-main/buttons/button.component.ts b/client/src/app/shared/shared-main/buttons/button.component.ts
index 73bd766ebe..ac99eeb520 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.ts
+++ b/client/src/app/shared/shared-main/buttons/button.component.ts
@@ -66,6 +66,7 @@ export class ButtonComponent implements OnChanges, AfterViewInit {
readonly rounded = input(false, { transform: booleanAttribute })
readonly small = input(false, { transform: booleanAttribute })
readonly show = input(false, { transform: booleanAttribute })
+ readonly form = input<string>()
readonly labelContent = viewChild<ElementRef>('labelContent')