Bumped to version v5.2.1

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-video-miniature / video-filters-header.component.html

diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html
index 44c21c089139ec491734b239aa8b67aaf5651cc1..3d39c6fdc13597c404e8b57c16538ac2dd16a6db 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.html
@@ -1,8 +1,8 @@
 <ng-template #updateSettings let-fragment>
-  <div class="label-description text-muted" i18n>
+  <div class="label-description muted" i18n>
     Update
     <a routerLink="/my-account/settings" [fragment]="fragment">
-      <span (click)="onAccountSettingsClick($event)">your settings</span>
+      <button class="button-unstyle" (click)="onAccountSettingsClick($event)">your settings</button>
     </a
   ></div>
 </ng-template>
@@ -12,20 +12,20 @@
 
   <div class="first-row">
     <div class="active-filters">
-      <div
-        class="pastille filters-toggle" (click)="areFiltersCollapsed = !areFiltersCollapsed" role="button"
+      <button
+        class="pastille filters-toggle" (click)="areFiltersCollapsed = !areFiltersCollapsed"
         [attr.aria-expanded]="!areFiltersCollapsed" aria-controls="collapseBasic"
         [ngClass]="{ active: !areFiltersCollapsed }"
       >
         <ng-container i18n *ngIf="areFiltersCollapsed">More filters</ng-container>
-        <ng-container i18n *ngIf="!areFiltersCollapsed">Less filters</ng-container>
+        <ng-container i18n *ngIf="!areFiltersCollapsed">Hide filters</ng-container>
 
         <my-global-icon iconName="chevrons-up"></my-global-icon>
-      </div>
+      </button>
 
-      <div
+      <button
         *ngFor="let activeFilter of filters.getActiveFilters()" (click)="resetFilter(activeFilter.key, activeFilter.canRemove)"
-        class="active-filter pastille" [ngClass]="{ 'can-remove': activeFilter.canRemove }" [title]="getFilterTitle(activeFilter.canRemove)"
+        class="active-filter pastille button-unstyle" [ngClass]="{ 'can-remove': activeFilter.canRemove }" [title]="getFilterTitle(activeFilter.canRemove)"
       >
         <span>
           {{ activeFilter.label }}
@@ -34,7 +34,7 @@
         </span>
 
         <my-global-icon *ngIf="activeFilter.canRemove" iconName="cross"></my-global-icon>
-      </div>
+      </button>
     </div>
 
     <ng-select
@@ -42,18 +42,21 @@
       formControlName="sort"
       [clearable]="false"
       [searchable]="false"
+      [bindValue]="null"
     >
       <ng-option i18n value="-publishedAt">Sort by <strong>"Recently Added"</strong></ng-option>
+      <ng-option i18n value="-originallyPublishedAt">Sort by <strong>"Original Publication Date"</strong></ng-option>
 
-      <ng-option i18n *ngIf="isTrendingSortEnabled('most-viewed')" value="-trending">Sort by <strong>"Views"</strong></ng-option>
+      <ng-option i18n value="name">Sort by <strong>"Name"</strong></ng-option>
+      <ng-option i18n *ngIf="isTrendingSortEnabled('most-viewed')" value="-trending">Sort by <strong>"Recent Views"</strong></ng-option>
       <ng-option i18n *ngIf="isTrendingSortEnabled('hot')" value="-hot">Sort by <strong>"Hot"</strong></ng-option>
-      <ng-option i18n *ngIf="isTrendingSortEnabled('best')" value="-best">Sort by <strong>"Best"</strong></ng-option>
       <ng-option i18n *ngIf="isTrendingSortEnabled('most-liked')" value="-likes">Sort by <strong>"Likes"</strong></ng-option>
+      <ng-option i18n value="-views">Sort by <strong>"Global Views"</strong></ng-option>
     </ng-select>
 
   </div>
 
-  <div class="collapse-transition" [ngbCollapse]="areFiltersCollapsed">
+  <div [ngbCollapse]="areFiltersCollapsed" [animation]="true">
     <div class="filters">
       <div class="form-group">
         <label class="with-description" for="languageOneOf" i18n>Languages:</label>
@@ -67,26 +70,26 @@
         <ng-template *ngTemplateOutlet="updateSettings; context: { $implicit: 'video-sensitive-content-policy' }"></ng-template>
 
         <div class="peertube-radio-container">
-          <input formControlName="nsfw" type="radio" name="nsfw" id="nsfwBoth" i18n-value value="both" />
+          <input formControlName="nsfw" type="radio" name="nsfw" id="nsfwBoth" value="both" />
           <label for="nsfwBoth">{{ filters.getNSFWDisplayLabel() }}</label>
         </div>
 
         <div class="peertube-radio-container">
-          <input formControlName="nsfw" type="radio" name="nsfw" id="nsfwFalse" i18n-value value="false" />
+          <input formControlName="nsfw" type="radio" name="nsfw" id="nsfwFalse" value="false" />
           <label for="nsfwFalse" i18n>Hide</label>
         </div>
       </div>
 
-      <div class="form-group">
+      <div class="form-group" *ngIf="!hideScope">
         <label for="scope" i18n>Scope:</label>
 
         <div class="peertube-radio-container">
-          <input formControlName="scope" type="radio" name="scope" id="scopeLocal" i18n-value value="local" />
+          <input formControlName="scope" type="radio" name="scope" id="scopeLocal" value="local" />
           <label for="scopeLocal" i18n>Local videos (this instance)</label>
         </div>
 
         <div class="peertube-radio-container">
-          <input formControlName="scope" type="radio" name="scope" id="scopeFederated" i18n-value value="federated" />
+          <input formControlName="scope" type="radio" name="scope" id="scopeFederated" value="federated" />
           <label for="scopeFederated" i18n>Federated videos (this instance + followed instances)</label>
         </div>
       </div>
@@ -95,17 +98,17 @@
         <label for="type" i18n>Type:</label>
 
         <div class="peertube-radio-container">
-          <input formControlName="live" type="radio" name="live" id="liveBoth" i18n-value value="both" />
+          <input formControlName="live" type="radio" name="live" id="liveBoth" value="both" />
           <label for="liveBoth" i18n>VOD & Live videos</label>
         </div>
 
         <div class="peertube-radio-container">
-          <input formControlName="live" type="radio" name="live" id="liveTrue" i18n-value value="true" />
+          <input formControlName="live" type="radio" name="live" id="liveTrue" value="true" />
           <label for="liveTrue" i18n>Live videos</label>
         </div>
 
         <div class="peertube-radio-container">
-          <input formControlName="live" type="radio" name="live" id="liveFalse" i18n-value value="false" />
+          <input formControlName="live" type="radio" name="live" id="liveFalse" value="false" />
           <label for="liveFalse" i18n>VOD videos</label>
         </div>
       </div>