diff options
author | Kim <1877318+kimsible@users.noreply.github.com> | 2020-07-31 11:30:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-31 11:30:57 +0200 |
commit | 30814423ae98b6ac5f7407fc53cffe32aae57124 (patch) | |
tree | 8cc300366fdf2c6dc8e3dfc4c1e6c079dfd11571 /client/src/app/+my-account | |
parent | 8d987ec63e6888c839ad55938d45809869c517c6 (diff) | |
download | PeerTube-30814423ae98b6ac5f7407fc53cffe32aae57124.tar.gz PeerTube-30814423ae98b6ac5f7407fc53cffe32aae57124.tar.zst PeerTube-30814423ae98b6ac5f7407fc53cffe32aae57124.zip |
Improve (accessibility title) and move action-buttons on left in tables (#2980)
* Improve and move action-buttons on left in tables
* Focus on my-delete and my-button
* Correct spaces syntax
* Move user-action dropdown on the left
Co-authored-by: kimsible <kimsible@users.noreply.github.com>
Diffstat (limited to 'client/src/app/+my-account')
5 files changed, 21 insertions, 20 deletions
diff --git a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html index c20215cf9..f4ff32366 100644 --- a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html +++ b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html | |||
@@ -34,8 +34,8 @@ | |||
34 | <div i18n class="video-channel-videos">{videoChannel.videosCount, plural, =0 {No videos} =1 {1 video} other {{{ videoChannel.videosCount }} videos}}</div> | 34 | <div i18n class="video-channel-videos">{videoChannel.videosCount, plural, =0 {No videos} =1 {1 video} other {{{ videoChannel.videosCount }} videos}}</div> |
35 | 35 | ||
36 | <div class="video-channel-buttons"> | 36 | <div class="video-channel-buttons"> |
37 | <my-edit-button [routerLink]="[ 'update', videoChannel.nameWithHost ]"></my-edit-button> | 37 | <my-edit-button label [routerLink]="[ 'update', videoChannel.nameWithHost ]"></my-edit-button> |
38 | <my-delete-button (click)="deleteVideoChannel(videoChannel)"></my-delete-button> | 38 | <my-delete-button label (click)="deleteVideoChannel(videoChannel)"></my-delete-button> |
39 | </div> | 39 | </div> |
40 | 40 | ||
41 | <div *ngIf="!isInSmallView" class="w-100 d-flex justify-content-end"> | 41 | <div *ngIf="!isInSmallView" class="w-100 d-flex justify-content-end"> |
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html index 4475178c7..fd2163fb4 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html | |||
@@ -15,6 +15,7 @@ | |||
15 | > | 15 | > |
16 | <ng-template pTemplate="header"> | 16 | <ng-template pTemplate="header"> |
17 | <tr> | 17 | <tr> |
18 | <th style="width: 150px;" i18n>Actions</th> | ||
18 | <th style="width: 35%;" i18n>Initiator</th> | 19 | <th style="width: 35%;" i18n>Initiator</th> |
19 | <th style="width: 65%;" i18n>Video</th> | 20 | <th style="width: 65%;" i18n>Video</th> |
20 | <th style="width: 150px;" i18n pSortableColumn="createdAt"> | 21 | <th style="width: 150px;" i18n pSortableColumn="createdAt"> |
@@ -22,12 +23,17 @@ | |||
22 | <p-sortIcon field="createdAt"></p-sortIcon> | 23 | <p-sortIcon field="createdAt"></p-sortIcon> |
23 | </th> | 24 | </th> |
24 | <th style="width: 100px;" i18n>Status</th> | 25 | <th style="width: 100px;" i18n>Status</th> |
25 | <th style="width: 130px;" i18n>Action</th> | ||
26 | </tr> | 26 | </tr> |
27 | </ng-template> | 27 | </ng-template> |
28 | 28 | ||
29 | <ng-template pTemplate="body" let-videoChangeOwnership> | 29 | <ng-template pTemplate="body" let-videoChangeOwnership> |
30 | <tr> | 30 | <tr> |
31 | <td class="action-cell"> | ||
32 | <ng-container *ngIf="videoChangeOwnership.status === 'WAITING'"> | ||
33 | <my-button i18n-title title="Accept" icon="tick" (click)="openAcceptModal(videoChangeOwnership)"></my-button> | ||
34 | <my-button i18n-title title="Refuse" icon="cross" (click)="refuse(videoChangeOwnership)"></my-button> | ||
35 | </ng-container> | ||
36 | </td> | ||
31 | <td> | 37 | <td> |
32 | <a [href]="videoChangeOwnership.initiatorAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer"> | 38 | <a [href]="videoChangeOwnership.initiatorAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer"> |
33 | <div class="chip two-lines"> | 39 | <div class="chip two-lines"> |
@@ -64,14 +70,8 @@ | |||
64 | <td>{{ videoChangeOwnership.createdAt | date: 'short' }}</td> | 70 | <td>{{ videoChangeOwnership.createdAt | date: 'short' }}</td> |
65 | 71 | ||
66 | <td> | 72 | <td> |
67 | <span class="badge" [ngClass]="getStatusClass(videoChangeOwnership.status)">{{ videoChangeOwnership.status }}</span> | 73 | <span class="badge" |
68 | </td> | 74 | [ngClass]="getStatusClass(videoChangeOwnership.status)">{{ videoChangeOwnership.status }}</span> |
69 | |||
70 | <td class="action-cell"> | ||
71 | <ng-container *ngIf="videoChangeOwnership.status === 'WAITING'"> | ||
72 | <my-button i18n-label label="Accept" icon="tick" (click)="openAcceptModal(videoChangeOwnership)"></my-button> | ||
73 | <my-button i18n-label label="Refuse" icon="cross" (click)="refuse(videoChangeOwnership)"></my-button> | ||
74 | </ng-container> | ||
75 | </td> | 75 | </td> |
76 | </tr> | 76 | </tr> |
77 | </ng-template> | 77 | </ng-template> |
diff --git a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html index 854126443..1d3a45f76 100644 --- a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html +++ b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html | |||
@@ -13,11 +13,11 @@ | |||
13 | <ng-template pTemplate="header"> | 13 | <ng-template pTemplate="header"> |
14 | <tr> | 14 | <tr> |
15 | <th style="width: 40px;"></th> | 15 | <th style="width: 40px;"></th> |
16 | <th style="width: 70px">Action</th> | ||
16 | <th style="width: 45%" i18n>Target</th> | 17 | <th style="width: 45%" i18n>Target</th> |
17 | <th style="width: 55%" i18n>Video</th> | 18 | <th style="width: 55%" i18n>Video</th> |
18 | <th style="width: 150px" i18n>State</th> | 19 | <th style="width: 150px" i18n>State</th> |
19 | <th style="width: 150px" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> | 20 | <th style="width: 150px" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> |
20 | <th style="width: 70px"></th> | ||
21 | </tr> | 21 | </tr> |
22 | </ng-template> | 22 | </ng-template> |
23 | 23 | ||
@@ -29,6 +29,11 @@ | |||
29 | </span> | 29 | </span> |
30 | </td> | 30 | </td> |
31 | 31 | ||
32 | <td class="action-cell"> | ||
33 | <my-edit-button *ngIf="isVideoImportSuccess(videoImport) && videoImport.video" | ||
34 | [routerLink]="getEditVideoUrl(videoImport.video)"></my-edit-button> | ||
35 | </td> | ||
36 | |||
32 | <td> | 37 | <td> |
33 | <a *ngIf="videoImport.targetUrl; else torrent" [href]="videoImport.targetUrl" target="_blank" rel="noopener noreferrer">{{ videoImport.targetUrl }}</a> | 38 | <a *ngIf="videoImport.targetUrl; else torrent" [href]="videoImport.targetUrl" target="_blank" rel="noopener noreferrer">{{ videoImport.targetUrl }}</a> |
34 | <ng-template #torrent> | 39 | <ng-template #torrent> |
@@ -52,10 +57,6 @@ | |||
52 | </td> | 57 | </td> |
53 | 58 | ||
54 | <td>{{ videoImport.createdAt | date: 'short' }}</td> | 59 | <td>{{ videoImport.createdAt | date: 'short' }}</td> |
55 | |||
56 | <td class="action-cell"> | ||
57 | <my-edit-button label=" " *ngIf="isVideoImportSuccess(videoImport) && videoImport.video" [routerLink]="getEditVideoUrl(videoImport.video)"></my-edit-button> | ||
58 | </td> | ||
59 | </tr> | 60 | </tr> |
60 | </ng-template> | 61 | </ng-template> |
61 | 62 | ||
diff --git a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html index d8e3fb2fa..3176bb8da 100644 --- a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html +++ b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html | |||
@@ -24,9 +24,9 @@ | |||
24 | </div> | 24 | </div> |
25 | 25 | ||
26 | <div *ngIf="isRegularPlaylist(playlist)" class="video-playlist-buttons"> | 26 | <div *ngIf="isRegularPlaylist(playlist)" class="video-playlist-buttons"> |
27 | <my-delete-button (click)="deleteVideoPlaylist(playlist)"></my-delete-button> | 27 | <my-delete-button label (click)="deleteVideoPlaylist(playlist)"></my-delete-button> |
28 | 28 | ||
29 | <my-edit-button [routerLink]="[ 'update', playlist.uuid ]"></my-edit-button> | 29 | <my-edit-button label [routerLink]="[ 'update', playlist.uuid ]"></my-edit-button> |
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
32 | </div> | 32 | </div> |
diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html index faeb3b56c..779b42ab7 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html | |||
@@ -31,9 +31,9 @@ | |||
31 | 31 | ||
32 | <ng-template ptTemplate="rowButtons" let-video> | 32 | <ng-template ptTemplate="rowButtons" let-video> |
33 | <div class="action-button"> | 33 | <div class="action-button"> |
34 | <my-delete-button (click)="deleteVideo(video)"></my-delete-button> | 34 | <my-delete-button label (click)="deleteVideo(video)"></my-delete-button> |
35 | 35 | ||
36 | <my-edit-button [routerLink]="[ '/videos', 'update', video.uuid ]"></my-edit-button> | 36 | <my-edit-button label [routerLink]="[ '/videos', 'update', video.uuid ]"></my-edit-button> |
37 | 37 | ||
38 | <my-button i18n-label label="Change ownership" | 38 | <my-button i18n-label label="Change ownership" |
39 | className="action-button-change-ownership grey-button" | 39 | className="action-button-change-ownership grey-button" |