Skip to content

Commit

Permalink
Merge pull request #10 from TYPO3incubator/surfcamp-team-jacuzzi-fil
Browse files Browse the repository at this point in the history
FE Fixes, Translations & IndexedSearch
  • Loading branch information
o-ba authored Apr 12, 2024
2 parents 021e6b5 + 4811efc commit 8ec4d0b
Show file tree
Hide file tree
Showing 10 changed files with 278 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
@import "EXT:indexed_search/Configuration/TypoScript/setup.typoscript"

plugin.tx_indexedsearch.targetPid = {$psi.pageIds.searchresult}
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,3 @@ lib.frontenduseravatar {
}
}


lib.frontenduserlogoutbutton = COA_INT
lib.frontenduserlogoutbutton {
10 = TEXT
10.value = LOGOUT
10.typolink {
parameter.data = TSFE:id
additionalParams = &logintype=logout
}
}
2 changes: 1 addition & 1 deletion local_packages/psi/Configuration/Sets/Psi/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ psi:
mainnavigation: 1
footernavigation: 12
pageIds:
searchresult: 37
searchresult: 7
breakpoints:
desktop:
media: '(min-width: 1200px)'
Expand Down
84 changes: 84 additions & 0 deletions local_packages/psi/Resources/Private/Language/es.locallang.xlf
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" target-language="es" datatype="plaintext" date="2024-04-08T16:16:32Z" product-name="psi">
<header/>
<body>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.status_header">
<source>Confidentiality Header</source>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.status_message">
<source>Confidentiality Message</source>
</trans-unit>

<trans-unit id="fe_users.info.header">
<source>User information</source>
<target>Informaciones Usero</target>
</trans-unit>
<trans-unit id="fe_users.contact.header">
<source>Contact information</source>
</trans-unit>
<trans-unit id="fe_users.bio.header">
<source>Short Bio</source>
</trans-unit>

<trans-unit id="fe_users.firstname.label">
<source>First Name:</source>
</trans-unit>
<trans-unit id="fe_users.lastname.label">
<source>Last Name:</source>
</trans-unit>
<trans-unit id="fe_users.title.label">
<source>Position / Department:</source>
</trans-unit>
<trans-unit id="fe_users.address.label">
<source>Address:</source>
</trans-unit>
<trans-unit id="fe_users.country.label">
<source>Country:</source>
</trans-unit>
<trans-unit id="fe_users.city.label">
<source>City:</source>
</trans-unit>
<trans-unit id="fe_users.zip.label">
<source>ZIP Code:</source>
</trans-unit>
<trans-unit id="fe_users.email.label">
<source>Email Address:</source>
</trans-unit>
<trans-unit id="fe_users.telephone.label">
<source>Telephone:</source>
</trans-unit>
<trans-unit id="fe_users.fax.label">
<source>Fax:</source>
</trans-unit>
<trans-unit id="breadcrumb">
<source>You are on page:</source>
<target>Estas en pagina:</target>
</trans-unit>
<trans-unit id="search-button">
<source>Search</source>
<target>Buscar</target>
</trans-unit>
<trans-unit id="form.legend" resname="form.legend">
<source>Search form</source>
<target>Buscar Formular</target>
</trans-unit>
<trans-unit id="form.legend" resname="form.legend">
<source>Search form</source>
<target>Formulario de búsquedar</target>
</trans-unit>
<trans-unit id="form.linkToAdvancedSearch" resname="form.linkToAdvancedSearch">
<source>Advanced Search</source>
<target>Búsqueda Avanzada</target>
</trans-unit>
<trans-unit id="result.noResult" resname="result.noResult">
<source>No results found.</source>
<target>No se han encontrado resultados.</target>
</trans-unit>
<trans-unit id="logout-label" resname="logout-label">
<source>Logout</source>
<target>Salir del systema</target>
</trans-unit>
</body>
</file>
</xliff>
21 changes: 21 additions & 0 deletions local_packages/psi/Resources/Private/Language/locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,27 @@
<trans-unit id="fe_users.fax.label">
<source>Fax:</source>
</trans-unit>
<trans-unit id="breadcrumb">
<source>You are on page:</source>
</trans-unit>
<trans-unit id="search-button">
<source>Search</source>
</trans-unit>
<trans-unit id="form.legend" resname="form.legend">
<source>Search form</source>
</trans-unit>
<trans-unit id="form.searchFor" resname="form.searchFor">
<source>Search for</source>
</trans-unit>
<trans-unit id="form.linkToAdvancedSearch" resname="form.linkToAdvancedSearch">
<source>Advanced Search</source>
</trans-unit>
<trans-unit id="result.noResult" resname="result.noResult">
<source>No results found.</source>
</trans-unit>
<trans-unit id="logout-label" resname="logout-label">
<source>Logout</source>
</trans-unit>
</body>
</file>
</xliff>
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,21 @@

<footer id="site-footer">
<div class="footer-container">
<f:if condition="{frontenduserlogoutbutton}">
<f:if condition="{frontendusername}">
<div class="footer-logout">
{frontenduserlogoutbutton -> f:format.raw()}
<f:link.page pageUid="{site.rootPageId}" additionalParams="{'logintype': 'logout'}"><f:translate key="logout-label" extensionName="psi"/></f:link.page>
<svg class="svg-icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
<path d="M640 768c-12.8 0-21.333333-4.266667-29.866667-12.8-17.066667-17.066667-17.066667-42.666667 0-59.733333l213.333333-213.333333c17.066667-17.066667 42.666667-17.066667 59.733333 0s17.066667 42.666667 0 59.733333l-213.333333 213.333333C661.333333 763.733333 652.8 768 640 768z" />
<path d="M853.333333 554.666667c-12.8 0-21.333333-4.266667-29.866667-12.8l-213.333333-213.333333c-17.066667-17.066667-17.066667-42.666667 0-59.733333s42.666667-17.066667 59.733333 0l213.333333 213.333333c17.066667 17.066667 17.066667 42.666667 0 59.733333C874.666667 550.4 866.133333 554.666667 853.333333 554.666667z" />
<path d="M853.333333 554.666667 170.666667 554.666667c-25.6 0-42.666667-17.066667-42.666667-42.666667s17.066667-42.666667 42.666667-42.666667l682.666667 0c25.6 0 42.666667 17.066667 42.666667 42.666667S878.933333 554.666667 853.333333 554.666667z" />
</svg>
</div>
</f:if>
<f:if condition="{breadcrumb}">
<f:then>
<f:variable name="breadcrumblength"><f:count>{breadcrumb}</f:count></f:variable>
<div class="breadcrumb-container">
<p>You are on page: </p>
<p><f:translate key="breadcrumb" extensionName="psi"/></p>
<ul id="breadcrumb-menu">
<f:for as="item" iteration="i" each="{breadcrumb}">
<li>
Expand Down Expand Up @@ -41,4 +46,4 @@
</div>
</footer>

</html>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,22 @@
<div class="header-search-container">
<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]">
<input type="submit" value="{f:translate(key: 'search-button', extensionName: 'psi')}" name="tx_indexedsearch_pi2[search][submitButton]">
</form>
</div>
</f:if>
<div class="language-menu">
<ul id="language-navigation">
<f:for as="lang" each="{languagenavigation}">
<li>
<a title="{lang.title}" hreflang="{lang.hreflang}" href="{lang.link}">
<span>{lang.title}</span>
</a>
</li>
<f:if condition="{lang.available}">
<f:then>
<li>
<a title="{lang.title}" hreflang="{lang.hreflang}" href="{lang.link}">
<span>{lang.title}</span>
</a>
</li>
</f:then>
</f:if>
</f:for>
</ul>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
<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>
<fieldset id="search-form">
<legend><f:translate key="form.legend" extensionName="psi"/></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" />
<label for="tx-indexedsearch-searchbox-sword"><f:translate key="search-button" extensionName="psi"/>:</label>
<f:form.textfield name="search[sword]" value="{sword}" id="tx-indexedsearch-searchbox-sword" class="search-searchbox 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>
<label for="tx-indexedsearch-selectbox-searchtype"><f:translate key="search-button" extensionName="psi"/>:</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>
Expand Down Expand Up @@ -75,17 +75,17 @@
</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" />
<f:form.submit name="search[submitButton]" value="{f:translate(key: 'search-button', extensionName: 'psi')}" id="tx-indexedsearch-searchbox-button-submit" class="header-searchbutton" />
</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:link.action action="form" arguments="{search: {sword: sword, 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:link.action action="form" arguments="{search: {sword: sword, extendedSearch: 1}}"><f:translate key="form.linkToAdvancedSearch" /></f:link.action>
</f:else>
</f:if>
</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<html
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true"
>

<f:asset.script identifier="indexed_search_pagination" src="EXT:indexed_search/Resources/Public/JavaScript/pagination.js" />

<f:alias map="{sword: searchParams.sword}">
<f:render partial="Form" arguments="{_all}" />
</f:alias>
<f:for each="{resultsets}" as="result" key="freeIndexUid">
<f:if condition="{result.categoryTitle}">
<h1 class="tx-indexedsearch-category">{result.categoryTitle}</h1>
</f:if>
<f:if condition="{result.count} > 0">
<div class="tx-indexedsearch-info-sword">
<f:for each="{searchWords}" as="searchWord" key="key">
<f:if condition="{key} > 0">
<f:then>
<f:translate key="searchFor.{searchWord.operatorLabel}" />&nbsp;<span class="tx-indexedsearch-info-sword-word">{searchWord.sword}</span>
</f:then>
<f:else>
<f:translate key="searchFor" />&nbsp;<span class="tx-indexedsearch-info-sword-word">{searchWord.sword}</span>
</f:else>
</f:if>
</f:for>
</div>
</f:if>
{result.searchedInSectionInfo}
<f:if condition="{result.count} > 0">
<f:then>
<div class="tx-indexedsearch-browsebox">
<f:sanitize.html>
<f:translate key="displayResults" arguments="{0: result.pagination.startRecordNumber, 1: result.pagination.endRecordNumber, 2: result.pagination.totalAmount}" />
</f:sanitize.html>

<!-- render the anchor-links to the sections inside the displayed result rows -->
<f:if condition="{result.affectedSections}">
<div class="tx-indexedsearch-sectionlinks">
<table cellpadding="0" cellspacing="0" border="0" summary="Result links">
<f:for each="{result.affectedSections}" as="sectionData" key="sectionId">
<tr>
<td width="100%">--&gt;&nbsp;
<f:link.page section="anchor_{sectionId}" addQueryString="1"
argumentsToBeExcludedFromQueryString="{0: 'id'}">
<f:if condition="{sectionData.0}">
<f:then>{sectionData.0}</f:then>
<f:else><f:translate key="unnamedSection" /></f:else>
</f:if>
&nbsp;({sectionData.1}&nbsp;<f:translate key="{f:if(condition: '{sectionData.1} > 1', then: 'result.pages', else: 'result.page')}" />)
</f:link.page>
</td>
</tr>
</f:for>
</table>
</div>
</f:if>

<f:render partial="Pagination" arguments="{pagination: result.pagination, searchParams: searchParams}" />
</div>
<f:for each="{result.rows}" as="row">
<f:if condition="{row.isSectionHeader}">
<f:then>
<div id="anchor_{row.sectionId}" class="tx-indexedsearch-sectionhead">
<h2 class="tx-indexedsearch-title"><f:format.html>{row.sectionTitle}</f:format.html> <span class="tx-indexedsearch-result-count">{row.numResultRows} <f:translate key="{f:if(condition: '{row.numResultRows} > 1', then: 'result.pages', else: 'result.page')}" /></span></h2>
</div>
</f:then>
<f:else>
<f:render partial="Searchresult" arguments="{row: row, searchParams: searchParams, firstRow: firstRow}" />
</f:else>
</f:if>
</f:for>
<div class="tx-indexedsearch-browsebox">
<f:render partial="Pagination" arguments="{pagination: result.pagination, searchParams: searchParams, freeIndexUid: freeIndexUid}" />
</div>
</f:then>
<f:else>
<div class="tx-indexedsearch-info-noresult">
<f:translate key="result.noResult" extensionName="psi" />
</div>
</f:else>
</f:if>
</f:for>
</html>
Loading

0 comments on commit 8ec4d0b

Please sign in to comment.