diff options
Diffstat (limited to 'client/src/app/shared/shared-moderation')
3 files changed, 9 insertions, 9 deletions
diff --git a/client/src/app/shared/shared-moderation/account-blocklist.component.html b/client/src/app/shared/shared-moderation/account-blocklist.component.html index df98cf84e..5af1095f1 100644 --- a/client/src/app/shared/shared-moderation/account-blocklist.component.html +++ b/client/src/app/shared/shared-moderation/account-blocklist.component.html | |||
@@ -24,14 +24,17 @@ | |||
24 | 24 | ||
25 | <ng-template pTemplate="header"> | 25 | <ng-template pTemplate="header"> |
26 | <tr> | 26 | <tr> |
27 | <th style="width: 150px;">Action</th> <!-- column for action buttons --> | ||
27 | <th style="width: 100%;" i18n>Account</th> | 28 | <th style="width: 100%;" i18n>Account</th> |
28 | <th style="width: 150px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> | 29 | <th style="width: 150px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> |
29 | <th style="width: 150px;"></th> <!-- column for action buttons --> | ||
30 | </tr> | 30 | </tr> |
31 | </ng-template> | 31 | </ng-template> |
32 | 32 | ||
33 | <ng-template pTemplate="body" let-accountBlock> | 33 | <ng-template pTemplate="body" let-accountBlock> |
34 | <tr> | 34 | <tr> |
35 | <td class="action-cell"> | ||
36 | <button class="unblock-button" (click)="unblockAccount(accountBlock)" i18n>Unmute</button> | ||
37 | </td> | ||
35 | <td> | 38 | <td> |
36 | <a [href]="accountBlock.blockedAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer"> | 39 | <a [href]="accountBlock.blockedAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer"> |
37 | <div class="chip two-lines"> | 40 | <div class="chip two-lines"> |
@@ -50,9 +53,6 @@ | |||
50 | </td> | 53 | </td> |
51 | 54 | ||
52 | <td>{{ accountBlock.createdAt | date: 'short' }}</td> | 55 | <td>{{ accountBlock.createdAt | date: 'short' }}</td> |
53 | <td class="action-cell"> | ||
54 | <button class="unblock-button" (click)="unblockAccount(accountBlock)" i18n>Unmute</button> | ||
55 | </td> | ||
56 | </tr> | 56 | </tr> |
57 | </ng-template> | 57 | </ng-template> |
58 | 58 | ||
diff --git a/client/src/app/shared/shared-moderation/server-blocklist.component.html b/client/src/app/shared/shared-moderation/server-blocklist.component.html index 4621414d9..598e1a42c 100644 --- a/client/src/app/shared/shared-moderation/server-blocklist.component.html +++ b/client/src/app/shared/shared-moderation/server-blocklist.component.html | |||
@@ -28,14 +28,17 @@ | |||
28 | 28 | ||
29 | <ng-template pTemplate="header"> | 29 | <ng-template pTemplate="header"> |
30 | <tr> | 30 | <tr> |
31 | <th style="width: 150px;">Action</th> <!-- column for action buttons --> | ||
31 | <th style="width: 100%;" i18n>Instance</th> | 32 | <th style="width: 100%;" i18n>Instance</th> |
32 | <th style="width: 150px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> | 33 | <th style="width: 150px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> |
33 | <th style="width: 150px;"></th> <!-- column for action buttons --> | ||
34 | </tr> | 34 | </tr> |
35 | </ng-template> | 35 | </ng-template> |
36 | 36 | ||
37 | <ng-template pTemplate="body" let-serverBlock> | 37 | <ng-template pTemplate="body" let-serverBlock> |
38 | <tr> | 38 | <tr> |
39 | <td class="action-cell"> | ||
40 | <button class="unblock-button" (click)="unblockServer(serverBlock)" i18n>Unmute</button> | ||
41 | </td> | ||
39 | <td> | 42 | <td> |
40 | <a [href]="'https://' + serverBlock.blockedServer.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer"> | 43 | <a [href]="'https://' + serverBlock.blockedServer.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer"> |
41 | {{ serverBlock.blockedServer.host }} | 44 | {{ serverBlock.blockedServer.host }} |
@@ -43,9 +46,6 @@ | |||
43 | </a> | 46 | </a> |
44 | </td> | 47 | </td> |
45 | <td>{{ serverBlock.createdAt | date: 'short' }}</td> | 48 | <td>{{ serverBlock.createdAt | date: 'short' }}</td> |
46 | <td class="action-cell"> | ||
47 | <button class="unblock-button" (click)="unblockServer(serverBlock)" i18n>Unmute</button> | ||
48 | </td> | ||
49 | </tr> | 49 | </tr> |
50 | </ng-template> | 50 | </ng-template> |
51 | 51 | ||
diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts index 78c2658df..34fa7366c 100644 --- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts +++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts | |||
@@ -19,7 +19,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { | |||
19 | @Input() prependActions: DropdownAction<{ user: User, account: Account }>[] | 19 | @Input() prependActions: DropdownAction<{ user: User, account: Account }>[] |
20 | 20 | ||
21 | @Input() buttonSize: 'normal' | 'small' = 'normal' | 21 | @Input() buttonSize: 'normal' | 'small' = 'normal' |
22 | @Input() placement = 'left-top left-bottom auto' | 22 | @Input() placement = 'right-top right-bottom auto' |
23 | @Input() label: string | 23 | @Input() label: string |
24 | @Input() container: 'body' | undefined = undefined | 24 | @Input() container: 'body' | undefined = undefined |
25 | 25 | ||