Skip to content

Commit 0b1e166

Browse files
timohundtimohund
committed
[TASK] Adapt to latest changes in EXT:solr dev-master
* Migrate template to bootstrap.css * Set overwritten template to key 100
1 parent 461956e commit 0b1e166

2 files changed

Lines changed: 114 additions & 84 deletions

File tree

‎Configuration/TypoScript/setup.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugin.tx_solr {
1919

2020
view {
2121
templateRootPaths {
22-
10 = EXT:solrfluidgrouping/Resources/Private/Templates/
22+
100 = EXT:solrfluidgrouping/Resources/Private/Templates/
2323
}
2424

2525
}

‎Resources/Private/Templates/Search/Results.html‎

Lines changed: 113 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -2,113 +2,143 @@
22
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
33
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
44

5-
<f:layout name="Main"/>
6-
7-
<f:section name="main">
5+
<f:layout name="Split"/>
86

7+
<f:section name="content">
98
<div id="tx-solr-search">
109

11-
<f:render partial="Search/Form" section="Form" arguments="{search:search, additionalFilters:additionalFilters, pluginNamespace: pluginNamespace, resultSet: resultSet}" />
12-
13-
<f:if condition="{resultSet.isAutoCorrected}">
14-
<f:then>
15-
<span class="searched-for">
16-
<s:translate key="no_results_nothing_found" arguments="{0: resultSet.initialQueryString}">Nothing found for "%s".</s:translate>
17-
<s:translate key="no_results_search_for_original" arguments="{0: resultSet.correctedQueryString}">Search instead for "%s".</s:translate>
18-
</span>
19-
</f:then>
20-
21-
<f:else>
22-
<f:if condition="{resultSet.usedQuery.keywordsCleaned}">
23-
<span class="searched-for">
24-
<s:translate key="results_searched_for" arguments="{0: resultSet.usedQuery.keywordsCleaned}">Searched for "%s"</s:translate>
25-
</span>
10+
<div class="row">
11+
<div class="tx-solr-search-form col-lg-8">
12+
<f:render partial="Search/Form" section="Form" arguments="{search:search, additionalFilters:additionalFilters, pluginNamespace: pluginNamespace, resultSet: resultSet}" />
13+
</div>
14+
15+
<div class="tx-solr-search-form col-lg-2 hidden-xs">&nbsp;</div>
16+
<div class="col-lg-2 hidden-xs">
17+
<f:if condition="{hasSearched}">
18+
<f:if condition="{resultSet.usedSearchRequest.contextTypoScriptConfiguration.searchSorting}">
19+
<f:render partial="Result/Sorting" section="Sorting" arguments="{resultSet:resultSet}" />
20+
</f:if>
2621
</f:if>
27-
</f:else>
28-
</f:if>
29-
30-
<f:if condition="{resultSet.hasSpellCheckingSuggestions}">
31-
<f:then>
32-
<s:translate key="didYouMean">Did you mean</s:translate>
33-
<f:for each="{resultSet.spellCheckingSuggestions}" as="suggestion">
34-
<f:link.page additionalParams="{q:suggestion.suggestion}" noCacheHash="1">{suggestion.suggestion}</f:link.page>
35-
</f:for> ?
36-
</f:then>
37-
</f:if>
38-
39-
<f:if condition="{resultSet.usedSearch.numberOfResults}">
40-
41-
<span class="result-found">
42-
<f:if condition="{resultSet.usedSearch.numberOfResults} == 1">
22+
</div>
23+
</div>
24+
25+
<div class="row">
26+
<div class="col-md-12">
27+
<f:render partial="Result/FacetsActive" section="FacetsActive" arguments="{resultSet:resultSet}" />
28+
</div>
29+
</div>
30+
<div class="row">
31+
<div class="hidden-xs col-md-12 query-debug">
32+
<s:debug.query />
33+
</div>
34+
</div>
35+
36+
<div class="row searchinfo">
37+
<div class="col-md-12">
38+
39+
<f:if condition="{resultSet.isAutoCorrected}">
4340
<f:then>
44-
<s:translate key="results_found.singular" arguments="{0:resultSet.usedSearch.queryTime}">Found 1 result in %d seconds</s:translate>
41+
<span class="searched-for">
42+
<s:translate key="no_results_nothing_found" arguments="{0: resultSet.initialQueryString}">Nothing found for "%s".</s:translate>
43+
<s:translate key="no_results_search_for_original" arguments="{0: resultSet.correctedQueryString}">Search instead for "%s".</s:translate>
44+
</span>
4545
</f:then>
46+
4647
<f:else>
47-
<s:translate key="results_found" arguments="{0:resultSet.usedSearch.numberOfResults, 1: resultSet.usedSearch.queryTime}">Found %d results in %d seconds</s:translate>
48+
<f:if condition="{resultSet.usedQuery.keywordsCleaned}">
49+
<span class="searched-for">
50+
<s:translate key="results_searched_for" arguments="{0: resultSet.usedQuery.keywordsCleaned}">Searched for "%s"</s:translate>
51+
</span>
52+
</f:if>
4853
</f:else>
4954
</f:if>
50-
</span>
51-
52-
<span class="result-range">
53-
<s:pageBrowserRange>
54-
<s:translate key="results_range" arguments="{0:from, 1: to, 2: total}">Results %d until %d of %d</s:translate>
55-
</s:pageBrowserRange>
56-
</span>
57-
</f:if>
5855

59-
<f:if condition="{hasSearched}">
60-
<f:if condition="{resultSet.usedSearch.numberOfResults}">
61-
<f:render partial="Result/PerPage" section="PerPage" arguments="{resultSet: resultSet}" />
62-
</f:if>
63-
64-
<f:if condition="{resultSet.searchresults.hasGroups}">
65-
<f:then>
66-
<f:for each="{resultSet.searchresults.groups}" as="group">
67-
<h2>{group.groupname}</h2>
56+
<f:if condition="{resultSet.hasSpellCheckingSuggestions}">
57+
<f:then>
58+
<s:translate key="didYouMean">Did you mean</s:translate>
59+
<f:for each="{resultSet.spellCheckingSuggestions}" as="suggestion">
60+
<f:link.page additionalParams="{q:suggestion.suggestion}" noCacheHash="1">{suggestion.suggestion}</f:link.page>
61+
</f:for> ?
62+
</f:then>
63+
</f:if>
6864

69-
<f:for each="{group.groupitems}" as="groupItem">
70-
<strong>{groupItem.groupValue} <span>({groupItem.numFound})</span></strong>
71-
<s:widget.groupItemPaginate groupItem="{groupItem}" resultSet="{resultSet}">
72-
<ol start="{pagination.resultCountStart}" class="results-list">
65+
<f:if condition="{resultSet.usedSearch.numberOfResults}">
66+
<span class="result-found">
67+
<f:if condition="{resultSet.usedSearch.numberOfResults} == 1">
68+
<f:then>
69+
<s:translate key="results_found.singular" arguments="{0:resultSet.usedSearch.queryTime}">Found 1 result in %d seconds</s:translate>
70+
</f:then>
71+
<f:else>
72+
<s:translate key="results_found" arguments="{0:resultSet.usedSearch.numberOfResults, 1: resultSet.usedSearch.queryTime}">Found %d results in %d seconds</s:translate>
73+
</f:else>
74+
</f:if>
75+
</span>
76+
<span class="result-range">
77+
<s:pageBrowserRange>
78+
<s:translate key="results_range" arguments="{0:from, 1: to, 2: total}">Results %d until %d of %d</s:translate>
79+
</s:pageBrowserRange>
80+
</span>
81+
</f:if>
82+
<f:if condition="{resultSet.usedSearch.numberOfResults}">
83+
<f:render partial="Result/PerPage" section="PerPage" arguments="{resultSet: resultSet}" />
84+
</f:if>
85+
</div>
86+
</div>
87+
88+
<div class="row">
89+
<div class="col-md-12">
90+
<f:if condition="{hasSearched}">
91+
<f:if condition="{resultSet.searchresults.hasGroups}">
92+
<f:then>
93+
<f:for each="{resultSet.searchresults.groups}" as="group">
94+
<h2>{group.groupname}</h2>
95+
96+
<f:for each="{group.groupitems}" as="groupItem">
97+
<strong>{groupItem.groupValue} <span>({groupItem.numFound})</span></strong>
98+
<s:widget.groupItemPaginate groupItem="{groupItem}" resultSet="{resultSet}">
99+
<ol start="{pagination.resultCountStart}" class="results-list">
100+
<f:for each="{documents}" as="document">
101+
<f:render partial="Result/Document" section="Document" arguments="{resultSet:resultSet, document:document}" />
102+
</f:for>
103+
</ol>
104+
</s:widget.groupItemPaginate>
105+
</f:for>
106+
</f:for>
107+
</f:then>
108+
<f:else>
109+
<s:widget.resultPaginate resultSet="{resultSet}">
110+
<ol start="{pagination.displayRangeStart}" class="results-list">
73111
<f:for each="{documents}" as="document">
74112
<f:render partial="Result/Document" section="Document" arguments="{resultSet:resultSet, document:document}" />
75113
</f:for>
76114
</ol>
77-
</s:widget.groupItemPaginate>
78-
</f:for>
79-
</f:for>
80-
</f:then>
81-
<f:else>
82-
<s:widget.resultPaginate resultSet="{resultSet}">
83-
<ol start="{pagination.displayRangeStart}" class="results-list">
84-
<f:for each="{documents}" as="document">
85-
<f:render partial="Result/Document" section="Document" arguments="{resultSet:resultSet, document:document}" />
86-
</f:for>
87-
</ol>
88-
</s:widget.resultPaginate>
89-
</f:else>
90-
</f:if>
91-
92-
</f:if>
115+
</s:widget.resultPaginate>
116+
</f:else>
117+
</f:if>
118+
</f:if>
119+
</div>
120+
</div>
93121

94122
</div>
123+
</f:section>
95124

125+
<f:section name="extra">
96126
<div id="tx-solr-search-functions">
97127
<f:if condition="{hasSearched}">
98-
<f:if condition="{resultSet.usedSearchRequest.contextTypoScriptConfiguration.searchSorting}">
99-
<f:render partial="Result/Sorting" section="Sorting" arguments="{resultSet:resultSet}" />
100-
</f:if>
101128
<f:if condition="{resultSet.usedSearchRequest.contextTypoScriptConfiguration.searchFaceting}">
102129
<f:render partial="Result/Facets" section="Facets" arguments="{resultSet:resultSet}" />
103130
</f:if>
104131
</f:if>
105132

106-
<f:if condition="{resultSet.usedSearchRequest.contextTypoScriptConfiguration.searchLastSearches}">
107-
<f:render partial="Search/LastSearches" section="LastSearches" arguments="{resultSet:resultSet}" />
108-
</f:if>
109-
<f:if condition="{resultSet.usedSearchRequest.contextTypoScriptConfiguration.searchFrequentSearches}">
110-
<f:render partial="Search/FrequentlySearched" section="FrequentlySearched" />
111-
</f:if>
133+
<div class="hidden-xs">
134+
<f:if condition="{resultSet.usedSearchRequest.contextTypoScriptConfiguration.searchLastSearches}">
135+
<f:render partial="Search/LastSearches" section="LastSearches" arguments="{resultSet:resultSet}" />
136+
</f:if>
137+
</div>
138+
<div class="hidden-xs">
139+
<f:if condition="{resultSet.usedSearchRequest.contextTypoScriptConfiguration.searchFrequentSearches}">
140+
<f:render partial="Search/FrequentlySearched" section="FrequentlySearched" />
141+
</f:if>
142+
</div>
112143
</div>
113-
114144
</f:section>

0 commit comments

Comments
 (0)
⚡