diff options
Diffstat (limited to 'client/src/app/+admin/overview/users/user-list/user-list.component.html')
-rw-r--r-- | client/src/app/+admin/overview/users/user-list/user-list.component.html | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html index 7eb89fea1..0662e3ac3 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.html +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html | |||
@@ -62,10 +62,10 @@ | |||
62 | </div> | 62 | </div> |
63 | </th> | 63 | </th> |
64 | <th *ngIf="isSelected('username')" pResizableColumn pSortableColumn="username">{{ getColumn('username').label }} <p-sortIcon field="username"></p-sortIcon></th> | 64 | <th *ngIf="isSelected('username')" pResizableColumn pSortableColumn="username">{{ getColumn('username').label }} <p-sortIcon field="username"></p-sortIcon></th> |
65 | <th *ngIf="isSelected('role')" style="width: 120px;" pSortableColumn="role">{{ getColumn('role').label }} <p-sortIcon field="role"></p-sortIcon></th> | ||
65 | <th *ngIf="isSelected('email')">{{ getColumn('email').label }}</th> | 66 | <th *ngIf="isSelected('email')">{{ getColumn('email').label }}</th> |
66 | <th *ngIf="isSelected('quota')" style="width: 160px;" pSortableColumn="videoQuotaUsed">{{ getColumn('quota').label }} <p-sortIcon field="videoQuotaUsed"></p-sortIcon></th> | 67 | <th *ngIf="isSelected('quota')" style="width: 160px;" pSortableColumn="videoQuotaUsed">{{ getColumn('quota').label }} <p-sortIcon field="videoQuotaUsed"></p-sortIcon></th> |
67 | <th *ngIf="isSelected('quotaDaily')" style="width: 160px;">{{ getColumn('quotaDaily').label }}</th> | 68 | <th *ngIf="isSelected('quotaDaily')" style="width: 160px;">{{ getColumn('quotaDaily').label }}</th> |
68 | <th *ngIf="isSelected('role')" style="width: 120px;" pSortableColumn="role">{{ getColumn('role').label }} <p-sortIcon field="role"></p-sortIcon></th> | ||
69 | <th *ngIf="isSelected('pluginAuth')" style="width: 140px;" pResizableColumn >{{ getColumn('pluginAuth').label }}</th> | 69 | <th *ngIf="isSelected('pluginAuth')" style="width: 140px;" pResizableColumn >{{ getColumn('pluginAuth').label }}</th> |
70 | <th *ngIf="isSelected('createdAt')" style="width: 150px;" pSortableColumn="createdAt">{{ getColumn('createdAt').label }} <p-sortIcon field="createdAt"></p-sortIcon></th> | 70 | <th *ngIf="isSelected('createdAt')" style="width: 150px;" pSortableColumn="createdAt">{{ getColumn('createdAt').label }} <p-sortIcon field="createdAt"></p-sortIcon></th> |
71 | <th *ngIf="isSelected('lastLoginDate')" style="width: 150px;" pSortableColumn="lastLoginDate">{{ getColumn('lastLoginDate').label }} <p-sortIcon field="lastLoginDate"></p-sortIcon></th> | 71 | <th *ngIf="isSelected('lastLoginDate')" style="width: 150px;" pSortableColumn="lastLoginDate">{{ getColumn('lastLoginDate').label }} <p-sortIcon field="lastLoginDate"></p-sortIcon></th> |
@@ -84,8 +84,9 @@ | |||
84 | </td> | 84 | </td> |
85 | 85 | ||
86 | <td class="action-cell"> | 86 | <td class="action-cell"> |
87 | <my-user-moderation-dropdown *ngIf="!isInSelectionMode()" [user]="user" container="body" | 87 | <my-user-moderation-dropdown |
88 | (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"> | 88 | *ngIf="!isInSelectionMode()" [user]="user" [account]="user.accountMutedStatus" [displayOptions]="userModerationDisplayOptions" |
89 | container="body" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"> | ||
89 | </my-user-moderation-dropdown> | 90 | </my-user-moderation-dropdown> |
90 | </td> | 91 | </td> |
91 | 92 | ||
@@ -99,6 +100,14 @@ | |||
99 | </div> | 100 | </div> |
100 | </div> | 101 | </div> |
101 | </a> | 102 | </a> |
103 | |||
104 | <div *ngIf="user.accountMutedStatus.mutedByInstance" class="badges-username badge badge-red" i18n>Muted</div> | ||
105 | <div *ngIf="user.blocked" class="badges-username badge badge-red" i18n>Banned</div> | ||
106 | </td> | ||
107 | |||
108 | <td *ngIf="isSelected('role')"> | ||
109 | <span *ngIf="user.blocked" class="badge badge-banned" i18n-title title="The user was banned">{{ user.roleLabel }}</span> | ||
110 | <span *ngIf="!user.blocked" class="badge" [ngClass]="getRoleClass(user.role)">{{ user.roleLabel }}</span> | ||
102 | </td> | 111 | </td> |
103 | 112 | ||
104 | <td *ngIf="isSelected('email')" [title]="user.email"> | 113 | <td *ngIf="isSelected('email')" [title]="user.email"> |
@@ -138,11 +147,6 @@ | |||
138 | </div> | 147 | </div> |
139 | </td> | 148 | </td> |
140 | 149 | ||
141 | <td *ngIf="isSelected('role')"> | ||
142 | <span *ngIf="user.blocked" class="badge badge-banned" i18n-title title="The user was banned">{{ user.roleLabel }}</span> | ||
143 | <span *ngIf="!user.blocked" class="badge" [ngClass]="getRoleClass(user.role)">{{ user.roleLabel }}</span> | ||
144 | </td> | ||
145 | |||
146 | <td *ngIf="isSelected('pluginAuth')"> | 150 | <td *ngIf="isSelected('pluginAuth')"> |
147 | <ng-container *ngIf="user.pluginAuth">{{ user.pluginAuth }}</ng-container> | 151 | <ng-container *ngIf="user.pluginAuth">{{ user.pluginAuth }}</ng-container> |
148 | </td> | 152 | </td> |