diff --git a/assets/javascripts/discourse/templates/components/docs-search.hbs b/assets/javascripts/discourse/templates/components/docs-search.hbs index 2a23d9a..25da2f5 100644 --- a/assets/javascripts/discourse/templates/components/docs-search.hbs +++ b/assets/javascripts/discourse/templates/components/docs-search.hbs @@ -1,20 +1,20 @@ - {{input - type="text" - value=(readonly searchTerm) - input=(action "onSearchTermChange" value="target.value") + {{#if searchTerm}} - {{d-button - action=(action "clearSearch") + {{else}} {{d-icon "search"}} {{/if}} diff --git a/assets/javascripts/discourse/templates/components/docs-topic-list.hbs b/assets/javascripts/discourse/templates/components/docs-topic-list.hbs index d1262a4..4b50238 100644 --- a/assets/javascripts/discourse/templates/components/docs-topic-list.hbs +++ b/assets/javascripts/discourse/templates/components/docs-topic-list.hbs @@ -1,4 +1,4 @@ -{{#load-more selector=".topic-list tr" action=loadMore}} +
@@ -32,6 +32,6 @@ {{/each}}
-{{/load-more}} +
-{{conditional-loading-spinner condition=loading}} \ No newline at end of file + \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/components/docs-topic.hbs b/assets/javascripts/discourse/templates/components/docs-topic.hbs index 3d7945b..1f832f4 100644 --- a/assets/javascripts/discourse/templates/components/docs-topic.hbs +++ b/assets/javascripts/discourse/templates/components/docs-topic.hbs @@ -1,9 +1,14 @@ -{{d-button label="docs.topic.back" class="docs-nav-link return" action=return}} +

{{html-safe topic.fancyTitle}}

- {{mount-widget widget="post" model=model args=post}} + {{! template-lint-disable no-capital-arguments }} +
@@ -11,4 +16,6 @@ {{i18n "docs.topic.navigate_to_topic"}} -{{plugin-outlet name="after-docs-topic" tagName="span" connectorTagName="div"}} \ No newline at end of file + + + \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/docs-index.hbs b/assets/javascripts/discourse/templates/docs-index.hbs index 4c0c36e..9aabdb4 100644 --- a/assets/javascripts/discourse/templates/docs-index.hbs +++ b/assets/javascripts/discourse/templates/docs-index.hbs @@ -1,16 +1,16 @@ -{{#conditional-loading-spinner condition=isLoading}} + {{#if noContent}} {{else}}
{{#if site.mobileView}} {{#unless selectedTopic}} - {{d-button + {{/unless}} {{/if}} @@ -19,12 +19,15 @@ {{#if canFilterSolved}}
@@ -35,35 +38,35 @@

{{i18n "docs.categories"}}

- {{d-button - class=(if + + +
{{#if showCategoryFilter}} - {{input - value=categoryFilter + {{/if}}
    {{#each sortedCategories as |category|}} @@ -85,42 +88,44 @@

    {{i18n "docs.tags"}}

    - {{d-button - class=(if + + +
    {{#if showTagFilter}} - {{input - value=tagFilter + {{/if}} - {{plugin-outlet - name="before-docs-tag-list" - tagName="" - connectorTagName="div" - args=(hash tags=tags updateSelectedTags=updateSelectedTags) - }} +
      {{#each sortedTags as |tag|}}
    • @@ -137,14 +142,10 @@
{{#if selectedTopic}} - {{#conditional-loading-spinner condition=isTopicLoading}} + {{docs-topic topic=topic return=(action "returnToList")}} - {{plugin-outlet - name="below-docs-topic" - tagName="" - connectorTagName="div" - }} - {{/conditional-loading-spinner}} + + {{else}}
{{#if isSearchingOrFiltered}} @@ -152,11 +153,12 @@
{{i18n "search.no_results"}}
- {{plugin-outlet - name="after-docs-empty-results" - tagName="span" - connectorTagName="div" - }} + + + {{else}}
{{i18n "docs.search.results" count=topicCount}} @@ -178,4 +180,4 @@ {{/if}}
{{/if}} -{{/conditional-loading-spinner}} \ No newline at end of file + \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/docs.hbs b/assets/javascripts/discourse/templates/docs.hbs index 9876721..c2751f6 100644 --- a/assets/javascripts/discourse/templates/docs.hbs +++ b/assets/javascripts/discourse/templates/docs.hbs @@ -1,15 +1,16 @@
- {{plugin-outlet - name="before-docs-search" - tagName="span" - connectorTagName="div" - args=(hash - selectCategory=(action "updateSelectedCategories") - selectTag=(action "updateSelectedTags") - tags=indexController.tags - categories=indexController.categories - ) - }} + + + {{docs-search searchTerm=(readonly indexController.searchTerm)