Merge branch 'release/v1.3.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / video / abstract-video-list.html

diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index 60a2563b3dc2f56ada96d3a063daf29723a2c3a5..2686779779bd8e28ef52d6eb8aceb4ed322f9fc0 100644 (file)
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -1,21 +1,31 @@
 <div class="margin-content">
-  <div class="title-page title-page-single">
-    {{ titlePage }}
-  </div>
+  <div class="videos-header">
+    <div *ngIf="titlePage" class="title-page title-page-single">
+      <div placement="bottom" [ngbTooltip]="titleTooltip" container="body">
+        {{ titlePage }}
+      </div>
+    </div>
+
+    <my-feed [syndicationItems]="syndicationItems"></my-feed>
 
-  <div *ngIf="pagination.totalItems === 0">No results.</div>
+    <div class="moderation-block" *ngIf="displayModerationBlock">
+      <my-peertube-checkbox
+        (change)="toggleModerationDisplay()"
+        inputName="display-unlisted-private" i18n-labelText labelText="Display unlisted and private videos"
+      >
+      </my-peertube-checkbox>
+    </div>
+  </div>
 
+  <div class="no-results" i18n *ngIf="pagination.totalItems === 0">No results.</div>
   <div
+    myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [autoInit]="true"
     class="videos"
-    infiniteScroll
-    [infiniteScrollUpDistance]="1.5"
-    [infiniteScrollDistance]="0.5"
-    (scrolled)="onNearOfBottom()"
-    (scrolledUp)="onNearOfTop()"
   >
     <my-video-miniature
-      class="ng-animate"
-      *ngFor="let video of videos" [video]="video" [user]="user"
+      *ngFor="let video of videos; trackBy: videoById" [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType"
+      [displayVideoActions]="displayVideoActions" [displayOptions]="displayOptions"
+      (videoBlacklisted)="removeVideoFromArray(video)" (videoRemoved)="removeVideoFromArray(video)"
     >
     </my-video-miniature>
   </div>