Aller au contenu

Modifications pour le document Solr Search Macros

Modifié par Florent Charton le 2026/03/13 11:04
Depuis la version 3.1
modifié par Florent Charton
sur 2026/01/08 10:59
Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/17.4.8]
À la version 1.1
modifié par superadmin
sur 2022/06/20 08:49
Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-search-solr-ui/13.10.6]

Résumé

Détails

Propriétés de la Page
Auteur du document
... ... @@ -1,1 +1,1 @@
1 -xwiki:XWiki.fcharton
1 +XWiki.superadmin
Contenu
... ... @@ -29,11 +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'
36 - placeholder="$services.localization.render('search.page.bar.query.title')"
32 + <input type="search" name="text" class="form-control withTip useTitleAsTip"
37 37   title="$services.localization.render('search.page.bar.query.title')" value="$escapetool.xml($text)"/>
38 38   <span class="input-group-btn">
39 39   <button type="submit" class="btn btn-primary">
... ... @@ -182,18 +182,11 @@
182 182   #else
183 183   #set ($facetPrettyName = $facetField.name)
184 184   #end
185 - <div class="search-facet-header">
186 - <span id="$escapetool.xml($facetField.name)-toggler-hint">$escapetool.xml($facetPrettyName)</span>
187 - <button class="btn btn-xs facet-toggler"
188 - aria-controls="$escapetool.xml($facetField.name)-dropdown"
189 - aria-labelledby="$escapetool.xml($facetField.name)-toggler-hint">
190 - $services.icon.renderHTML('caret-down')
191 - </button>
192 - </div>
181 + <div class="search-facet-header">$escapetool.xml($facetPrettyName)</div>
193 193  #end
194 194  
195 195  #macro (displaySearchFacetBody $facetField)
196 - <div id="$escapetool.xml($facetField.name)-dropdown" class="search-facet-body">
185 + <div class="search-facet-body">
197 197   #set ($facetDisplayer = $solrConfig.facetDisplayers.get($facetField.name))
198 198   #if (!$facetDisplayer && $facetField.name.startsWith('property.'))
199 199   ## Choose a facet displayer based on the property type.
... ... @@ -243,10 +243,6 @@
243 243  #end
244 244  
245 245  #macro (displaySearchFacetValue $facetValue $customQueryStringParameters $customValueDisplayer)
246 - #displaySearchFacetValue($facetValue $customQueryStringParameters $customValueDisplayer false)
247 -#end
248 -
249 -#macro (displaySearchFacetValue $facetValue $customQueryStringParameters $customValueDisplayer $displayToggler)
250 250   #set ($selectedValues = [])
251 251   #if ($facetRequestValues)
252 252   #set ($discard = $selectedValues.addAll($facetRequestValues.subList(0, $facetRequestValues.size())))
... ... @@ -261,6 +261,7 @@
261 261   #set ($discard = $queryStringParameters.putAll($customQueryStringParameters))
262 262   #end
263 263   #extendQueryString($url $queryStringParameters)
249 + <div class="itemCount">$facetValue.count</div>
264 264   <a href="$url" class="itemName#if ($selected) selected#end#if ($facetValue.name == '') empty#end">
265 265   #if ($facetValue.name == '')
266 266   #set ($facetPrettyValueKey = "solr.field.${facetField.name}.emptyValue")
... ... @@ -277,13 +277,7 @@
277 277   $escapetool.xml($facetPrettyValue)
278 278   #end
279 279   </a>
280 - <div class="itemCount">$facetValue.count</div>
281 - #if ($displayToggler)
282 - <button class="btn btn-xs facet-value-toggler">
283 - <span class='sr-only'>$escapetool.xml($facetPrettyValue)</span>
284 - $services.icon.renderHTML('caret-down')
285 - </button>
286 - #end
266 + <div class="clearfloats"></div>
287 287  #end
288 288  
289 289  #**
... ... @@ -799,7 +799,10 @@
799 799   #end
800 800   ##
801 801   ## Pagination
802 - #getAndValidateQueryLimitFromRequest('rows', 10, $rows)
782 + #set ($rows = $numbertool.toNumber($request.rows).intValue())
783 + #if ("$!rows" == '')
784 + #set ($rows = 10)
785 + #end
803 803   #set ($start = $numbertool.toNumber($request.firstIndex).intValue())
804 804   #if ("$!start" == '')
805 805   #set ($start = 0)
... ... @@ -911,7 +911,8 @@
911 911   ##
912 912   ## Output the feed.
913 913   ##
914 - #rawResponse($xwiki.feed.getFeedOutput($feed, 'rss_2.0'), 'application/rss+xml')
897 + #set ($discard = $response.setContentType('application/rss+xml'))
898 + $xwiki.feed.getFeedOutput($feed, 'rss_2.0')
915 915  #end
916 916  
917 917  #macro (handleSolrSearchRequest)