From dec90f6987ec48ddac3323771f4a2bbd1f6f0e84 Mon Sep 17 00:00:00 2001
From: Benjamin Kott <benjamin.kott@wfp2.com>
Date: Wed, 22 Mar 2017 11:02:50 +0100
Subject: [PATCH] [TASK] Streamline indexed_search template files
For a more streamlined rendering this patch adds nessesary html tags
with fluid namespaces to all indexed_search templates, unifies indention
and adds an empty space before closing bracket of self-closing tags.
Resolves: #80392
Releases: master
Change-Id: Ia6bc46c8fb602b4f3592094ad963691bbf412d7d
Reviewed-on: https://review.typo3.org/52119
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../Private/Layouts/Administration.html | 2 +
.../Resources/Private/Partials/Form.html | 206 ++++++++----------
.../Resources/Private/Partials/Rules.html | 12 +-
.../Private/Partials/Searchresult.html | 8 +-
.../Administration/ExternalDocuments.html | 36 +--
.../Templates/Administration/Index.html | 35 +--
.../Templates/Administration/Pages.html | 35 +--
.../Templates/Administration/Statistic.html | 27 +--
.../Administration/StatisticDetails.html | 78 ++++---
.../Templates/Administration/WordDetail.html | 29 +--
.../Private/Templates/Search/Form.html | 2 +
.../Templates/Search/NoTypoScript.html | 4 +-
.../Private/Templates/Search/Search.html | 11 +-
13 files changed, 237 insertions(+), 248 deletions(-)
diff --git a/typo3/sysext/indexed_search/Resources/Private/Layouts/Administration.html b/typo3/sysext/indexed_search/Resources/Private/Layouts/Administration.html
index c167fd836229..a90fa18e63cb 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Layouts/Administration.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Layouts/Administration.html
@@ -1,2 +1,4 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<h1><f:translate key="administration.statistics" /></h1>
<f:render section="Content" />
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html b/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html
index 830e749f12af..0a57c964c1b5 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Partials/Form.html
@@ -1,116 +1,102 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="tx-indexedsearch-searchbox">
-<f:form action="search" method="post" id="tx_indexedsearch" pageUid="{settings.targetPid}">
- <div class="tx-indexedsearch-hidden-fields">
- <f:form.hidden name="search[_sections]" value="0" />
- <f:form.hidden name="search[_freeIndexUid]" id="tx_indexedsearch_freeIndexUid" value="_" />
- <f:form.hidden name="search[pointer]" id="tx_indexedsearch_pointer" value="0" />
- <f:form.hidden name="search[ext]" value="{searchParams.ext}" />
- <f:form.hidden name="search[searchType]" value="{searchParams.searchType}" />
- <f:form.hidden name="search[defaultOperand]" value="{searchParams.defaultOperand}" />
- <f:form.hidden name="search[mediaType]" value="{searchParams.mediaType}" />
- <f:form.hidden name="search[sortOrder]" value="{searchParams.sortOrder}" />
- <f:form.hidden name="search[group]" value="{searchParams.group}" />
- <f:form.hidden name="search[languageUid]" value="{searchParams.languageUid}" />
- <f:form.hidden name="search[desc]" value="{searchParams.desc}" />
- <f:form.hidden name="search[numberOfResults]" value="{searchParams.numberOfResults}" />
- <f:form.hidden name="search[extendedSearch]" value="{searchParams.extendedSearch}" />
- </div>
- <fieldset>
- <legend><f:translate key="form.legend" /></legend>
-
- <div class="tx-indexedsearch-form">
- <label for="tx-indexedsearch-searchbox-sword"><f:translate key="form.searchFor" />:</label>
- <f:form.textfield name="search[sword]" value="{sword}" id="tx-indexedsearch-searchbox-sword" class="tx-indexedsearch-searchbox-sword" />
+ <f:form action="search" method="post" id="tx_indexedsearch" pageUid="{settings.targetPid}">
+ <div class="tx-indexedsearch-hidden-fields">
+ <f:form.hidden name="search[_sections]" value="0" />
+ <f:form.hidden name="search[_freeIndexUid]" id="tx_indexedsearch_freeIndexUid" value="_" />
+ <f:form.hidden name="search[pointer]" id="tx_indexedsearch_pointer" value="0" />
+ <f:form.hidden name="search[ext]" value="{searchParams.ext}" />
+ <f:form.hidden name="search[searchType]" value="{searchParams.searchType}" />
+ <f:form.hidden name="search[defaultOperand]" value="{searchParams.defaultOperand}" />
+ <f:form.hidden name="search[mediaType]" value="{searchParams.mediaType}" />
+ <f:form.hidden name="search[sortOrder]" value="{searchParams.sortOrder}" />
+ <f:form.hidden name="search[group]" value="{searchParams.group}" />
+ <f:form.hidden name="search[languageUid]" value="{searchParams.languageUid}" />
+ <f:form.hidden name="search[desc]" value="{searchParams.desc}" />
+ <f:form.hidden name="search[numberOfResults]" value="{searchParams.numberOfResults}" />
+ <f:form.hidden name="search[extendedSearch]" value="{searchParams.extendedSearch}" />
</div>
-
- <f:if condition="{searchParams.extendedSearch}">
- <f:if condition="{showTypeSearch}">
- <div class="tx-indexedsearch-search-for">
- <label for="tx-indexedsearch-selectbox-searchtype"><f:translate key="form.match" />:</label>
-
- <f:if condition="{allSearchTypes}">
- <f:form.select name="search[searchType]" options="{allSearchTypes}" value="{searchParams.searchType}" id="tx-indexedsearch-selectbox-searchtype" class="tx-indexedsearch-selectbox-searchtype" />
- </f:if>
-
- <f:if condition="{allDefaultOperands}">
- <f:form.select name="search[defaultOperand]" options="{allDefaultOperands}" value="{searchParams.defaultOperand}" id="tx-indexedsearch-selectbox-defaultoperand" class="tx-indexedsearch-selectbox-defaultoperand" />
- </f:if>
- </div>
+ <fieldset>
+ <legend><f:translate key="form.legend" /></legend>
+ <div class="tx-indexedsearch-form">
+ <label for="tx-indexedsearch-searchbox-sword"><f:translate key="form.searchFor" />:</label>
+ <f:form.textfield name="search[sword]" value="{sword}" id="tx-indexedsearch-searchbox-sword" class="tx-indexedsearch-searchbox-sword" />
+ </div>
+ <f:if condition="{searchParams.extendedSearch}">
+ <f:if condition="{showTypeSearch}">
+ <div class="tx-indexedsearch-search-for">
+ <label for="tx-indexedsearch-selectbox-searchtype"><f:translate key="form.match" />:</label>
+ <f:if condition="{allSearchTypes}">
+ <f:form.select name="search[searchType]" options="{allSearchTypes}" value="{searchParams.searchType}" id="tx-indexedsearch-selectbox-searchtype" class="tx-indexedsearch-selectbox-searchtype" />
+ </f:if>
+ <f:if condition="{allDefaultOperands}">
+ <f:form.select name="search[defaultOperand]" options="{allDefaultOperands}" value="{searchParams.defaultOperand}" id="tx-indexedsearch-selectbox-defaultoperand" class="tx-indexedsearch-selectbox-defaultoperand" />
+ </f:if>
+ </div>
+ </f:if>
+ <f:if condition="{showMediaAndLanguageSearch}">
+ <div class="tx-indexedsearch-search-in">
+ <label for="tx-indexedsearch-selectbox-media"><f:translate key="form.searchIn" />:</label>
+ <f:if condition="{allMediaTypes}">
+ <f:form.select name="search[mediaType]" options="{allMediaTypes}" value="{searchParams.mediaType}" id="tx-indexedsearch-selectbox-media" class="tx-indexedsearch-selectbox-media media" />
+ </f:if>
+ <f:if condition="{allLanguageUids}">
+ <f:form.select name="search[languageUid]" options="{allLanguageUids}" value="{searchParams.languageUid}" id="tx-indexedsearch-selectbox-lang" class="tx-indexedsearch-selectbox-lang lang" />
+ </f:if>
+ </div>
+ </f:if>
+ <f:if condition="{allSections}">
+ <div class="tx-indexedsearch-search-select-section">
+ <label for="tx-indexedsearch-selectbox-sections"><f:translate key="form.fromSection" />:</label>
+ <f:form.select name="search[sections]" options="{allSections}" value="{searchParams.sections}" id="tx-indexedsearch-selectbox-sections" class="tx-indexedsearch-selectbox-sections" />
+ </div>
+ </f:if>
+ <f:if condition="{allIndexConfigurations}">
+ <div class="tx-indexedsearch-search-freeindexuid">
+ <label for="tx-indexedsearch-selectbox-freeIndexUid"><f:translate key="form.freeIndexUid" />:</label>
+ <f:form.select name="search[freeIndexUid]" options="{allIndexConfigurations}" value="{searchParams.freeIndexUid}" id="tx-indexedsearch-selectbox-freeIndexUid" class="tx-indexedsearch-selectbox-freeIndexUid" />
+ </div>
+ </f:if>
+ <f:if condition="{showSortOrders}">
+ <div class="tx-indexedsearch-search-select-order">
+ <label for="tx-indexedsearch-selectbox-order"><f:translate key="form.orderBy" />:</label>
+ <f:form.select name="search[sortOrder]" options="{allSortOrders}" value="{searchParams.sortOrder}" id="tx-indexedsearch-selectbox-order" class="tx-indexedsearch-selectbox-order" />
+ <f:form.select name="search[sortDesc]" options="{allSortDescendings}" value="{searchParams.sortDesc}" id="tx-indexedsearch-selectbox-desc" class="tx-indexedsearch-selectbox-desc" />
+ </div>
+ </f:if>
+ <f:if condition="{allNumberOfResults}">
+ <div class="tx-indexedsearch-search-select-results">
+ <label for="tx-indexedsearch-selectbox-results"><f:translate key="form.atATime" /></label>
+ <f:form.select name="search[numberOfResults]" options="{allNumberOfResults}" value="{searchParams.numberOfResults}" id="tx-indexedsearch-selectbox-results" class="tx-indexedsearch-selectbox-results" />
+ </div>
+ </f:if>
+ <f:if condition="{allGroups}">
+ <div class="tx-indexedsearch-search-select-group">
+ <label for="tx-indexedsearch-selectbox-group"><f:translate key="form.style" />:</label>
+ <f:form.select name="search[group]" options="{allGroups}" value="{searchParams.group}" id="tx-indexedsearch-selectbox-group" class="tx-indexedsearch-selectbox-group" />
+ <f:if condition="{settings.blind.extResume} == 0">
+ <f:form.checkbox name="search[extResume]" id="tx_indexedsearch_extResume" checked="{searchParams.extResume}" value="1" />
+ </f:if>
+ </div>
+ </f:if>
</f:if>
-
- <f:if condition="{showMediaAndLanguageSearch}">
- <div class="tx-indexedsearch-search-in">
- <label for="tx-indexedsearch-selectbox-media"><f:translate key="form.searchIn" />:</label>
-
- <f:if condition="{allMediaTypes}">
- <f:form.select name="search[mediaType]" options="{allMediaTypes}" value="{searchParams.mediaType}" id="tx-indexedsearch-selectbox-media" class="tx-indexedsearch-selectbox-media media" />
- </f:if>
-
- <f:if condition="{allLanguageUids}">
- <f:form.select name="search[languageUid]" options="{allLanguageUids}" value="{searchParams.languageUid}" id="tx-indexedsearch-selectbox-lang" class="tx-indexedsearch-selectbox-lang lang" />
- </f:if>
- </div>
+ <div class="tx-indexedsearch-search-submit">
+ <f:form.submit name="search[submitButton]" value="{f:translate(key: 'form.submit')}" id="tx-indexedsearch-searchbox-button-submit" class="tx-indexedsearch-searchbox-button" />
+ </div>
+ </fieldset>
+ <f:if condition="{settings.displayAdvancedSearchLink}">
+ <p>
+ <f:if condition="{searchParams.extendedSearch}">
+ <f:then>
+ <f:link.action action="form" arguments="{search: {extendedSearch: 0}}"><f:translate key="form.linkToRegularSearch" /></f:link.action>
+ </f:then>
+ <f:else>
+ <f:link.action action="form" arguments="{search: {extendedSearch: 1}}"><f:translate key="form.linkToAdvancedSearch" /></f:link.action>
+ </f:else>
</f:if>
-
- <f:if condition="{allSections}">
- <div class="tx-indexedsearch-search-select-section">
- <label for="tx-indexedsearch-selectbox-sections"><f:translate key="form.fromSection" />:</label>
- <f:form.select name="search[sections]" options="{allSections}" value="{searchParams.sections}" id="tx-indexedsearch-selectbox-sections" class="tx-indexedsearch-selectbox-sections" />
- </div>
- </f:if>
-
- <f:if condition="{allIndexConfigurations}">
- <div class="tx-indexedsearch-search-freeindexuid">
- <label for="tx-indexedsearch-selectbox-freeIndexUid"><f:translate key="form.freeIndexUid" />:</label>
- <f:form.select name="search[freeIndexUid]" options="{allIndexConfigurations}" value="{searchParams.freeIndexUid}" id="tx-indexedsearch-selectbox-freeIndexUid" class="tx-indexedsearch-selectbox-freeIndexUid" />
- </div>
- </f:if>
-
- <f:if condition="{showSortOrders}">
- <div class="tx-indexedsearch-search-select-order">
- <label for="tx-indexedsearch-selectbox-order"><f:translate key="form.orderBy" />:</label>
- <f:form.select name="search[sortOrder]" options="{allSortOrders}" value="{searchParams.sortOrder}" id="tx-indexedsearch-selectbox-order" class="tx-indexedsearch-selectbox-order" />
- <f:form.select name="search[sortDesc]" options="{allSortDescendings}" value="{searchParams.sortDesc}" id="tx-indexedsearch-selectbox-desc" class="tx-indexedsearch-selectbox-desc" />
- </div>
- </f:if>
-
- <f:if condition="{allNumberOfResults}">
- <div class="tx-indexedsearch-search-select-results">
- <label for="tx-indexedsearch-selectbox-results"><f:translate key="form.atATime" /></label>
- <f:form.select name="search[numberOfResults]" options="{allNumberOfResults}" value="{searchParams.numberOfResults}" id="tx-indexedsearch-selectbox-results" class="tx-indexedsearch-selectbox-results" />
- </div>
- </f:if>
-
- <f:if condition="{allGroups}">
- <div class="tx-indexedsearch-search-select-group">
- <label for="tx-indexedsearch-selectbox-group"><f:translate key="form.style" />:</label>
- <f:form.select name="search[group]" options="{allGroups}" value="{searchParams.group}" id="tx-indexedsearch-selectbox-group" class="tx-indexedsearch-selectbox-group" />
- <f:if condition="{settings.blind.extResume} == 0">
- <f:form.checkbox name="search[extResume]" id="tx_indexedsearch_extResume" checked="{searchParams.extResume}" value="1" />
- </f:if>
- </div>
- </f:if>
- </f:if>
-
- <div class="tx-indexedsearch-search-submit">
- <f:form.submit name="search[submitButton]" value="{f:translate(key: 'form.submit')}" id="tx-indexedsearch-searchbox-button-submit" class="tx-indexedsearch-searchbox-button" />
- </div>
- </fieldset>
-
-
- <f:if condition="{settings.displayAdvancedSearchLink}">
- <p>
- <f:if condition="{searchParams.extendedSearch}">
- <f:then>
- <f:link.action action="form" arguments="{search: {extendedSearch: 0}}"><f:translate key="form.linkToRegularSearch" /></f:link.action>
- </f:then>
- <f:else>
- <f:link.action action="form" arguments="{search: {extendedSearch: 1}}"><f:translate key="form.linkToAdvancedSearch" /></f:link.action>
- </f:else>
+ </p>
</f:if>
- </p>
- </f:if>
-</f:form>
+ </f:form>
</div>
-
-<f:render partial="Rules" />
\ No newline at end of file
+<f:render partial="Rules" />
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html b/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html
index 4c928f6af84d..20048d8b82f1 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Partials/Rules.html
@@ -1,6 +1,8 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{settings.displayRules}">
-<div class="tx-indexedsearch-rules">
- <h2><f:translate key="rules.headline" /></h2>
- <p><f:format.raw><f:translate key="rules.text" /></f:format.raw></p>
-</div>
-</f:if>
\ No newline at end of file
+ <div class="tx-indexedsearch-rules">
+ <h2><f:translate key="rules.headline" /></h2>
+ <p><f:format.raw><f:translate key="rules.text" /></f:format.raw></p>
+ </div>
+</f:if>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html b/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html
index 83cc45a19d2f..5a1955998dcd 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Partials/Searchresult.html
@@ -1,3 +1,4 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<div class="tx-indexedsearch-res">
<h3>
<span class="tx-indexedsearch-icon">{row.icon -> f:format.raw()}</span>
@@ -5,28 +6,22 @@
<span class="tx-indexedsearch-title{row.CSSsuffix}">{row.title -> f:format.raw()}</span>
<span class="tx-indexedsearch-percent">{row.rating}</span>
</h3>
-
<f:if condition="{row.headerOnly} == 0">
<p class="tx-indexedsearch-description">{row.description -> f:format.raw()}</p>
<dl class="tx-indexedsearch-info">
<dt class="tx-indexedsearch-text-item-size"><f:translate key="result.size" /> </dt>
<dd class="tx-indexedsearch-text-item-size">{row.size}</dd>
-
<dt class="tx-indexedsearch-text-item-crdate"><f:translate key="result.created" /> </dt>
<dd class="tx-indexedsearch-text-item-crdate"><f:format.date>@{row.created}</f:format.date></dd>
-
<dt class="tx-indexedsearch-text-item-mtime"><f:translate key="result.modified" /> </dt>
<dd class="tx-indexedsearch-text-item-mtime"><f:format.date>@{row.modified}</f:format.date></dd>
-
<dt class="tx-indexedsearch-text-item-path"><f:translate key="result.path" /> </dt>
<dd class="tx-indexedsearch-text-item-path"><f:format.html>{row.path}</f:format.html></dd>
</dl>
</f:if>
-
<f:if condition="{row.headerOnly} == 1">
<p class="tx-indexedsearch-description">{row.description -> f:format.raw()}</p>
</f:if>
-
<f:if condition="{row.subresults}">
<p class="tx-indexedsearch-list">
<f:for each="{row.subresults.items}" as="subrow">
@@ -35,3 +30,4 @@
</p>
</f:if>
</div>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
index 733c8f66f2c6..95e3bd4808c1 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/ExternalDocuments.html
@@ -1,26 +1,24 @@
-{namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
-
-<f:layout name="Administration"/>
-
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="Administration" />
<f:section name="Content">
- <h2><f:translate key="administration.external.title"/></h2>
+ <h2><f:translate key="administration.external.title" /></h2>
<f:if condition="{records}">
<table class="table table-striped table-hover">
<thead>
<tr>
- <th><f:translate key="field.fileName"/></th>
- <th><f:translate key="field.fileSize"/></th>
- <th><f:translate key="field.wordCount"/></th>
- <th><f:translate key="field.mtime"/></th>
- <th><f:translate key="field.indexed"/></th>
- <th><f:translate key="field.updated"/></th>
- <th><f:translate key="field.parseTime"/></th>
- <th><f:translate key="field.groups"/></th>
- <th><f:translate key="field.sub"/></th>
- <th><f:translate key="field.cHash"/></th>
- <th><f:translate key="field.pHash"/></th>
- <th><f:translate key="field.path"/></th>
+ <th><f:translate key="field.fileName" /></th>
+ <th><f:translate key="field.fileSize" /></th>
+ <th><f:translate key="field.wordCount" /></th>
+ <th><f:translate key="field.mtime" /></th>
+ <th><f:translate key="field.indexed" /></th>
+ <th><f:translate key="field.updated" /></th>
+ <th><f:translate key="field.parseTime" /></th>
+ <th><f:translate key="field.groups" /></th>
+ <th><f:translate key="field.sub" /></th>
+ <th><f:translate key="field.cHash" /></th>
+ <th><f:translate key="field.pHash" /></th>
+ <th><f:translate key="field.path" /></th>
</tr>
</thead>
<tbody>
@@ -66,4 +64,6 @@
</tbody>
</table>
</f:if>
-</f:section>
\ No newline at end of file
+
+</f:section>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html
index bce1fa3a8e9a..edb19abd2da4 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Index.html
@@ -1,8 +1,8 @@
-<f:layout name="Administration"/>
-
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="Administration" />
<f:section name="Content">
- <p class="lead"><f:translate key="administration.index.description" /></p>
+ <p class="lead"><f:translate key="administration.index.description" /></p>
<div class="row">
<div class="col-md-6">
<h4><f:translate key="administration.statistics.header" /></h4>
@@ -43,12 +43,11 @@
</table>
</div>
</div>
-
<h3>
- <f:translate key="administration.statistics.mostSearched.title"/>
+ <f:translate key="administration.statistics.mostSearched.title" />
</h3>
<p>
- <f:translate key="administration.statistics.mostSearched.description"/>
+ <f:translate key="administration.statistics.mostSearched.description" />
</p>
<f:if condition="{pageUid}">
<f:then>
@@ -56,35 +55,35 @@
<f:then>
<div class="row">
<div class="col-md-4">
- <f:render section="statistic" arguments="{statistic:all,title:'all'}"/>
+ <f:render section="statistic" arguments="{statistic:all,title:'all'}" />
</div>
<div class="col-md-4">
- <f:render section="statistic" arguments="{statistic:last24hours,title:'last24hours'}"/>
+ <f:render section="statistic" arguments="{statistic:last24hours,title:'last24hours'}" />
</div>
<div class="col-md-4">
- <f:render section="statistic" arguments="{statistic:last30days,title:'last30days'}"/>
+ <f:render section="statistic" arguments="{statistic:last30days,title:'last30days'}" />
</div>
</div>
</f:then>
<f:else>
<f:be.infobox>
- <f:translate key="administration.statistics.noResultForPage"/>
+ <f:translate key="administration.statistics.noResultForPage" />
</f:be.infobox>
</f:else>
</f:if>
-
</f:then>
<f:else>
<f:be.infobox state="-1">
- <f:translate key="administration.statistics.selectPage"/>
+ <f:translate key="administration.statistics.selectPage" />
</f:be.infobox>
</f:else>
</f:if>
-</f:section>
+</f:section>
<f:section name="statistic">
+
<h4>
- <f:translate key="administration.statistics.mostSearched.{title}"/>
+ <f:translate key="administration.statistics.mostSearched.{title}" />
</h4>
<f:if condition="{statistic}">
<f:then>
@@ -92,8 +91,8 @@
<thead>
<tr>
<th class="nowrap"> </th>
- <th><f:translate key="administration.statistics.word"/></th>
- <th><f:translate key="administration.statistics.count"/></th>
+ <th><f:translate key="administration.statistics.word" /></th>
+ <th><f:translate key="administration.statistics.count" /></th>
</tr>
</thead>
<tbody>
@@ -109,8 +108,10 @@
</f:then>
<f:else>
<f:be.infobox state="2">
- <f:translate key="administration.statistics.noResult"/>
+ <f:translate key="administration.statistics.noResult" />
</f:be.infobox>
</f:else>
</f:if>
+
</f:section>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
index 4a1c194056a5..b0607ef8b92b 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Pages.html
@@ -1,28 +1,27 @@
-{namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
-
-<f:layout name="Administration"/>
-
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="Administration" />
<f:section name="Content">
+
<h2>Pages</h2>
<f:if condition="{records}">
<table class="table table-striped table-hover">
<thead>
<tr>
- <th><f:translate key="field.id"/>/<f:translate key="field.type"/></th>
- <th><f:translate key="field.title"/></th>
- <th><f:translate key="field.fileSize"/></th>
+ <th><f:translate key="field.id" />/<f:translate key="field.type" /></th>
+ <th><f:translate key="field.title" /></th>
+ <th><f:translate key="field.fileSize" /></th>
<f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
- <th><f:translate key="field.wordCount"/></th>
+ <th><f:translate key="field.wordCount" /></th>
</f:if>
- <th><f:translate key="field.mtime"/></th>
- <th><f:translate key="field.indexed"/></th>
- <th><f:translate key="field.updated"/></th>
- <th><f:translate key="field.parseTime"/></th>
- <th><f:translate key="field.groups"/></th>
- <th><f:translate key="field.sub"/></th>
- <th><f:translate key="field.language"/></th>
- <th><f:translate key="field.cHash"/></th>
- <th><f:translate key="field.pHash"/></th>
+ <th><f:translate key="field.mtime" /></th>
+ <th><f:translate key="field.indexed" /></th>
+ <th><f:translate key="field.updated" /></th>
+ <th><f:translate key="field.parseTime" /></th>
+ <th><f:translate key="field.groups" /></th>
+ <th><f:translate key="field.sub" /></th>
+ <th><f:translate key="field.language" /></th>
+ <th><f:translate key="field.cHash" /></th>
+ <th><f:translate key="field.pHash" /></th>
</tr>
</thead>
<tbody>
@@ -73,4 +72,6 @@
</tbody>
</table>
</f:if>
+
</f:section>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
index 9dd727b3ae34..448e81bfd5e0 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/Statistic.html
@@ -1,8 +1,7 @@
-{namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
-
-<f:layout name="Administration"/>
-
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="Administration" />
<f:section name="Content">
+
<f:if condition="{tree}">
<f:then>
<f:form name="statistic" action="statistic" class="form-horizontal" arguments="{id:pageUid}">
@@ -11,8 +10,8 @@
<f:form.select name="mode" options="{
overview:'{f:translate(key:\'administration.statistics.view.overview\')}',
content:'{f:translate(key:\'administration.statistics.view.content\')}'
- }" value="{mode}" additionalAttributes="{onchange:'this.form.submit();'}"/>
- <f:form.select name="depth" options="{levelTranslations}" value="{depth}" additionalAttributes="{onchange:'this.form.submit();'}"/>
+ }" value="{mode}" additionalAttributes="{onchange:'this.form.submit();'}" />
+ <f:form.select name="depth" options="{levelTranslations}" value="{depth}" additionalAttributes="{onchange:'this.form.submit();'}" />
</div>
</div>
</f:form>
@@ -26,7 +25,7 @@
</a>
</th>
<th>
- <f:translate key="field.fileName"/>
+ <f:translate key="field.fileName" />
</th>
<f:switch expression="{mode}">
<f:case value="content">
@@ -42,14 +41,14 @@
<f:defaultCase>
<f:if condition="{extensionConfiguration.useMysqlFulltext} == false">
<th>
- <f:translate key="field.wordCount"/>
+ <f:translate key="field.wordCount" />
</th>
</f:if>
<th>
- <f:translate key="field.fileSize"/>
+ <f:translate key="field.fileSize" />
</th>
<th>
- <f:translate key="field.indexed"/>
+ <f:translate key="field.indexed" />
</th>
</f:defaultCase>
</f:switch>
@@ -72,7 +71,7 @@
</a>
</td>
<td>
- <f:image src="{l.icon}"/>
+ <f:image src="{l.icon}" />
<f:link.action action="statisticDetails" arguments="{pageHash:l.phash}">{l.item_title}</f:link.action>
</td>
<f:switch expression="{mode}">
@@ -117,7 +116,7 @@
</f:case>
<f:defaultCase>
<td colspan="5">
- <f:translate key="administration.notIndexed"/>
+ <f:translate key="administration.notIndexed" />
</td>
</f:defaultCase>
</f:switch>
@@ -129,7 +128,9 @@
</table>
</f:then>
<f:else>
- <h2><f:translate key="administration.noPageSelected"/></h2>
+ <h2><f:translate key="administration.noPageSelected" /></h2>
</f:else>
</f:if>
+
</f:section>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
index 8c4568f49d6d..7aa782796111 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
@@ -1,15 +1,14 @@
-{namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
-
-<f:layout name="Administration"/>
-
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="Administration" />
<f:section name="Content">
- <p class="lead"><f:translate key="administration.document.description"/></p>
+
+ <p class="lead"><f:translate key="administration.document.description" /></p>
<f:if condition="{phashRow}">
<f:then>
<table class="table table-striped table-hover">
<thead>
<tr>
- <th colspan="2"><f:translate key="administration.phash.tableHeader"/></th>
+ <th colspan="2"><f:translate key="administration.phash.tableHeader" /></th>
</tr>
</thead>
<f:for each="{phashRow}" as="value" key="key">
@@ -19,53 +18,50 @@
</tr>
</f:for>
</table>
-
<div class="row">
<div class="col-md-12">
- <f:render section="wordlisting" arguments="{words:words,phash:phash,page:page,keywords:keywords,title:'words'}"/>
+ <f:render section="wordlisting" arguments="{words:words,phash:phash,page:page,keywords:keywords,title:'words'}" />
</div>
</div>
-
<div class="row">
<div class="col-md-6">
- <f:render section="wordlisting" arguments="{words:topCount,phash:phash,title:'topCount'}"/>
+ <f:render section="wordlisting" arguments="{words:topCount,phash:phash,title:'topCount'}" />
</div>
<div class="col-md-6">
- <f:render section="wordlisting" arguments="{words:topFrequency,phash:phash,title:'topFrequency'}"/>
+ <f:render section="wordlisting" arguments="{words:topFrequency,phash:phash,title:'topFrequency'}" />
</div>
</div>
-
<f:if condition="{debug}">
<h4>
- <f:translate key="administration.statistics.debug"/>
+ <f:translate key="administration.statistics.debug" />
</h4>
<f:debug inline="1" title="">{debug}</f:debug>
</f:if>
<f:if condition="{lexer}">
<h4>
- <f:translate key="administration.statistics.lexer"/>
+ <f:translate key="administration.statistics.lexer" />
</h4>
<f:format.raw>{lexer}</f:format.raw>
</f:if>
<f:if condition="{metaphone}">
<h4>
- <f:translate key="administration.statistics.metaphone"/>
+ <f:translate key="administration.statistics.metaphone" />
</h4>
<table class="table table-striped table-hover">
<thead>
<tr>
<th>
- <f:translate key="field.metaphone"/>
+ <f:translate key="field.metaphone" />
</th>
<th>
- <f:translate key="field.pHash"/>
+ <f:translate key="field.pHash" />
</th>
<th>
- <f:translate key="field.wordCount"/>
+ <f:translate key="field.wordCount" />
</th>
<th>
- <f:translate key="field.words"/>
+ <f:translate key="field.words" />
</th>
</tr>
</thead>
@@ -83,18 +79,17 @@
</tbody>
</table>
</f:if>
-
<f:if condition="{sections}">
- <h4><f:translate key="administration.statistics.sectionRecords"/></h4>
+ <h4><f:translate key="administration.statistics.sectionRecords" /></h4>
<table class="table table-striped table-hover">
<thead>
<tr>
- <th><f:translate key="field.pHash"/></th>
+ <th><f:translate key="field.pHash" /></th>
<th>rl0</th>
<th>rl1</th>
<th>rl2</th>
- <th><f:translate key="field.id"/></th>
- <th><f:translate key="field.uniqueId"/></th>
+ <th><f:translate key="field.id" /></th>
+ <th><f:translate key="field.uniqueId" /></th>
</tr>
</thead>
<tbody>
@@ -116,43 +111,44 @@
<f:be.infobox state="2" message="no record found" />
</f:else>
</f:if>
-</f:section>
+</f:section>
<f:section name="wordlisting">
- <h4><f:translate key="administration.document.{title}"/>
+
+ <h4><f:translate key="administration.document.{title}" />
<f:if condition="{title}=='words'">
({f:count(subject:words)})
</f:if>
</h4>
<f:if condition="{words}">
<f:form method="post" action="saveStopwordsKeywords" name="stopwordskeywords" arguments="{pageHash:phash}">
- <f:form.hidden name="pageHash" value="{phash}"/>
- <f:form.hidden name="pageId" value="{page.uid}"/>
+ <f:form.hidden name="pageHash" value="{phash}" />
+ <f:form.hidden name="pageId" value="{page.uid}" />
<table class="table table-striped table-hover">
<thead>
<tr>
- <th><f:translate key="administration.stopWords"/></th>
+ <th><f:translate key="administration.stopWords" /></th>
<f:if condition="{title}=='words'">
<f:if condition="{page}">
- <th><f:translate key="administration.keywords"/></th>
+ <th><f:translate key="administration.keywords" /></th>
</f:if>
</f:if>
- <th><f:translate key="administration.statistics.word"/></th>
- <th><f:translate key="field.wordCount"/></th>
- <th><f:translate key="field.frequency"/></th>
- <th><f:translate key="field.flag"/></th>
+ <th><f:translate key="administration.statistics.word" /></th>
+ <th><f:translate key="field.wordCount" /></th>
+ <th><f:translate key="field.frequency" /></th>
+ <th><f:translate key="field.flag" /></th>
</tr>
</thead>
<tbody>
<f:for each="{words}" as="word">
<tr>
<td>
- <f:form.checkbox name="stopwords[{word.wid}]" value="1" checked="{word.is_stopword}"/>
+ <f:form.checkbox name="stopwords[{word.wid}]" value="1" checked="{word.is_stopword}" />
</td>
<f:if condition="{title}=='words'">
<f:if condition="{page}">
<td>
- <f:form.checkbox name="keywords[{word.baseword}]" value="1" checked="{word.is_keyword}"/>
+ <f:form.checkbox name="keywords[{word.baseword}]" value="1" checked="{word.is_keyword}" />
</td>
</f:if>
</f:if>
@@ -180,14 +176,14 @@
</f:for>
</div>
</f:if>
- <f:form.submit value="{f:translate(key:'administration.stopWordsKeywords.save')}"/>
+ <f:form.submit value="{f:translate(key:'administration.stopWordsKeywords.save')}" />
</f:then>
<f:else>
- <f:form.submit value="{f:translate(key:'administration.stopWords.save')}"/>
+ <f:form.submit value="{f:translate(key:'administration.stopWords.save')}" />
</f:else>
-
</f:if>
-
</f:form>
</f:if>
-</f:section>
\ No newline at end of file
+
+</f:section>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html
index 2cc644950612..7a9611b3f0b5 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/WordDetail.html
@@ -1,21 +1,22 @@
-<f:layout name="Administration"/>
-
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="Administration" />
<f:section name="Content">
+
<p class="lead">
- <f:translate key="administration.word.description"/>
+ <f:translate key="administration.word.description" />
</p>
<f:if condition="{rows}">
<f:then>
<table class="table table-striped table-hover">
<thead>
<tr>
- <th><f:translate key="field.pHash"/></th>
- <th><f:translate key="field.id"/></th>
- <th><f:translate key="field.fileName"/></th>
- <th><f:translate key="field.count"/></th>
- <th><f:translate key="field.first"/></th>
- <th><f:translate key="field.frequency"/></th>
- <th><f:translate key="field.flag"/></th>
+ <th><f:translate key="field.pHash" /></th>
+ <th><f:translate key="field.id" /></th>
+ <th><f:translate key="field.fileName" /></th>
+ <th><f:translate key="field.count" /></th>
+ <th><f:translate key="field.first" /></th>
+ <th><f:translate key="field.frequency" /></th>
+ <th><f:translate key="field.flag" /></th>
</tr>
</thead>
<tbody>
@@ -38,12 +39,14 @@
<f:else>
<div class="alert alert-danger">
<div class="message-body">
- <f:translate key="administration.statistics.noResult"/>
+ <f:translate key="administration.statistics.noResult" />
</div>
</div>
</f:else>
</f:if>
<f:link.action action="statisticDetails" arguments="{pageHash:phash}">
- <f:translate key="administration.linkBack"/>
+ <f:translate key="administration.linkBack" />
</f:link.action>
-</f:section>
\ No newline at end of file
+
+</f:section>
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Form.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Form.html
index 4fa7c18e3406..fa83861fd552 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Form.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Form.html
@@ -1 +1,3 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:render partial="Form" arguments="{_all}" />
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/NoTypoScript.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/NoTypoScript.html
index b33c52321b78..8d9192007afa 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/NoTypoScript.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/NoTypoScript.html
@@ -1 +1,3 @@
-<f:translate key="error.noTypoScript" />
\ No newline at end of file
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:translate key="error.noTypoScript" />
+</html>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
index f616ee218fb0..c828d5935616 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Search/Search.html
@@ -1,14 +1,11 @@
-{namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
-
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:is="http://typo3.org/ns/TYPO3/CMS/IndexedSearch/ViewHelpers" data-namespace-typo3-fluid="true">
<f:alias map="{sword: searchParams.sword}">
- <f:render partial="Form" arguments="{_all}"/>
+ <f:render partial="Form" arguments="{_all}" />
</f:alias>
-
<f:for each="{resultsets}" as="result">
<f:if condition="{result.categoryTitle}">
<h1 class="tx-indexedsearch-category">{result.categoryTitle}</h1>
</f:if>
-
<!-- show the info what was searched for -->
<f:for each="{searchWords}" as="searchWord" key="key">
<f:if condition="{key} > 0">
@@ -20,7 +17,6 @@
</f:else>
</f:if>
</f:for>
-
<!-- show the info in which section was searched for -->
{result.searchedInSectionInfo}
<f:if condition="{result.count} > 0">
@@ -72,4 +68,5 @@
<f:translate key="result.noResult" />
</f:else>
</f:if>
-</f:for>
\ No newline at end of file
+</f:for>
+</html>
--
GitLab