diff options
| author | Rigel Kent <sendmemail@rigelk.eu> | 2020-07-15 11:17:03 +0200 |
|---|---|---|
| committer | Rigel Kent <par@rigelk.eu> | 2020-07-29 18:15:53 +0200 |
| commit | bc99dfe54e093e69ba8fd06d36b36fbbda3f45de (patch) | |
| tree | 2c13497b77928c2593310746e3ec33333e2b4d66 /client/src/app/+admin/follows | |
| parent | 654a188f80fc1f089aa14837084664c908fe27d2 (diff) | |
| download | PeerTube-bc99dfe54e093e69ba8fd06d36b36fbbda3f45de.tar.gz PeerTube-bc99dfe54e093e69ba8fd06d36b36fbbda3f45de.tar.zst PeerTube-bc99dfe54e093e69ba8fd06d36b36fbbda3f45de.zip | |
variable columns for users list, more columns possible, badge display for statuses
Diffstat (limited to 'client/src/app/+admin/follows')
3 files changed, 16 insertions, 4 deletions
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html index f50828bb9..050fe40fb 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.html +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html | |||
| @@ -41,8 +41,12 @@ | |||
| 41 | </a> | 41 | </a> |
| 42 | </td> | 42 | </td> |
| 43 | 43 | ||
| 44 | <td *ngIf="follow.state === 'accepted'" i18n>Accepted</td> | 44 | <td *ngIf="follow.state === 'accepted'"> |
| 45 | <td *ngIf="follow.state === 'pending'" i18n>Pending</td> | 45 | <span class="badge badge-green" i18n>Accepted</span> |
| 46 | </td> | ||
| 47 | <td *ngIf="follow.state === 'pending'"> | ||
| 48 | <span class="badge badge-yellow" i18n>Pending</span> | ||
| 49 | </td> | ||
| 46 | 50 | ||
| 47 | <td>{{ follow.score }}</td> | 51 | <td>{{ follow.score }}</td> |
| 48 | <td>{{ follow.createdAt | date: 'short' }}</td> | 52 | <td>{{ follow.createdAt | date: 'short' }}</td> |
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 7d1a3d7f3..9dead2557 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 | |||
| @@ -45,8 +45,12 @@ | |||
| 45 | </a> | 45 | </a> |
| 46 | </td> | 46 | </td> |
| 47 | 47 | ||
| 48 | <td *ngIf="follow.state === 'accepted'" i18n>Accepted</td> | 48 | <td *ngIf="follow.state === 'accepted'"> |
| 49 | <td *ngIf="follow.state === 'pending'" i18n>Pending</td> | 49 | <span class="badge badge-green" i18n>Accepted</span> |
| 50 | </td> | ||
| 51 | <td *ngIf="follow.state === 'pending'"> | ||
| 52 | <span class="badge badge-yellow" i18n>Pending</span> | ||
| 53 | </td> | ||
| 50 | 54 | ||
| 51 | <td>{{ follow.createdAt | date: 'short' }}</td> | 55 | <td>{{ follow.createdAt | date: 'short' }}</td> |
| 52 | <td> | 56 | <td> |
diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss index 0cffcb555..33ff17539 100644 --- a/client/src/app/+admin/follows/follows.component.scss +++ b/client/src/app/+admin/follows/follows.component.scss | |||
| @@ -4,3 +4,7 @@ | |||
| 4 | flex-grow: 0; | 4 | flex-grow: 0; |
| 5 | margin-right: 30px; | 5 | margin-right: 30px; |
| 6 | } | 6 | } |
| 7 | |||
| 8 | .badge { | ||
| 9 | @include table-badge; | ||
| 10 | } | ||