diff options
author | kontrollanten <6680299+kontrollanten@users.noreply.github.com> | 2022-02-28 08:34:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-28 08:34:43 +0100 |
commit | d0800f7661f13fabe7bb6f4aa0ea50764f106405 (patch) | |
tree | d43e6b0b6f4a5a32e03487e6464edbcaf288be2a /client/src/app/+admin | |
parent | 5cad2ca9db9b9d138f8a33058d10b94a9fd50c69 (diff) | |
download | PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.tar.gz PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.tar.zst PeerTube-d0800f7661f13fabe7bb6f4aa0ea50764f106405.zip |
Implement avatar miniatures (#4639)
* client: remove unused file
* refactor(client/my-actor-avatar): size from input
Read size from component input instead of scss, to make it possible to
use smaller avatar images when implemented.
* implement avatar miniatures
close #4560
* fix(test): max file size
* fix(search-index): normalize res acc to avatarMini
* refactor avatars to an array
* client/search: resize channel avatar to 120
* refactor(client/videos): remove unused function
* client(actor-avatar): set default size
* fix tests and avatars full result
When findOne is used only an array containting one avatar is returned.
* update migration version and version notations
* server/search: harmonize normalizing
* Cleanup avatar miniature PR
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'client/src/app/+admin')
2 files changed, 1 insertions, 57 deletions
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html deleted file mode 100644 index feade0c26..000000000 --- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | <p-table | ||
2 | [value]="blockedAccounts" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions" | ||
3 | [sortField]="sort.field" [sortOrder]="sort.order" | ||
4 | [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" | ||
5 | [showCurrentPageReport]="true" i18n-currentPageReportTemplate | ||
6 | currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} muted accounts" | ||
7 | > | ||
8 | <ng-template pTemplate="caption"> | ||
9 | <div class="caption"> | ||
10 | <div class="ml-auto"> | ||
11 | <my-advanced-input-filter (search)="onSearch($event)"></my-advanced-input-filter> | ||
12 | </div> | ||
13 | </div> | ||
14 | </ng-template> | ||
15 | |||
16 | <ng-template pTemplate="header"> | ||
17 | <tr> | ||
18 | <th style="width: 150px;">Action</th> <!-- column for action buttons --> | ||
19 | <th style="width: calc(100% - 300px);" i18n>Account</th> | ||
20 | <th style="width: 150px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> | ||
21 | </tr> | ||
22 | </ng-template> | ||
23 | |||
24 | <ng-template pTemplate="body" let-accountBlock> | ||
25 | <tr> | ||
26 | <td class="action-cell"> | ||
27 | <button class="unblock-button" (click)="unblockAccount(accountBlock)" i18n>Unmute</button> | ||
28 | </td> | ||
29 | |||
30 | <td> | ||
31 | <a [href]="accountBlock.blockedAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer"> | ||
32 | <div class="chip two-lines"> | ||
33 | <my-actor-avatar [account]="accountBlock.blockedAccount"></my-actor-avatar> | ||
34 | <div> | ||
35 | {{ accountBlock.blockedAccount.displayName }} | ||
36 | <span class="text-muted">{{ accountBlock.blockedAccount.nameWithHost }}</span> | ||
37 | </div> | ||
38 | </div> | ||
39 | </a> | ||
40 | </td> | ||
41 | |||
42 | <td>{{ accountBlock.createdAt | date: 'short' }}</td> | ||
43 | </tr> | ||
44 | </ng-template> | ||
45 | |||
46 | <ng-template pTemplate="emptymessage"> | ||
47 | <tr> | ||
48 | <td colspan="6"> | ||
49 | <div class="no-results"> | ||
50 | <ng-container *ngIf="search" i18n>No account found matching current filters.</ng-container> | ||
51 | <ng-container *ngIf="!search" i18n>No account found.</ng-container> | ||
52 | </div> | ||
53 | </td> | ||
54 | </tr> | ||
55 | </ng-template> | ||
56 | </p-table> | ||
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html index 9bf23c21a..0dbbbe1cc 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html | |||
@@ -66,7 +66,7 @@ | |||
66 | <td> | 66 | <td> |
67 | <a [href]="videoComment.account.localUrl" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer"> | 67 | <a [href]="videoComment.account.localUrl" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer"> |
68 | <div class="chip two-lines"> | 68 | <div class="chip two-lines"> |
69 | <my-actor-avatar [account]="videoComment.account"></my-actor-avatar> | 69 | <my-actor-avatar [account]="videoComment.account" size="32"></my-actor-avatar> |
70 | <div> | 70 | <div> |
71 | {{ videoComment.account.displayName }} | 71 | {{ videoComment.account.displayName }} |
72 | <span>{{ videoComment.by }}</span> | 72 | <span>{{ videoComment.by }}</span> |