diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-04-19 23:42:06 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-05-01 16:41:02 +0200 |
commit | b8cf27c0f86d205a279d03b83e0e6728f46da67f (patch) | |
tree | 71222cc9dbd8b4c7fede48d3cfcfce9aa05a5ad3 /client/src/app/+admin/follows/following-list/following-list.component.html | |
parent | 36004aa7b0de5cb69a452090770221b192a78eb8 (diff) | |
download | PeerTube-b8cf27c0f86d205a279d03b83e0e6728f46da67f.tar.gz PeerTube-b8cf27c0f86d205a279d03b83e0e6728f46da67f.tar.zst PeerTube-b8cf27c0f86d205a279d03b83e0e6728f46da67f.zip |
Unify paginator disabling when no result is displayable, fix batch domain add for non-https
Diffstat (limited to 'client/src/app/+admin/follows/following-list/following-list.component.html')
-rw-r--r-- | client/src/app/+admin/follows/following-list/following-list.component.html | 21 |
1 files changed, 17 insertions, 4 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 e4189d334..5fb0f4900 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 | |||
@@ -1,6 +1,8 @@ | |||
1 | <p-table | 1 | <p-table |
2 | [value]="following" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="following" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions" |
3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" | 3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" |
4 | [showCurrentPageReport]="true" i18n-currentPageReportTemplate | ||
5 | currentPageReportTemplate="Showing {first} to {last} of {totalRecords} hosts" | ||
4 | > | 6 | > |
5 | <ng-template pTemplate="caption"> | 7 | <ng-template pTemplate="caption"> |
6 | <div class="caption"> | 8 | <div class="caption"> |
@@ -29,7 +31,12 @@ | |||
29 | 31 | ||
30 | <ng-template pTemplate="body" let-follow> | 32 | <ng-template pTemplate="body" let-follow> |
31 | <tr> | 33 | <tr> |
32 | <td>{{ follow.following.host }}</td> | 34 | <td> |
35 | <a [href]="'https://' + follow.following.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer"> | ||
36 | {{ follow.following.host }} | ||
37 | <span class="glyphicon glyphicon-new-window"></span> | ||
38 | </a> | ||
39 | </td> | ||
33 | 40 | ||
34 | <td *ngIf="follow.state === 'accepted'" i18n>Accepted</td> | 41 | <td *ngIf="follow.state === 'accepted'" i18n>Accepted</td> |
35 | <td *ngIf="follow.state === 'pending'" i18n>Pending</td> | 42 | <td *ngIf="follow.state === 'pending'" i18n>Pending</td> |
@@ -51,11 +58,17 @@ | |||
51 | <td colspan="6"> | 58 | <td colspan="6"> |
52 | <div class="empty-table-message"> | 59 | <div class="empty-table-message"> |
53 | <ng-container *ngIf="search" i18n>No host found matching current filters.</ng-container> | 60 | <ng-container *ngIf="search" i18n>No host found matching current filters.</ng-container> |
54 | <ng-container *ngIf="!search" i18n>Your instance is not follwing any host.</ng-container> | 61 | <ng-container *ngIf="!search" i18n>Your instance is not following anyone.</ng-container> |
55 | </div> | 62 | </div> |
56 | </td> | 63 | </td> |
57 | </tr> | 64 | </tr> |
58 | </ng-template> | 65 | </ng-template> |
59 | </p-table> | 66 | </p-table> |
60 | 67 | ||
61 | <my-batch-domains-modal #batchDomainsModal i18n-action action="Follow domains" (domains)="addFollowing($event)"></my-batch-domains-modal> | 68 | <my-batch-domains-modal #batchDomainsModal i18n-action action="Follow domains" (domains)="addFollowing($event)"> |
69 | <ng-container ngProjectAs="warning"> | ||
70 | <div i18n *ngIf="httpEnabled() === false" class="alert alert-warning"> | ||
71 | It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers. | ||
72 | </div> | ||
73 | </ng-container> | ||
74 | </my-batch-domains-modal> | ||