-<div class="d-inline-flex position-relative" id="typeahead-container" #contentWrapper>
- <ng-content></ng-content>
+<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)="handleKey($event)" (keydown.enter)="doSearch()"
+ >
+ <span class="icon icon-search" (click)="doSearch()"></span>
<div class="position-absolute jump-to-suggestions">
<!-- suggestions -->
- <my-suggestions *ngIf="hasSearch && newSearch" [results]="results" [highlight]="searchInput.value" (init)="initKeyboardEventsManager($event)" #suggestions></my-suggestions>
+ <my-suggestions *ngIf="search && newSearch" [results]="results" [highlight]="search" (init)="initKeyboardEventsManager($event)"></my-suggestions>
<!-- 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>
+ <label class="small-title" i18n>GLOBAL SEARCH</label>
<div class="advanced-search-status text-muted">
- <span class="mr-1" i18n>using {{ globalSearchIndex }}</span>
+ <span *ngIf="serverConfig" class="mr-1" i18n>using {{ serverConfig.followings.instance.autoFollowIndex.indexUrl }}</span>
<i class="glyphicon glyphicon-globe"></i>
</div>
</div>
</div>
<!-- search instructions, when search input is empty -->
- <div *ngIf="!hasSearch" id="typeahead-instructions" class="overflow-hidden">
+ <div *ngIf="areInstructionsDisplayed" id="typeahead-instructions" class="overflow-hidden">
<div class="d-flex justify-content-between">
- <label class="small-title" i18n>Advanced search</label>
+ <label class="small-title" i18n>ADVANCED SEARCH</label>
<div class="advanced-search-status c-help">
- <span [ngClass]="URIPolicy === 'any' ? 'text-success' : 'text-muted'" [title]="URIPolicyText">
- <span class="mr-1" i18n>{URIPolicy, select, only-followed {only followed instances} other {any instance}} </span>
- <i [ngClass]="URIPolicy === 'any' ? 'glyphicon glyphicon-ok-sign' : 'glyphicon glyphicon-exclamation-sign'"></i>
+ <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>
</div>
</div>
<ul>
<li>
- <em>@username@domain</em> <span class="flex-auto text-muted" i18n>account or channel</span>
+ <em>@channel_id@domain</em> <span class="flex-auto text-muted" i18n>channel</span>
</li>
<li>
- <em>URL</em> <span class="text-muted" i18n>account or channel</span>
+ <em>URL</em> <span class="text-muted" i18n>channel</span>
</li>
<li>
- <em>URL</em> <span class="text-muted" i18n>video</span>
+ <em>UUID</em> <span class="text-muted" i18n>video</span>
</li>
</ul>
- <span class="text-muted" i18n>Any other text will return matching video, channel or account names.</span>
+ <span class="text-muted" i18n>Any other text will return matching video or channel names.</span>
</div>
</div>