Skip to content

Commit

Permalink
Add missing aria-hidden attribute to non descriptive icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Pandoraaa committed Jun 10, 2020
1 parent 1c31762 commit ec478ea
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
>
<ng-template ptTemplate="globalButtons">
<span class="action-button action-button-unblacklist-selection" (click)="removeSelectedVideosFromBlacklist()">
<my-global-icon iconName="tick"></my-global-icon>
<my-global-icon iconName="tick" aria-hidden="true"></my-global-icon>
<ng-container i18n>Unblacklist</ng-container>
</span>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<div class="result-title" *ngIf="!isSearching">
<ng-container *ngIf="!search">
<my-global-icon iconName="trending"></my-global-icon>
<my-global-icon iconName="trending" aria-hidden="true"></my-global-icon>
<ng-container i18n>Popular</ng-container>
</ng-container>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ng-container *ngIf="action.isDisplayed === undefined || action.isDisplayed(entry) === true">

<ng-template #templateActionLabel let-action>
<my-global-icon *ngIf="action.iconName" [iconName]="action.iconName" [ngClass]="'icon-' + action.iconName"></my-global-icon>
<my-global-icon *ngIf="action.iconName" [iconName]="action.iconName" [ngClass]="'icon-' + action.iconName" aria-hidden="true"></my-global-icon>

<div class="d-flex flex-column">
<span i18n>{{ action.label }}</span>
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/shared/menu/top-menu-dropdown.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<div ngbDropdownMenu>
<a *ngFor="let menuChild of menuEntry.children" class="dropdown-item" [ngClass]="{ icon: hasIcons }" [routerLink]="menuChild.routerLink">
<my-global-icon *ngIf="menuChild.iconName" [iconName]="menuChild.iconName"></my-global-icon>
<my-global-icon *ngIf="menuChild.iconName" [iconName]="menuChild.iconName" aria-hidden="true"></my-global-icon>

{{ menuChild.label }}
</a>
Expand All @@ -40,7 +40,7 @@
<a *ngFor="let menuChild of menuEntry.children"
[ngClass]="{ icon: hasIcons }"
[routerLink]="menuChild.routerLink" routerLinkActive="active" (click)="dismissOtherModals()">
<my-global-icon *ngIf="menuChild.iconName" [iconName]="menuChild.iconName"></my-global-icon>
<my-global-icon *ngIf="menuChild.iconName" [iconName]="menuChild.iconName" aria-hidden="true"></my-global-icon>

{{ menuChild.label }}
</a>
Expand Down
20 changes: 10 additions & 10 deletions client/src/app/shared/users/user-notifications.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ng-template>

<ng-template #noVideo>
<my-global-icon iconName="alert"></my-global-icon>
<my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
The notification concerns a video now unavailable
Expand All @@ -27,31 +27,31 @@
</ng-container>

<ng-container *ngSwitchCase="UserNotificationType.UNBLACKLIST_ON_MY_VIDEO">
<my-global-icon iconName="undo"></my-global-icon>
<my-global-icon iconName="undo" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been unblacklisted
</div>
</ng-container>

<ng-container *ngSwitchCase="UserNotificationType.BLACKLIST_ON_MY_VIDEO">
<my-global-icon iconName="no"></my-global-icon>
<my-global-icon iconName="no" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been blacklisted
</div>
</ng-container>

<ng-container *ngSwitchCase="UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS">
<my-global-icon iconName="alert"></my-global-icon>
<my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
<a (click)="markAsRead(notification)" [routerLink]="notification.videoAbuseUrl">A new video abuse</a> has been created on video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoAbuse.video.name }}</a>
</div>
</ng-container>

<ng-container *ngSwitchCase="UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS">
<my-global-icon iconName="no"></my-global-icon>
<my-global-icon iconName="no" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
The recently added video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been <a (click)="markAsRead(notification)" [routerLink]="notification.videoAutoBlacklistUrl">auto-blacklisted</a>
Expand All @@ -72,7 +72,7 @@
</ng-template>

<ng-template #noComment>
<my-global-icon iconName="alert"></my-global-icon>
<my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
The notification concerns a comment now unavailable
Expand Down Expand Up @@ -105,7 +105,7 @@
</ng-container>

<ng-container *ngSwitchCase="UserNotificationType.NEW_USER_REGISTRATION">
<my-global-icon iconName="user-add"></my-global-icon>
<my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
User <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">{{ notification.account.name }}</a> registered on your instance
Expand Down Expand Up @@ -136,7 +136,7 @@
</ng-container>

<ng-container *ngSwitchCase="UserNotificationType.NEW_INSTANCE_FOLLOWER">
<my-global-icon iconName="users"></my-global-icon>
<my-global-icon iconName="users" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
Your instance has <a (click)="markAsRead(notification)" [routerLink]="notification.instanceFollowUrl">a new follower</a> ({{ notification.actorFollow?.follower.host }})
Expand All @@ -145,15 +145,15 @@
</ng-container>

<ng-container *ngSwitchCase="UserNotificationType.AUTO_INSTANCE_FOLLOWING">
<my-global-icon iconName="users"></my-global-icon>
<my-global-icon iconName="users" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
Your instance automatically followed <a (click)="markAsRead(notification)" [routerLink]="notification.instanceFollowUrl">{{ notification.actorFollow.following.host }}</a>
</div>
</ng-container>

<ng-container *ngSwitchDefault>
<my-global-icon iconName="alert"></my-global-icon>
<my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>

<div class="message" i18n>
The notification points to a content now unavailable
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/shared/video/abstract-video-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="action-block" *ngIf="actions.length > 0">
<a [routerLink]="action.routerLink" routerLinkActive="active" *ngFor="let action of actions">
<button class="btn">
<my-global-icon [iconName]="action.iconName"></my-global-icon>
<my-global-icon [iconName]="action.iconName" aria-hidden="true"></my-global-icon>
<span>{{ action.label }}</span>
</button>
</a>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div *ngIf="!hasImportedVideo" class="upload-video-container" dragDrop (fileDropped)="setTorrentFile($event)">
<div class="first-step-block">
<my-global-icon class="upload-icon" iconName="upload"></my-global-icon>
<my-global-icon class="upload-icon" iconName="upload" aria-hidden="true"></my-global-icon>

<div class="button-file form-control" [ngbTooltip]="'(extensions: .torrent)'">
<span i18n>Select the torrent to import</span>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div *ngIf="!hasImportedVideo" class="upload-video-container">
<div class="first-step-block">
<my-global-icon class="upload-icon" iconName="upload"></my-global-icon>
<my-global-icon class="upload-icon" iconName="upload" aria-hidden="true"></my-global-icon>

<div class="form-group">
<label i18n for="targetUrl">URL</label>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div *ngIf="!isUploadingVideo" class="upload-video-container" dragDrop (fileDropped)="setVideoFile($event)">
<div class="first-step-block">
<my-global-icon class="upload-icon" iconName="upload"></my-global-icon>
<my-global-icon class="upload-icon" iconName="upload" aria-hidden="true"></my-global-icon>

<div class="button-file form-control" [ngbTooltip]="'(extensions: ' + videoExtensions + ')'">
<span i18n>Select the file to upload</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h1 class="video-info-name">{{ video.name }}</h1>
<span class="icon-text" i18n>SUPPORT</span>
</div>

<div (click)="showShareModal()" (keyup.enter)="showShareModal()" class="action-button" tabindex="0" role="button" [ngbTooltip]="tooltipShare" placement="bottom">
<div (click)="showShareModal()" (keyup.enter)="showShareModal()" class="action-button" tabindex="0" role="button">
<my-global-icon iconName="share" aria-hidden="true"></my-global-icon>
<span class="icon-text" i18n>SHARE</span>
</div>
Expand Down
2 changes: 0 additions & 2 deletions client/src/app/videos/+video-watch/video-watch.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
tooltipDislike = ''
tooltipSupport = ''
tooltipSaveToPlaylist = ''
tooltipShare = ''

private nextVideoUuid = ''
private nextVideoTitle = ''
Expand Down Expand Up @@ -113,7 +112,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.tooltipDislike = this.i18n('Dislike this video')
this.tooltipSupport = this.i18n('Support options for this video')
this.tooltipSaveToPlaylist = this.i18n('Save to playlist')
this.tooltipShare = this.i18n('Share')
}

get user () {
Expand Down

0 comments on commit ec478ea

Please sign in to comment.