Changes for page Solr Search Macros

Last modified by Bimit Administrator on 05.12.2023, 13:23
From version 1.1
edited by Bimit Administrator
on 03.02.2022, 10:17
Change comment: Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/13.10.2]
To version 2.1
edited by Bimit Administrator
on 05.12.2023, 13:23
Change comment: Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/15.10]

Summary

Details

Page properties
Content
... ... @@ -29,7 +29,10 @@
29 29   </div>
30 30   <div class="col-xs-12 col-sm-6">
31 31   <div class="input-group">
32 - <input type="search" name="text" class="form-control withTip useTitleAsTip"
32 + <label class='sr-only' for='search-page-bar-input'>
33 + $services.localization.render('search.page.bar.query.title')
34 + </label>
35 + <input id='search-page-bar-input' type='search' name='text' class='form-control withTip useTitleAsTip'
33 33   title="$services.localization.render('search.page.bar.query.title')" value="$escapetool.xml($text)"/>
34 34   <span class="input-group-btn">
35 35   <button type="submit" class="btn btn-primary">
... ... @@ -178,11 +178,18 @@
178 178   #else
179 179   #set ($facetPrettyName = $facetField.name)
180 180   #end
181 - <div class="search-facet-header">$escapetool.xml($facetPrettyName)</div>
184 + <div class="search-facet-header">
185 + <span id="$escapetool.xml($facetField.name)-toggler-hint">$escapetool.xml($facetPrettyName)</span>
186 + <button class="btn btn-xs facet-toggler"
187 + aria-controls="$escapetool.xml($facetField.name)-dropdown"
188 + aria-labelledby="$escapetool.xml($facetField.name)-toggler-hint">
189 + $services.icon.renderHTML('caret-down')
190 + </button>
191 + </div>
182 182  #end
183 183  
184 184  #macro (displaySearchFacetBody $facetField)
185 - <div class="search-facet-body">
195 + <div id="$escapetool.xml($facetField.name)-dropdown" class="search-facet-body">
186 186   #set ($facetDisplayer = $solrConfig.facetDisplayers.get($facetField.name))
187 187   #if (!$facetDisplayer && $facetField.name.startsWith('property.'))
188 188   ## Choose a facet displayer based on the property type.
... ... @@ -232,6 +232,10 @@
232 232  #end
233 233  
234 234  #macro (displaySearchFacetValue $facetValue $customQueryStringParameters $customValueDisplayer)
245 + #displaySearchFacetValue($facetValue $customQueryStringParameters $customValueDisplayer false)
246 +#end
247 +
248 +#macro (displaySearchFacetValue $facetValue $customQueryStringParameters $customValueDisplayer $displayToggler)
235 235   #set ($selectedValues = [])
236 236   #if ($facetRequestValues)
237 237   #set ($discard = $selectedValues.addAll($facetRequestValues.subList(0, $facetRequestValues.size())))
... ... @@ -246,7 +246,6 @@
246 246   #set ($discard = $queryStringParameters.putAll($customQueryStringParameters))
247 247   #end
248 248   #extendQueryString($url $queryStringParameters)
249 - <div class="itemCount">$facetValue.count</div>
250 250   <a href="$url" class="itemName#if ($selected) selected#end#if ($facetValue.name == '') empty#end">
251 251   #if ($facetValue.name == '')
252 252   #set ($facetPrettyValueKey = "solr.field.${facetField.name}.emptyValue")
... ... @@ -263,7 +263,13 @@
263 263   $escapetool.xml($facetPrettyValue)
264 264   #end
265 265   </a>
266 - <div class="clearfloats"></div>
279 + <div class="itemCount">$facetValue.count</div>
280 + #if ($displayToggler)
281 + <button class="btn btn-xs facet-value-toggler">
282 + <span class='sr-only'>$escapetool.xml($facetPrettyValue)</span>
283 + $services.icon.renderHTML('caret-down')
284 + </button>
285 + #end
267 267  #end
268 268  
269 269  #**