[TASK] Indexed search fixes

TYPO3incubator · Apr 12, 2024 · 8d95991 · 8d95991
1 parent 6ae9d53
commit 8d95991
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 1 deletion.
diff --git a/local_packages/psi/Configuration/Sets/Psi/TypoScript/Plugins/.gitkeep b/local_packages/psi/Configuration/Sets/Psi/TypoScript/Plugins/.gitkeep
diff --git a/...ackages/psi/Configuration/Sets/Psi/TypoScript/Plugins/indexed-search/constants.typoscript b/...ackages/psi/Configuration/Sets/Psi/TypoScript/Plugins/indexed-search/constants.typoscript
@@ -1 +1,6 @@
 @import "EXT:indexed_search/Configuration/TypoScript/constants.typoscript"
+
+plugin.tx_indexedsearch.settings.rootPidList = -1
+plugin.tx_indexedsearch.view.templateRootPath = EXT:psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/
+plugin.tx_indexedsearch.view.partialRootPath = EXT:psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/
+plugin.tx_indexedsearch.view.layoutRootPath = EXT:psi/Resources/Private/Templates/Plugins/IndexedSearch/Layouts/
diff --git a/.../Sets/Psi/TypoScript/constants.typoscript → ...nfiguration/Sets/Psi/constants.typoscript b/.../Sets/Psi/TypoScript/constants.typoscript → ...nfiguration/Sets/Psi/constants.typoscript
diff --git a/local_packages/psi/Resources/Private/Templates/Partials/Header.html b/local_packages/psi/Resources/Private/Templates/Partials/Header.html
@@ -15,7 +15,7 @@
         </div>
         <f:if condition="{frontendusername}">
             <div class="header-search-container">
-                <form method="post" action="{f:uri.page(pageUid: settings.psi.pageIds.searchresult, additionalParams:'{tx_indexedsearch_pi2: {action:\'search\',controller:\'Search\'}}')}">
+                <form method="post" action="{f:uri.action(action: 'search', controller: 'Search', extensionName: 'IndexedSearch', pluginName: 'Pi2', pageUid: settings.psi.pageIds.searchresult)}">
                     <input type="text" name="tx_indexedsearch_pi2[search][sword]" value="">
                     <input type="submit" value="Suchen" name="tx_indexedsearch_pi2[search][submitButton]">
                 </form>

diff --git a/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Form.html b/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Form.html
@@ -0,0 +1,95 @@
+<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[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" />
+            </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="{allMediaTypes}">
+                    <div class="tx-indexedsearch-search-in">
+                        <label for="tx-indexedsearch-selectbox-media"><f:translate key="form.searchIn" />:</label>
+                        <f:form.select name="search[mediaType]" options="{allMediaTypes}" value="{searchParams.mediaType}" id="tx-indexedsearch-selectbox-media" class="tx-indexedsearch-selectbox-media media" />
+                    </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" />&nbsp;
+                        <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>
+            </f:if>
+            </p>
+        </f:if>
+    </f:form>
+</div>
+</html>
diff --git a/...l_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Pagination.html b/...l_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Pagination.html
@@ -0,0 +1,38 @@
+<html
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+    data-namespace-typo3-fluid="true"
+>
+
+<f:if condition="{pagination}">
+    <ul class="tx-indexedsearch-browsebox">
+        <f:if condition="{pagination.previousPageNumber}">
+            <li class="tx-indexedsearch-browselist-next">
+                <a href="#" class="tx-indexedsearch-page-selector" data-prefix="tx_indexedsearch" data-pointer="{pagination.previousPageNumber - 1}" data-free-index-uid="{freeIndexUid}">
+                    <f:translate key="displayResults.previous" />
+                </a>
+            </li>
+        </f:if>
+
+        <f:for each="{pagination.allPageNumbers}" as="pageNumber">
+            <f:variable name="pageLabel" value="{f:translate(key: 'displayResults.page')} {pageNumber}" />
+            <f:if condition="{pageNumber} == {searchParams.pointer + 1}">
+                <f:then>
+                    <li><strong><a href="#" class="tx-indexedsearch-page-selector" data-prefix="tx_indexedsearch" data-pointer="{pageNumber - 1}" data-free-index-uid="{freeIndexUid}" aria-current="page">{pageLabel}</a></strong></li>
+                </f:then>
+                <f:else>
+                    <li><a href="#" class="tx-indexedsearch-page-selector" data-prefix="tx_indexedsearch" data-pointer="{pageNumber - 1}" data-free-index-uid="{freeIndexUid}">{pageLabel}</a></li>
+                </f:else>
+            </f:if>
+        </f:for>
+
+        <f:if condition="{pagination.nextPageNumber}">
+            <li class="tx-indexedsearch-browselist-next">
+                <a href="#" class="tx-indexedsearch-page-selector" data-prefix="tx_indexedsearch" data-pointer="{pagination.nextPageNumber - 1}" data-free-index-uid="{freeIndexUid}">
+                    <f:translate key="displayResults.next" />
+                </a>
+            </li>
+        </f:if>
+    </ul>
+</f:if>
+
+</html>
diff --git a/...packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Searchresult.html b/...packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Partials/Searchresult.html
@@ -0,0 +1,35 @@
+<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">
+<div class="tx-indexedsearch-res">
+    <h3>
+        <f:if condition="{settings.displayResultNumber}"><span class="tx-indexedsearch-result-number">{row.result_number}</span></f:if>
+        <span class="tx-indexedsearch-title">{row.title -> f:format.raw()}</span>
+        <span class="tx-indexedsearch-percent">{is:searchResult.rating(firstRow: firstRow, sortOrder: searchParams.sortOrder, row: row)}</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" />&nbsp;</dt>
+        <dd class="tx-indexedsearch-text-item-size">{row.size}</dd>
+        <dt class="tx-indexedsearch-text-item-crdate"><f:translate key="result.created" />&nbsp;</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" />&nbsp;</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" />&nbsp;</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">
+                <f:render partial="Searchresult" arguments="{row: subrow}" />
+            </f:for>
+        </p>
+    </f:if>
+</div>
+</html>
diff --git a/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/Form.html b/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/Form.html
@@ -0,0 +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/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/Search.html b/local_packages/psi/Resources/Private/Templates/Plugins/IndexedSearch/Templates/Search.html
@@ -0,0 +1,8 @@
+<html
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+    data-namespace-typo3-fluid="true"
+>
+
+dsaDFsd
+
+</html>