Skip to content

Commit 744db54

Browse files
BlokeBloke
committed
Import Oleg's search changes in default.txp
Can now search solely by compatibility if you wish. See #17.
1 parent 21fc84c commit 744db54

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

‎src/templates/pages/default.txp‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<!DOCTYPE html>
2+
<txp:output_form yield="head, body_header, body_footer" />
23
<html lang="en-GB-oxendict">
34
<head>
45
<txp:output_form form="head" />
5-
<txp:if_search>
6+
<txp:if_article_list type="q, compatibility">
67
<title>Search results / Textpattern CMS plugins</title>
78
<meta name="description" content="Search results.">
89
<meta name="robots" content="none">
@@ -43,7 +44,7 @@
4344
</script>
4445
<txp:variable name="homepage" value="1" />
4546
</txp:if_category>
46-
</txp:if_search>
47+
</txp:if_article_list>
4748
<txp:variable name="min-txp-version-unverified" value='<txp:category_list type="file" parent="txp-version" exclude="txp-version,any" limit="1"><txp:category title /></txp:category_list>' />
4849
<txp:variable name="max-txp-version-unverified" value='<txp:category_list type="file" parent="txp-version" exclude="txp-version,any" limit="1" sort="name desc"><txp:category title /></txp:category_list>' />
4950
</head>
@@ -103,7 +104,7 @@
103104
</div>
104105
</main>
105106
<txp:else />
106-
<txp:if_search>
107+
<txp:if_article_list type="q, compatibility">
107108
<txp:variable name="compatibility" value='<txp:page_url type="compatibility" />' />
108109
<txp:if_variable name="compatibility">
109110
<txp:if_variable name="compatibility" value="Any">
@@ -114,38 +115,39 @@
114115
<txp:else />
115116
<txp:article pgonly limit="12" />
116117
</txp:if_variable>
118+
<txp:variable name="pages" value='<txp:pages total />' />
117119
<body itemscope itemtype="https://schema.org/SearchResultsPage">
118120
<txp:output_form form="body_header" />
119121
<main aria-label="Main content">
120122
<txp:search_input />
121123
<div class="wrapper-inner">
122124
<div class="container">
123125
<h1 itemprop="name">Search results</h1>
124-
<txp:if_search_results max="96">
126+
<txp:if_variable name="pages" value="^[1-8]$" match="pattern">
125127
<div class="article-description" itemprop="description">
126-
<p><txp:search_result_count text="plugin(s) found" /> matching your search request <q><txp:search_term /></q>.</p>
128+
<p><txp:search_result_count text="plugin(s) found" /><txp:search_term wraptag=" matching your search request <q><+></q>" />.</p>
127129
</div>
128130
<txp:if_variable name="compatibility">
129131
<txp:if_variable name="compatibility" value="Any">
130-
<txp:article searchform="article_listing" limit="12" wraptag="div" class="layout-container" />
132+
<txp:article form="article_listing" searchform="article_listing" limit="12" wraptag="div" class="layout-container" />
131133
<txp:else />
132-
<txp:article min-txp-version-verified='%%<txp:page_url type="compatibility" />' max-txp-version-verified='<txp:page_url type="compatibility" />%%' searchform="article_listing" limit="12" wraptag="div" class="layout-container" />
134+
<txp:article min-txp-version-verified='%%<txp:page_url type="compatibility" />' max-txp-version-verified='<txp:page_url type="compatibility" />%%' form="article_listing" searchform="article_listing" limit="12" wraptag="div" class="layout-container" />
133135
</txp:if_variable>
134136
<txp:else />
135-
<txp:article searchform="article_listing" limit="12" wraptag="div" class="layout-container" />
137+
<txp:article form="article_listing" searchform="article_listing" limit="12" wraptag="div" class="layout-container" />
136138
</txp:if_variable>
137-
<txp:output_form form="pagination" />
139+
<txp:page_url context="s,q,compatibility"><txp:output_form form="pagination" /></txp:page_url>
138140
<txp:else />
139141
<div class="article-description" itemprop="description">
140-
<txp:if_search_results>
142+
<txp:if_variable name="pages" value>
141143
<p>It seems like you are looking for a very common search term, maybe try a more specific phrase than <q><txp:search_term /></q>.</p>
142144
<txp:else />
143145
<p>Sorry, no results were found matching your search request <q><txp:search_term /></q>.</p>
144-
</txp:if_search_results>
146+
</txp:if_variable>
145147
</div>
146148
<p>Please try another search term or <a href="<txp:site_url />">return to the Textpattern plugins homepage</a>.</p>
147149
<p><img loading="lazy" class="dark-contrast" width="556" height="406" alt="Page error" src="https://textpattern.com/assets/img/com/error.png" srcset="https://textpattern.com/assets/img/com/error@2x.png 2x"></p>
148-
</txp:if_search_results>
150+
</txp:if_variable>
149151
</div>
150152
</div>
151153
</main>
@@ -164,8 +166,8 @@
164166
<txp:output_form form="pagination" />
165167
</div>
166168
</main>
167-
</txp:if_search>
169+
</txp:if_article_list>
168170
</txp:if_variable>
169171
<txp:output_form form="body_footer" />
170172
</body>
171-
</html>
173+
</html>

0 commit comments

Comments
 (0)