Improve frontend accessibility

In particular checkboxes, likes/dislikes, share button, video thumbnails
and help buttons

6 files changed, 34 insertions, 52 deletions

diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html
index 4675cb827..16dbf5cfc 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -110,31 +110,22 @@
           </div>
         </div>
 
-        <div class="form-group form-group-checkbox">
-          <input type="checkbox" id="nsfw" formControlName="nsfw" />
-          <label for="nsfw"></label>
-          <label i18n for="nsfw">This video contains mature or explicit content</label>
-          <my-help
-            tooltipPlacement="top" helpType="custom" i18n-customHtml
-            customHtml="Some instances do not list videos containing mature or explicit content by default."
-          ></my-help>
-        </div>
-
-        <div class="form-group form-group-checkbox">
-          <input type="checkbox" id="commentsEnabled" formControlName="commentsEnabled" />
-          <label for="commentsEnabled"></label>
-          <label i18n for="commentsEnabled">Enable video comments</label>
-        </div>
-
-        <div class="form-group form-group-checkbox">
-          <input type="checkbox" id="waitTranscoding" formControlName="waitTranscoding" />
-          <label for="waitTranscoding"></label>
-          <label i18n for="waitTranscoding">Wait transcoding before publishing the video</label>
-          <my-help
-            tooltipPlacement="top" helpType="custom" i18n-customHtml
-            customHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends."
-          ></my-help>
-        </div>
+        <my-peertube-checkbox
+          inputName="nsfw" formControlName="nsfw"
+          i18n-labelText labelText="This video contains mature or explicit content"
+          i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default."
+        ></my-peertube-checkbox>
+
+        <my-peertube-checkbox
+          inputName="commentsEnabled" formControlName="commentsEnabled"
+          i18n-labelText labelText="Enable video comments"
+        ></my-peertube-checkbox>
+
+        <my-peertube-checkbox
+          inputName="waitTranscoding" formControlName="waitTranscoding"
+          i18n-labelText labelText="Wait transcoding before publishing the video"
+          i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends."
+        ></my-peertube-checkbox>
 
       </div>
     </tab>
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index 03b8359de..058ccba36 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -16,31 +16,12 @@
   input {
     @include peertube-input-text(100%);
     display: block;
-
-    &[type=checkbox] {
-      @include peertube-checkbox(1px);
-    }
   }
 
   input, select {
     font-size: 15px
   }
 
-  .form-group-checkbox {
-    display: flex;
-    align-items: center;
-
-    label {
-      font-weight: $font-regular;
-      margin: 0;
-    }
-
-    input {
-      width: 10px;
-      margin-right: 10px;
-    }
-  }
-
   .label-tags + span {
     font-size: 15px;
   }
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index 743c015cb..00c7bc41d 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -49,6 +49,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
   calendarDateFormat: string
 
   private schedulerInterval
+  private firstPatchDone = false
 
   constructor (
     private formValidatorService: FormValidatorService,
@@ -167,6 +168,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
       .pipe(map(res => parseInt(res.toString(), 10)))
       .subscribe(
         newPrivacyId => {
+
           this.schedulePublicationEnabled = newPrivacyId === this.SPECIAL_SCHEDULED_PRIVACY
 
           // Value changed
@@ -182,11 +184,18 @@ export class VideoEditComponent implements OnInit, OnDestroy {
             scheduleControl.clearValidators()
 
             waitTranscodingControl.enable()
-            waitTranscodingControl.setValue(true)
+
+            // Do not update the control value on first patch (values come from the server)
+            if (this.firstPatchDone === true) {
+              waitTranscodingControl.setValue(true)
+            }
           }
 
           scheduleControl.updateValueAndValidity()
           waitTranscodingControl.updateValueAndValidity()
+
+          this.firstPatchDone = true
+
         }
       )
   }
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts
index 774772e14..952fe0293 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -107,6 +107,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
           },
 
           err => {
+            this.loadingBar.complete()
             this.isUpdatingVideo = false
             this.notificationsService.error(this.i18n('Error'), err.message)
             console.error(err)
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 21f8f5534..e7e9f367c 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -48,15 +48,15 @@
         <div class="video-actions-rates">
           <div class="video-actions">
             <div
-                *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
-                class="action-button action-button-like"
+              *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
+              class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
             >
               <span class="icon icon-like" i18n-title title="Like this video" ></span>
             </div>
 
             <div
-                *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
-                class="action-button action-button-dislike"
+              *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
+              class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
             >
               <span class="icon icon-dislike" i18n-title title="Dislike this video"></span>
             </div>
@@ -66,12 +66,12 @@
               <span class="icon-text" i18n>Support</span>
             </div>
 
-            <div (click)="showShareModal()" class="action-button action-button-share">
+            <div (click)="showShareModal()" class="action-button action-button-share" role="button">
               <span class="icon icon-share"></span>
               <span class="icon-text" i18n>Share</span>
             </div>
 
-            <div class="action-more" dropdown dropup="true" placement="right">
+            <div class="action-more" dropdown dropup="true" placement="right" role="button">
               <div class="action-button" dropdownToggle>
                 <span class="icon icon-more"></span>
               </div>
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 43afbae1a..4f8549e8f 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -314,7 +314,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     if (!errorMessage) return
 
     // Display a message in the video player instead of a notification
-    if (errorMessage.indexOf('http error') !== -1) {
+    if (errorMessage.indexOf('from xs param') !== -1) {
       this.flushPlayer()
       this.remoteServerDown = true
       return