X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fsearch%2Fsearch.component.html;h=055f64cc8ee081eab67d43f7bfeeba2002724af0;hb=c9e3eeedad67649d9b7aec8897b738d0ad63ec1f;hp=b8c4d7dc59b5b69424b3c7b7338b0712383e9486;hpb=57c36b277e68b764dd34cb2e449f6e2ca3d1e9b6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html
index b8c4d7dc5..055f64cc8 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/search/search.component.html
@@ -1,19 +1,58 @@
-<div i18n *ngIf="pagination.totalItems === 0" class="no-result">
-  No results found
-</div>
+<div myInfiniteScroller [autoInit]="true" (nearOfBottom)="onNearOfBottom()" class="search-result">
+  <div class="results-header">
+    <div class="first-line">
+      <div class="results-counter" *ngIf="pagination.totalItems">
+        <span i18n>{{ pagination.totalItems | myNumberFormatter }} results</span>
+        <span *ngIf="currentSearch" i18n>
+          for <span class="search-value">{{ currentSearch }}</span>
+        </span>
+      </div>
+
+      <div
+        class="results-filter-button ml-auto" (click)="isSearchFilterCollapsed = !isSearchFilterCollapsed" role="button"
+        [attr.aria-expanded]="!isSearchFilterCollapsed" aria-controls="collapseBasic"
+      >
+        <span class="icon icon-filter"></span>
+        <ng-container i18n>
+          Filters
+          <span *ngIf="numberOfFilters() > 0" class="badge badge-secondary">{{ numberOfFilters() }}</span>
+        </ng-container>
+      </div>
+    </div>
+
+    <div class="results-filter collapse-transition" [ngbCollapse]="isSearchFilterCollapsed">
+      <my-search-filters [advancedSearch]="advancedSearch" (filtered)="onFiltered()"></my-search-filters>
+    </div>
+  </div>
 
-<div myInfiniteScroller [autoLoading]="true" (nearOfBottom)="onNearOfBottom()" class="search-result">
-  <div i18n *ngIf="pagination.totalItems" class="results-counter">
-    {{ pagination.totalItems | myNumberFormatter }} results for <span class="search-value">{{ currentSearch }}</span>
+  <div i18n *ngIf="pagination.totalItems === 0 && results.length === 0" class="no-results">
+    No results found
   </div>
 
-  <div *ngFor="let video of videos" class="entry video">
-    <my-video-thumbnail [video]="video"></my-video-thumbnail>
+  <ng-container *ngFor="let result of results">
+    <div *ngIf="isVideoChannel(result)" class="entry video-channel">
+      <a [routerLink]="[ '/video-channels', result.nameWithHost ]">
+        <img [src]="result.avatarUrl" alt="Avatar" />
+      </a>
 
-    <div class="video-info">
-      <a class="video-info-name" [routerLink]="['/videos/watch', video.uuid]" [attr.title]="video.name">{{ video.name }}</a>
-      <span i18n class="video-info-date-views">{{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views</span>
-      <a class="video-info-account" [routerLink]="[ '/accounts', video.by ]">{{ video.by }}</a>
+      <div class="video-channel-info">
+        <a [routerLink]="[ '/video-channels', result.nameWithHost ]" class="video-channel-names">
+          <div class="video-channel-display-name">{{ result.displayName }}</div>
+          <div class="video-channel-name">{{ result.nameWithHost }}</div>
+        </a>
+
+        <div i18n class="video-channel-followers">{{ result.followersCount }} subscribers</div>
+      </div>
+
+      <my-subscribe-button [videoChannel]="result"></my-subscribe-button>
     </div>
-  </div>
+
+    <div *ngIf="isVideo(result)" class="entry video">
+      <my-video-miniature
+        [video]="result" [user]="user" [displayAsRow]="true"
+        (videoBlacklisted)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)"
+      ></my-video-miniature>
+    </div>
+  </ng-container>
+
 </div>