aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-05-11 18:05:16 +0200
committerChocobozzz <me@florianbigard.com>2020-05-11 18:05:16 +0200
commit5ff523664fda3acf83e319a7c08cd14af0025e99 (patch)
treebd876a029fb155fc517819a93776e0c8bb11f340
parent72efdda586489bf59ac7df12ff9e75a926f1f048 (diff)
downloadPeerTube-5ff523664fda3acf83e319a7c08cd14af0025e99.tar.gz
PeerTube-5ff523664fda3acf83e319a7c08cd14af0025e99.tar.zst
PeerTube-5ff523664fda3acf83e319a7c08cd14af0025e99.zip
Fix user dropdown overflow
-rw-r--r--client/src/app/+admin/follows/following-list/following-list.component.html2
-rw-r--r--client/src/app/+admin/users/user-list/user-list.component.html5
-rw-r--r--client/src/app/shared/moderation/user-moderation-dropdown.component.html3
-rw-r--r--client/src/app/shared/moderation/user-moderation-dropdown.component.ts1
4 files changed, 8 insertions, 3 deletions
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
index 059c07295..61b813305 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.html
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -27,7 +27,7 @@
27 <th style="width: 100px;" i18n pSortableColumn="state">State <p-sortIcon field="state"></p-sortIcon></th> 27 <th style="width: 100px;" i18n pSortableColumn="state">State <p-sortIcon field="state"></p-sortIcon></th>
28 <th style="width: 150px;" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> 28 <th style="width: 150px;" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
29 <th style="width: 160px;" i18n pSortableColumn="redundancyAllowed">Redundancy allowed <p-sortIcon field="redundancyAllowed"></p-sortIcon></th> 29 <th style="width: 160px;" i18n pSortableColumn="redundancyAllowed">Redundancy allowed <p-sortIcon field="redundancyAllowed"></p-sortIcon></th>
30 <th style="width: 100px;"></th> 30 <th style="width: 150px;"></th>
31 </tr> 31 </tr>
32 </ng-template> 32 </ng-template>
33 33
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index 768a3034d..6caf37212 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -106,7 +106,10 @@
106 <td [title]="user.createdAt">{{ user.createdAt | date: 'short' }}</td> 106 <td [title]="user.createdAt">{{ user.createdAt | date: 'short' }}</td>
107 107
108 <td class="action-cell"> 108 <td class="action-cell">
109 <my-user-moderation-dropdown *ngIf="!isInSelectionMode()" [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"> 109 <my-user-moderation-dropdown
110 *ngIf="!isInSelectionMode()"
111 [user]="user" container="body" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"
112 >
110 </my-user-moderation-dropdown> 113 </my-user-moderation-dropdown>
111 </td> 114 </td>
112 </tr> 115 </tr>
diff --git a/client/src/app/shared/moderation/user-moderation-dropdown.component.html b/client/src/app/shared/moderation/user-moderation-dropdown.component.html
index adb672322..4d562387a 100644
--- a/client/src/app/shared/moderation/user-moderation-dropdown.component.html
+++ b/client/src/app/shared/moderation/user-moderation-dropdown.component.html
@@ -4,5 +4,6 @@
4 <my-action-dropdown 4 <my-action-dropdown
5 [actions]="userActions" [entry]="{ user: user, account: account }" 5 [actions]="userActions" [entry]="{ user: user, account: account }"
6 [buttonSize]="buttonSize" [placement]="placement" [label]="label" 6 [buttonSize]="buttonSize" [placement]="placement" [label]="label"
7 [container]="container"
7 ></my-action-dropdown> 8 ></my-action-dropdown>
8</ng-container> \ No newline at end of file 9</ng-container>
diff --git a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
index c8ccaa800..f8ad7ce13 100644
--- a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
@@ -22,6 +22,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
22 @Input() buttonSize: 'normal' | 'small' = 'normal' 22 @Input() buttonSize: 'normal' | 'small' = 'normal'
23 @Input() placement = 'left-top left-bottom auto' 23 @Input() placement = 'left-top left-bottom auto'
24 @Input() label: string 24 @Input() label: string
25 @Input() container: 'body' | undefined = undefined
25 26
26 @Output() userChanged = new EventEmitter() 27 @Output() userChanged = new EventEmitter()
27 @Output() userDeleted = new EventEmitter() 28 @Output() userDeleted = new EventEmitter()