X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fheader%2Fsearch-typeahead.component.html;h=f84086b4a6793f0cb681fa11ed5060e399e3ce40;hb=931d3430184143ebd88e5243def6eb1d7acfdbf4;hp=46b28ed48e3bab272b3e227b752ad76445cd366e;hpb=5ed19b4b8b24daf8a651596a745d856006aecb98;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html
index 46b28ed48..f84086b4a 100644
--- a/client/src/app/header/search-typeahead.component.html
+++ b/client/src/app/header/search-typeahead.component.html
@@ -1,52 +1,61 @@
 <div class="d-inline-flex position-relative" id="typeahead-container">
   <input
     type="text" id="search-video" name="search-video" #searchVideo i18n-placeholder placeholder="Search videos, channels…"
-    [(ngModel)]="search" (ngModelChange)="onSearchChange()" (keyup)="handleKeyUp($event)"
+    [(ngModel)]="search" (ngModelChange)="onSearchChange()" (keydown)="handleKey($event)" (keydown.enter)="doSearch()"
+    aria-label="Search" autocomplete="off"
   >
-  <span class="icon icon-search" (click)="doSearch()"></span>
+  <my-global-icon
+    title="Search" i18n-title role="button"
+    iconName="search" class="icon icon-search" (click)="doSearch()" (keydown.enter)="doSearch()"
+  ></my-global-icon>
 
   <div class="position-absolute jump-to-suggestions">
-    <!-- suggestions -->
-    <my-suggestions *ngIf="search && newSearch" [results]="results" [highlight]="search" (init)="initKeyboardEventsManager($event)"></my-suggestions>
+
+    <ul [hidden]="!search || !areSuggestionsOpened" role="listbox" class="p-0 m-0">
+      <li
+        *ngFor="let result of results; let i = index" class="suggestion d-flex flex-justify-start flex-items-center p-0 f5"
+        role="option" aria-selected="true" (mouseenter)="onSuggestionHover(i)" (click)="onSuggestionlicked(result)"
+      >
+        <my-suggestion [result]="result" [highlight]="search"></my-suggestion>
+      </li>
+    </ul>
 
     <!-- suggestion help, not shown until one of the suggestions is selected and specific to that suggestion -->
-    <div *ngIf="showHelp" id="typeahead-help" class="overflow-hidden">
-      <ng-container *ngIf="activeResult.type === 'search-global'">
-        <div class="d-flex justify-content-between">
-          <label class="small-title" i18n>GLOBAL SEARCH</label>
-          <div class="advanced-search-status text-muted">
-            <span *ngIf="serverConfig" class="mr-1" i18n>using {{ serverConfig.followings.instance.autoFollowIndex.indexUrl }}</span>
-            <i class="glyphicon glyphicon-globe"></i>
-          </div>
+    <div *ngIf="showSearchGlobalHelp()" id="typeahead-help" class="overflow-hidden">
+      <div class="d-flex justify-content-between">
+        <label class="small-title" i18n>GLOBAL SEARCH</label>
+        <div class="advanced-search-status text-muted">
+          <span *ngIf="serverConfig" class="mr-1" i18n>using {{ serverConfig.search.searchIndex.url }}</span>
+          <i class="glyphicon glyphicon-globe"></i>
         </div>
-        <div class="text-muted" i18n>Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.</div>
-      </ng-container>
+      </div>
+      <div class="text-muted" i18n>Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.</div>
     </div>
 
     <!-- search instructions, when search input is empty -->
-    <div *ngIf="areInstructionsDisplayed" id="typeahead-instructions" class="overflow-hidden">
-      <div class="d-flex justify-content-between">
+    <div *ngIf="areInstructionsDisplayed()" id="typeahead-instructions" class="overflow-hidden">
+      <span class="text-muted" i18n>Your query will be matched against video names or descriptions, channel names.</span>
+      <div class="d-flex justify-content-between mt-3">
         <label class="small-title" i18n>ADVANCED SEARCH</label>
         <div class="advanced-search-status c-help">
           <span [ngClass]="canSearchAnyURI ? 'text-success' : 'text-muted'" i18n-title title="Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows.">
-            <span *ngIf="canSearchAnyURI" class="mr-1" i18n>any instance</span>
-            <span *ngIf="!canSearchAnyURI" class="mr-1" i18n>only followed instances</span>
-            <i [ngClass]="canSearchAnyURI ? 'glyphicon glyphicon-ok-sign' : 'glyphicon glyphicon-exclamation-sign'"></i>
+            <span *ngIf="canSearchAnyURI()" class="mr-1" i18n>any instance</span>
+            <span *ngIf="!canSearchAnyURI()" class="mr-1" i18n>only followed instances</span>
+            <i [ngClass]="canSearchAnyURI() ? 'glyphicon glyphicon-ok-sign' : 'glyphicon glyphicon-exclamation-sign'"></i>
           </span>
         </div>
       </div>
       <ul>
         <li>
-          <em>@channel_id@domain</em> <span class="flex-auto text-muted" i18n>channel</span>
+          <em>@channel_id@domain</em> <span class="flex-auto text-muted" i18n>will list the matching channel</span>
         </li>
         <li>
-          <em>URL</em> <span class="text-muted" i18n>channel</span>
+          <em>URL</em> <span class="text-muted" i18n>will list the matching channel</span>
         </li>
         <li>
-          <em>UUID</em> <span class="text-muted" i18n>video</span>
+          <em>UUID</em> <span class="text-muted" i18n>will list the matching video</span>
         </li>
       </ul>
-      <span class="text-muted" i18n>Any other text will return matching video or channel names.</span>
     </div>
   </div>