Changes for page Solr Search Macros

Last modified by Bimit Administrator on 05.12.2023, 13:23
From 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]
To 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]

Summary

Details

Page properties
Content
... ... @@ -29,10 +29,7 @@
29 29   </div>
30 30   <div class="col-xs-12 col-sm-6">
31 31   <div class="input-group">
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'
32 + <input type="search" name="text" class="form-control withTip useTitleAsTip"
36 36   title="$services.localization.render('search.page.bar.query.title')" value="$escapetool.xml($text)"/>
37 37   <span class="input-group-btn">
38 38   <button type="submit" class="btn btn-primary">
... ... @@ -181,18 +181,11 @@
181 181   #else
182 182   #set ($facetPrettyName = $facetField.name)
183 183   #end
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>
181 + <div class="search-facet-header">$escapetool.xml($facetPrettyName)</div>
192 192  #end
193 193  
194 194  #macro (displaySearchFacetBody $facetField)
195 - <div id="$escapetool.xml($facetField.name)-dropdown" class="search-facet-body">
185 + <div class="search-facet-body">
196 196   #set ($facetDisplayer = $solrConfig.facetDisplayers.get($facetField.name))
197 197   #if (!$facetDisplayer && $facetField.name.startsWith('property.'))
198 198   ## Choose a facet displayer based on the property type.
... ... @@ -242,10 +242,6 @@
242 242  #end
243 243  
244 244  #macro (displaySearchFacetValue $facetValue $customQueryStringParameters $customValueDisplayer)
245 - #displaySearchFacetValue($facetValue $customQueryStringParameters $customValueDisplayer false)
246 -#end
247 -
248 -#macro (displaySearchFacetValue $facetValue $customQueryStringParameters $customValueDisplayer $displayToggler)
249 249   #set ($selectedValues = [])
250 250   #if ($facetRequestValues)
251 251   #set ($discard = $selectedValues.addAll($facetRequestValues.subList(0, $facetRequestValues.size())))
... ... @@ -260,6 +260,7 @@
260 260   #set ($discard = $queryStringParameters.putAll($customQueryStringParameters))
261 261   #end
262 262   #extendQueryString($url $queryStringParameters)
249 + <div class="itemCount">$facetValue.count</div>
263 263   <a href="$url" class="itemName#if ($selected) selected#end#if ($facetValue.name == '') empty#end">
264 264   #if ($facetValue.name == '')
265 265   #set ($facetPrettyValueKey = "solr.field.${facetField.name}.emptyValue")
... ... @@ -276,13 +276,7 @@
276 276   $escapetool.xml($facetPrettyValue)
277 277   #end
278 278   </a>
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
266 + <div class="clearfloats"></div>
286 286  #end
287 287  
288 288  #**