Skip to content

Commit

Permalink
[BUGFIX:BP:11] Use correct html tags in templates
Browse files Browse the repository at this point in the history
Fixes: #2970
Ported from: #2971
  • Loading branch information
dmitryd authored and dkd-kaehm committed Jun 29, 2021
1 parent 3163d25 commit 31e2d2c
Show file tree
Hide file tree
Showing 16 changed files with 75 additions and 24 deletions.
6 changes: 5 additions & 1 deletion Resources/Private/Partials/Result/Document.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="Document">

Expand Down Expand Up @@ -46,3 +48,5 @@ <h3 class="results-topic"><a href="{s:uri.result.addSearchWordList(url:document.
</div>

</f:section>

</html>
6 changes: 5 additions & 1 deletion Resources/Private/Partials/Result/Facets.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="Facets">
<div id="tx-solr-faceting">
Expand All @@ -20,3 +22,5 @@
</div>

</f:section>

</html>
8 changes: 6 additions & 2 deletions Resources/Private/Partials/Result/FacetsActive.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="FacetsActive">
<f:if condition="{resultSet.facets.used -> f:count()}">
Expand All @@ -20,4 +22,6 @@
</a>
</div>
</f:if>
</f:section>
</f:section>

</html>
8 changes: 6 additions & 2 deletions Resources/Private/Partials/Result/PerPage.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="PerPage">
<div id="results-per-page">
Expand All @@ -16,4 +18,6 @@
</select>
</form>
</div>
</f:section>
</f:section>

</html>
5 changes: 4 additions & 1 deletion Resources/Private/Partials/Result/RelevanceBar.html
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>


<f:section name="RelevanceBar">

Expand Down
8 changes: 6 additions & 2 deletions Resources/Private/Partials/Result/Sorting.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="Sorting">
<div id="tx-solr-sorting" class="secondaryContentSection dropdown">
Expand Down Expand Up @@ -45,4 +47,6 @@
</f:for>
</ul>
</div>
</f:section>
</f:section>

</html>
8 changes: 6 additions & 2 deletions Resources/Private/Partials/Search/Form.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="Form">

Expand Down Expand Up @@ -29,4 +31,6 @@
</s:searchForm>
</div>

</f:section>
</f:section>

</html>
4 changes: 3 additions & 1 deletion Resources/Private/Partials/Search/FrequentlySearched.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="FrequentlySearched">

Expand Down
4 changes: 3 additions & 1 deletion Resources/Private/Partials/Search/LastSearches.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:section name="LastSearches">

Expand Down
8 changes: 6 additions & 2 deletions Resources/Private/Templates/Search/Detail.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:layout name="Fullwidth"/>

Expand All @@ -15,4 +17,6 @@ <h1>{document.title}</h1>
</f:then>
<f:else>No document found!</f:else>
</f:if>
</f:section>
</f:section>

</html>
8 changes: 6 additions & 2 deletions Resources/Private/Templates/Search/Form.html
@@ -1,9 +1,13 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:layout name="Fullwidth"/>

<f:section name="content">
<f:render partial="Search/Form" section="Form" arguments="{search:search, additionalFilters:additionalFilters, pluginNamespace:pluginNamespace}" />
</f:section>
</f:section>

</html>
8 changes: 6 additions & 2 deletions Resources/Private/Templates/Search/FrequentlySearched.html
@@ -1,11 +1,15 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:layout name="Fullwidth"/>

<f:section name="content">

<f:render partial="Search/FrequentlySearched" section="FrequentlySearched" />

</f:section>
</f:section>

</html>
6 changes: 5 additions & 1 deletion Resources/Private/Templates/Search/Results.html
@@ -1,6 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:layout name="Split"/>

Expand Down Expand Up @@ -122,3 +124,5 @@
</div>
</div>
</f:section>

</html>
8 changes: 6 additions & 2 deletions Resources/Private/Templates/Search/SolrNotAvailable.html
@@ -1,9 +1,13 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/">
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:layout name="Fullwidth"/>

<f:section name="content">
Search is currently not available.
</f:section>
</f:section>

</html>
@@ -1,6 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true">
<f:if condition="{configuration.insertAbove}">
<f:render section="paginator" arguments="{pagination: contentArguments.pagination, configuration:configuration, resultSet:resultSet, groupItem:groupItem}" />
Expand Down
@@ -1,6 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers/"
xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers"
data-namespace-typo3-fluid="true">
<f:if condition="{configuration.insertAbove}">
<f:render section="paginator" arguments="{pagination: contentArguments.pagination, configuration:configuration, resultSet:resultSet}" />
Expand Down

0 comments on commit 31e2d2c

Please sign in to comment.