mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
UX: Show spinner when searching on full page search.
This commit is contained in:
Guo Xiang Tan
parent
f8be43644b
commit
bc81f64a64
@ -59,105 +59,109 @@
|
|||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
|
{{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
|
||||||
|
|
||||||
<div class="search-results">
|
{{#unless searching}}
|
||||||
{{#load-more selector=".fps-result" action=(action "loadMore")}}
|
<div class="search-results">
|
||||||
{{#each model.posts as |result|}}
|
{{#load-more selector=".fps-result" action=(action "loadMore")}}
|
||||||
<div class='fps-result'>
|
{{#each model.posts as |result|}}
|
||||||
<div class='author'>
|
<div class='fps-result'>
|
||||||
<a href={{result.userPath}} data-user-card="{{unbound result.username}}">
|
<div class='author'>
|
||||||
{{avatar result imageSize="large"}}
|
<a href={{result.userPath}} data-user-card="{{unbound result.username}}">
|
||||||
</a>
|
{{avatar result imageSize="large"}}
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class='fps-topic'>
|
|
||||||
<div class='topic'>
|
|
||||||
{{#if bulkSelectEnabled}}
|
|
||||||
{{track-selected selectedList=selected selectedId=result.topic}}
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
<a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
|
|
||||||
{{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
|
|
||||||
</a>
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class='search-category'>
|
<div class='fps-topic'>
|
||||||
{{#if result.topic.category.parentCategory}}
|
<div class='topic'>
|
||||||
{{category-link result.topic.category.parentCategory}}
|
{{#if bulkSelectEnabled}}
|
||||||
|
{{track-selected selectedList=selected selectedId=result.topic}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{category-link result.topic.category hideParent=true}}
|
|
||||||
{{#each result.topic.tags as |tag|}}
|
<a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
|
||||||
{{discourse-tag tag isPrivateMessage=isPrivateMessage}}
|
{{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
|
||||||
{{/each}}
|
</a>
|
||||||
{{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
|
|
||||||
|
<div class='search-category'>
|
||||||
|
{{#if result.topic.category.parentCategory}}
|
||||||
|
{{category-link result.topic.category.parentCategory}}
|
||||||
|
{{/if}}
|
||||||
|
{{category-link result.topic.category hideParent=true}}
|
||||||
|
{{#each result.topic.tags as |tag|}}
|
||||||
|
{{discourse-tag tag isPrivateMessage=isPrivateMessage}}
|
||||||
|
{{/each}}
|
||||||
|
{{plugin-outlet name="full-page-search-category" args=(hash result=result)}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class='blurb container'>
|
<div class='blurb container'>
|
||||||
<span class='date'>
|
<span class='date'>
|
||||||
{{format-age result.created_at}}
|
{{format-age result.created_at}}
|
||||||
{{#if result.blurb}}
|
{{#if result.blurb}}
|
||||||
-
|
-
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</span>
|
|
||||||
|
|
||||||
{{#if result.blurb}}
|
|
||||||
{{#highlight-text highlight=highlightQuery}}
|
|
||||||
{{{unbound result.blurb}}}
|
|
||||||
{{/highlight-text}}
|
|
||||||
{{/if}}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{#if showLikeCount}}
|
|
||||||
{{#if result.like_count}}
|
|
||||||
<span class='like-count'>
|
|
||||||
{{result.like_count}} {{d-icon "heart"}}
|
|
||||||
</span>
|
</span>
|
||||||
{{/if}}
|
|
||||||
{{/if}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/each}}
|
|
||||||
|
|
||||||
{{#conditional-loading-spinner condition=loading }}
|
{{#if result.blurb}}
|
||||||
{{#unless hasResults}}
|
{{#highlight-text highlight=highlightQuery}}
|
||||||
{{#if searchActive}}
|
{{{unbound result.blurb}}}
|
||||||
<h3>{{i18n "search.no_results"}}</h3>
|
{{/highlight-text}}
|
||||||
|
|
||||||
{{#if showSuggestion}}
|
|
||||||
<div class="no-results-suggestion">
|
|
||||||
{{i18n "search.cant_find"}}
|
|
||||||
{{#if canCreateTopic}}
|
|
||||||
<a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
|
|
||||||
{{#unless siteSettings.login_required}}
|
|
||||||
{{i18n "search.or_search_google"}}
|
|
||||||
{{/unless}}
|
|
||||||
{{else}}
|
|
||||||
{{i18n "search.search_google"}}
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{google-search searchTerm=searchTerm}}
|
{{#if showLikeCount}}
|
||||||
{{/if}}
|
{{#if result.like_count}}
|
||||||
{{/if}}
|
<span class='like-count'>
|
||||||
{{/unless}}
|
{{result.like_count}} {{d-icon "heart"}}
|
||||||
|
</span>
|
||||||
{{#if hasResults}}
|
|
||||||
{{#unless loading}}
|
|
||||||
<h3 class="search-footer">
|
|
||||||
{{#if model.grouped_search_result.more_full_page_results}}
|
|
||||||
{{#if isLastPage }}
|
|
||||||
{{i18n "search.more_results"}}
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{else}}
|
|
||||||
{{i18n "search.no_more_results"}}
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</h3>
|
</div>
|
||||||
|
</div>
|
||||||
|
{{/each}}
|
||||||
|
|
||||||
|
{{#conditional-loading-spinner condition=loading }}
|
||||||
|
{{#unless hasResults}}
|
||||||
|
{{#if searchActive}}
|
||||||
|
<h3>{{i18n "search.no_results"}}</h3>
|
||||||
|
|
||||||
|
{{#if showSuggestion}}
|
||||||
|
<div class="no-results-suggestion">
|
||||||
|
{{i18n "search.cant_find"}}
|
||||||
|
{{#if canCreateTopic}}
|
||||||
|
<a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
|
||||||
|
{{#unless siteSettings.login_required}}
|
||||||
|
{{i18n "search.or_search_google"}}
|
||||||
|
{{/unless}}
|
||||||
|
{{else}}
|
||||||
|
{{i18n "search.search_google"}}
|
||||||
|
{{/if}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{google-search searchTerm=searchTerm}}
|
||||||
|
{{/if}}
|
||||||
|
{{/if}}
|
||||||
{{/unless}}
|
{{/unless}}
|
||||||
{{/if}}
|
|
||||||
{{/conditional-loading-spinner}}
|
{{#if hasResults}}
|
||||||
{{/load-more}}
|
{{#unless loading}}
|
||||||
</div>
|
<h3 class="search-footer">
|
||||||
|
{{#if model.grouped_search_result.more_full_page_results}}
|
||||||
|
{{#if isLastPage }}
|
||||||
|
{{i18n "search.more_results"}}
|
||||||
|
{{/if}}
|
||||||
|
{{else}}
|
||||||
|
{{i18n "search.no_more_results"}}
|
||||||
|
{{/if}}
|
||||||
|
</h3>
|
||||||
|
{{/unless}}
|
||||||
|
{{/if}}
|
||||||
|
{{/conditional-loading-spinner}}
|
||||||
|
{{/load-more}}
|
||||||
|
</div>
|
||||||
|
{{else}}
|
||||||
|
{{loading-spinner size="medium"}}
|
||||||
|
{{/unless}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="search-advanced-sidebar">
|
<div class="search-advanced-sidebar">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user