Merge branch 'master' into self-hosted

philwareham · philwareham · commit f48e352d92b9 · 2021-05-20T08:53:11.000+01:00
diff --git a/_includes/ads-article.html b/_includes/ads-article.html
diff --git a/_includes/ads-homepage.html b/_includes/ads-homepage.html
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -14,7 +14,7 @@
     {% seo title=false %}
 </head>
 
-<body itemscope itemtype="https://schema.org/WebPage">
+<body itemscope itemtype="https://schema.org/WebPage" class="homepage">
 
 {% include header.html %}
 
diff --git a/index.md b/index.md
@@ -15,7 +15,7 @@ Documentation for Textpattern’s out-of-the-box functionality. [Editorial contr
 <div class="layout-container index-docs">
 <section class="layout-3col">
 
-### Installation handling
+## Installation handling
 {: .index-docs-start}
 
 * [Installing the software](/setup/installing-the-software)
@@ -30,7 +30,7 @@ Documentation for Textpattern’s out-of-the-box functionality. [Editorial contr
 </section>
 <section class="layout-3col">
 
-### Site administration
+## Site administration
 {: .index-docs-admin}
 
 * [Textpattern administration](/administration/) (explanations of principle functionality)
@@ -41,7 +41,7 @@ Documentation for Textpattern’s out-of-the-box functionality. [Editorial contr
 </section>
 <section class="layout-3col">
 
-### Tags
+## Tags
 {: .index-docs-tags}
 
 <section>
@@ -66,7 +66,7 @@ Documentation for Textpattern’s out-of-the-box functionality. [Editorial contr
 </section>
 <section class="layout-3col">
 
-### Themes
+## Themes
 {: .index-docs-theme}
 
 * [Themes: Creating, using, and sharing](/build/themes-creating-using-and-sharing)
@@ -77,7 +77,7 @@ Documentation for Textpattern’s out-of-the-box functionality. [Editorial contr
 </section>
 <section class="layout-3col">
 
-### Development
+## Development
 {: .index-docs-dev}
 
 * [Plugin development](/development/)
@@ -88,7 +88,7 @@ Documentation for Textpattern’s out-of-the-box functionality. [Editorial contr
 </section>
 <section class="layout-3col">
 
-### Tutorials and FAQs
+## Tutorials and FAQs
 {: .index-docs-faqs}
 
 * [Textpattern basic tutorial](/faqs/textpattern-basic-tutorial)
diff --git a/index2.md b/index2.md
@@ -15,23 +15,23 @@ Everything you need to use Textpattern out-of-the-box and make website managemen
 <div class="layout-container index-docs">
 <section class="layout-3col">
 
-### Setup and Configuration
+## Setup and Configuration
 {: .index-docs-admin}
 
 {% include index-lists-setup.html %}
 
 </section>
 <section class="layout-3col">
 
-### Construction and Presentation
+## Construction and Presentation
 {: .index-docs-start}
 
 {% include index-lists-build.html %}
 
 </section>
 <section class="layout-3col">
 
-### Tags and Attributes
+## Tags and Attributes
 {: .index-docs-tags}
 
 {% include index-lists-tags.html %}
diff --git a/tags/search_input.md b/tags/search_input.md
@@ -86,7 +86,7 @@ When using a customized form template, Textpattern doesn't automatically wrap th
 
 Other tags used: [site_url](/tags/site_url).
 
-Note: When displaying search results, Textpattern will use a user defined form named `search_results`, or an internally defined default form if no search result form is nominated/defined.
+Note: When displaying search results, Textpattern will use the form named `search_results`, unless another form is nominated/defined via the `form` attribute or the tag's container.
 {: .alert-block .information}
 
 ### Example 3: Minimal search input form without label or button (yet still accessible)
diff --git a/tags/search_result_count.md b/tags/search_result_count.md
@@ -21,10 +21,11 @@ tags:
 <txp:search_result_count />
 ~~~
 
-The **search_result_count** tag is a *single* tag that returns the number of articles returned by an article tag. Use [if_search](/tags/if_search) to count search results or use in regular page after the [article](/tags/article) tag. If you need the results' count *before* the list of results, use the article tag in conjunction with `pgonly="1"` (see example 3).
+The **search_result_count** tag is a *single* tag that returns the number of (live) articles returned by an article tag.
 
-Note: The [if_search](/tags/if_search) conditional tag is required to recognize actual search results, without them the number of articles is returned by default.
-{: .alert-block .information}
+* Wrap with [if_search](/tags/if_search) tags to count search results.
+* Use in a regular article list page by wrapping with [if_article_list](/tags/if_article_list) to count articles in that section.
+* Use on the front (default) page to count the number of articles in sections with __On default page__ set to Yes.
 
 ## Attributes
 
@@ -36,44 +37,48 @@ Tag will accept the following attributes (**case-sensitive**) as well as the {%
 
 ## Examples
 
-### Example 1: Display a number of matches
+### Example 1: Display number of search matches or articles in current section
 
 ~~~ html
 <txp:if_search>
-    <txp:article />
     <txp:search_result_count />
+<txp:else />
+    <txp:if_article_list>
+        <txp:search_result_count text="articles" />
+    </txp:if_article_list>
 </txp:if_search>
+
+<txp:article />
 ~~~
 
-If the visitor is searching for articles, it will show the number of articles that matched the search term (e.g. 5) as follows: `5 articles found`.
+If the visitor is searching for articles, it will show the number of articles that matched the search term (e.g. 5) as follows: `5 articles found`. Otherwise, if Textpattern is displaying an article list, it will display the number of articles like this: `42 articles`.
 
-Other tags used: [article](/tags/article), [if_search](/tags/if_search).
+Note: The [if_search](/tags/if_search) conditional tag is required to recognize actual search results. Without it, the number of articles is returned by default.
+{: .alert-block .information}
 
-### Example 2: Number of matches with custom text
+Other tags used: [article](/tags/article), [if_search](/tags/if_search), [if_article_list](/tags/if_article_list).
+
+### Example 2: Number of matches, using custom text
 
 ~~~ html
-<txp:if_search>
+<txp:if_search_results>
     <txp:search_result_count text="hits" />
-</txp:if_search />
+</txp:if_search_results />
 ~~~
 
 Displays the number of articles returned (e.g. 5) as follows: `5 hits`.
 
-Other tags used: [if_search](/tags/if_search).
+Other tags used: [if_search_results](/tags/if_search_results).
 
-### Example 3: Search result count above results
+### Example 3: Regular (live) article count
 
 ~~~ html
-<txp:if_search>
-    <txp:article pgonly="1" limit="20" />
-    <txp:search_result_count text="hits" />
+<txp:if_article_list>
+    <txp:search_result_count text="articles" />
     <txp:article limit="20" />
-</txp:if_search />
+</txp:if_article_list />
 ~~~
 
-Displays the number of articles returned (e.g. 5) as follows: `5 hits` - then displays results as an article listing.
-
-Note: The `pgonly` attribute sets the article tag to return pagination statistics without rendering the article list. Care must be taken to remain consistent with article tag attributes to keep statistics accurate.
-{: .alert-block .information}
+Displays the number of articles in the current section, then displays them as an article listing, 20 per page.
 
-Other tags used: [article](/tags/article), [if_search](/tags/if_search).
+Other tags used: [article](/tags/article), [if_article_list](/tags/if_article_list).
diff --git a/tags/search_result_title.md b/tags/search_result_title.md
@@ -32,12 +32,10 @@ This tag has no attributes of its own. It accepts only the {% include atts-globa
 ### Example 1: Display a hyperlinked title to an article
 
 ~~~ html
-<h3>
-    <txp:search_result_title />
-    <txp:search_result_date />
-</h3>
+<txp:search_result_title wraptag="h3" />
+<txp:posted wraptag="p" class="date" />
 ~~~
 
 In a search results form, this shows the title of an article that matched the visitor's search results, and its posted date.
 
-Other tags used: [search_result_date](/tags/search_result_date).
+Other tags used: [posted](/tags/posted).
