Skip to content

Commit

Permalink
[TASK] Optimize indexed search form
Browse files Browse the repository at this point in the history
  • Loading branch information
@benjaminkott
benjaminkott committed Jun 15, 2023
1 parent ab2c2c9 commit 8698ff9
Show file tree
Hide file tree
Showing 3 changed files with 194 additions and 204 deletions.
266 changes: 127 additions & 139 deletions Resources/Private/Partials/IndexedSearch/Form.html
View file
Expand Up @@ -19,161 +19,149 @@
<legend class="visually-hidden">
<f:translate key="form.legend" />
</legend>
<div class="form-group">
<label for="tx-indexedsearch-searchbox-sword" class="form-label">
<f:translate key="form.searchFor" />
</label>
<div class="input-group">
<f:form.textfield name="search[sword]" value="{sword}" id="tx-indexedsearch-searchbox-sword" class="form-control" />
<f:form.submit name="search[submitButton]" value="{f:translate(key: 'form.submit')}" id="tx-indexedsearch-searchbox-button-submit" class="btn btn-primary" />
<div class="row g-3">
<div class="col-12">
<label for="tx-indexedsearch-searchbox-sword" class="form-label">
<f:translate key="form.searchFor" />
</label>
<div class="input-group">
<f:form.textfield name="search[sword]" value="{sword}" id="tx-indexedsearch-searchbox-sword" class="form-control" />
<f:form.submit name="search[submitButton]" value="{f:translate(key: 'form.submit')}" id="tx-indexedsearch-searchbox-button-submit" class="btn btn-primary" />
</div>
</div>
</div>

<f:if condition="{settings.displayAdvancedSearchLink} || {settings.displayRules}">
<div class="form-group">
<f:if condition="{settings.displayAdvancedSearchLink}">
<f:if condition="{searchParams.extendedSearch}">
<f:then>
<f:link.action class="btn btn-secondary active" action="form" arguments="{search: {extendedSearch: 0}}">
<f:translate key="form.linkToRegularSearch" />
</f:link.action>
</f:then>
<f:else>
<f:link.action class="btn btn-secondary" action="form" arguments="{search: {extendedSearch: 1}}">
<f:translate key="form.linkToAdvancedSearch" />
</f:link.action>
</f:else>
<f:if condition="{settings.displayAdvancedSearchLink} || {settings.displayRules}">
<div class="col-12">
<f:if condition="{settings.displayAdvancedSearchLink}">
<f:if condition="{searchParams.extendedSearch}">
<f:then>
<f:link.action class="btn btn-light" action="form" arguments="{search: {extendedSearch: 0}}">
<f:translate key="form.linkToRegularSearch" />
</f:link.action>
</f:then>
<f:else>
<f:link.action class="btn btn-light" action="form" arguments="{search: {extendedSearch: 1}}">
<f:translate key="form.linkToAdvancedSearch" />
</f:link.action>
</f:else>
</f:if>
</f:if>
</f:if>
<f:if condition="{settings.displayRules}">
<button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#rulesModal">
<f:translate key="rules.headline" />
</button>
<div class="modal fade" id="rulesModal" tabindex="-1" aria-labelledby="searchRulesLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="searchRulesLabel">
<f:translate key="rules.headline" />
</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<f:format.raw><f:translate key="rules.text" /></f:format.raw>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<f:if condition="{settings.displayRules}">
<button type="button" class="btn btn-light" data-bs-toggle="modal" data-bs-target="#rulesModal">
<f:translate key="rules.headline" />
</button>
<div class="modal fade" id="rulesModal" tabindex="-1" aria-labelledby="searchRulesLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title h4" id="searchRulesLabel">
<f:translate key="rules.headline" />
</h3>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<f:format.raw><f:translate key="rules.text" /></f:format.raw>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
</f:if>
</div>
</f:if>

<f:if condition="{searchParams.extendedSearch}">
<f:if condition="{showTypeSearch}">
<div class="form-group">
<div class="row">
<f:if condition="{allSearchTypes}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-searchtype" class="form-label">
<f:translate key="form.match" />
</label>
<f:form.select name="search[searchType]" options="{allSearchTypes}" value="{searchParams.searchType}" id="tx-indexedsearch-selectbox-searchtype" class="form-select" />
</div>
</f:if>
<f:if condition="{allDefaultOperands}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-defaultoperand" class="form-label">
<f:translate key="searchForm.element.defaultOperand.label" extensionName="bootstrap_package" />
</label>
<f:form.select name="search[defaultOperand]" options="{allDefaultOperands}" value="{searchParams.defaultOperand}" id="tx-indexedsearch-selectbox-defaultoperand" class="form-select" />
</div>
</f:if>
</div>
</div>
</f:if>
<f:if condition="{showMediaAndLanguageSearch}">
<div class="form-group">
<div class="row">
<f:if condition="{allMediaTypes}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-media" class="form-label">
<f:translate key="form.searchIn" />
</label>
<f:form.select name="search[mediaType]" options="{allMediaTypes}" value="{searchParams.mediaType}" id="tx-indexedsearch-selectbox-media" class="form-select" />
</div>
</f:if>
<f:if condition="{allLanguageUids}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-lang" class="form-label">
<f:translate key="searchForm.element.language.label" extensionName="bootstrap_package" />
</label>
<f:form.select name="search[languageUid]" options="{allLanguageUids}" value="{searchParams.languageUid}" id="tx-indexedsearch-selectbox-lang" class="form-select" />
</div>
</f:if>
</div>
</div>
</f:if>
<f:if condition="{allSections}">
<div class="form-group">
<label for="tx-indexedsearch-selectbox-sections" class="form-label">
<f:translate key="form.fromSection" />
</label>
<f:form.select name="search[sections]" options="{allSections}" value="{searchParams.sections}" id="tx-indexedsearch-selectbox-sections" class="form-select" />
</div>
</f:if>
<f:if condition="{allIndexConfigurations}">
<div class="form-group">
<label for="tx-indexedsearch-selectbox-freeIndexUid" class="form-label">
<f:translate key="form.freeIndexUid" />
</label>
<f:form.select name="search[freeIndexUid]" options="{allIndexConfigurations}" value="{searchParams.freeIndexUid}" id="tx-indexedsearch-selectbox-freeIndexUid" class="form-select" />
</f:if>
</div>
</f:if>
<f:if condition="{showSortOrders}">
<div class="form-group">
<div class="row">
<f:if condition="{searchParams.extendedSearch}">
<f:if condition="{showTypeSearch}">
<f:if condition="{allSearchTypes}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-order" class="form-label">
<f:translate key="form.orderBy" />
<label for="tx-indexedsearch-selectbox-searchtype" class="form-label">
<f:translate key="form.match" />
</label>
<f:form.select name="search[sortOrder]" options="{allSortOrders}" value="{searchParams.sortOrder}" id="tx-indexedsearch-selectbox-order" class="form-select" />
<f:form.select name="search[searchType]" options="{allSearchTypes}" value="{searchParams.searchType}" id="tx-indexedsearch-selectbox-searchtype" class="form-select" />
</div>
</f:if>
<f:if condition="{allDefaultOperands}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-desc" class="form-label">
<f:translate key="searchForm.element.sortDesc.label" extensionName="bootstrap_package" />
<label for="tx-indexedsearch-selectbox-defaultoperand" class="form-label">
<f:translate key="searchForm.element.defaultOperand.label" extensionName="bootstrap_package" />
</label>
<f:form.select name="search[sortDesc]" options="{allSortDescendings}" value="{searchParams.sortDesc}" id="tx-indexedsearch-selectbox-desc" class="form-select" />
<f:form.select name="search[defaultOperand]" options="{allDefaultOperands}" value="{searchParams.defaultOperand}" id="tx-indexedsearch-selectbox-defaultoperand" class="form-select" />
</div>
</f:if>
</f:if>
<f:if condition="{showMediaAndLanguageSearch}">
<f:if condition="{allMediaTypes}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-media" class="form-label">
<f:translate key="form.searchIn" />
</label>
<f:form.select name="search[mediaType]" options="{allMediaTypes}" value="{searchParams.mediaType}" id="tx-indexedsearch-selectbox-media" class="form-select" />
</div>
</f:if>
<f:if condition="{allLanguageUids}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-lang" class="form-label">
<f:translate key="searchForm.element.language.label" extensionName="bootstrap_package" />
</label>
<f:form.select name="search[languageUid]" options="{allLanguageUids}" value="{searchParams.languageUid}" id="tx-indexedsearch-selectbox-lang" class="form-select" />
</div>
</f:if>
</f:if>
<f:if condition="{allSections}">
<div class="col-12">
<label for="tx-indexedsearch-selectbox-sections" class="form-label">
<f:translate key="form.fromSection" />
</label>
<f:form.select name="search[sections]" options="{allSections}" value="{searchParams.sections}" id="tx-indexedsearch-selectbox-sections" class="form-select" />
</div>
</div>
</f:if>
<f:if condition="{allNumberOfResults}">
<div class="form-group">
<label for="tx-indexedsearch-selectbox-results" class="form-label">
<f:translate key="form.atATime" />
</label>
<f:form.select name="search[numberOfResults]" options="{allNumberOfResults}" value="{searchParams.numberOfResults}" id="tx-indexedsearch-selectbox-results" class="form-select" />
</div>
</f:if>
<f:if condition="{allGroups}">
<div class="form-group">
<label for="tx-indexedsearch-selectbox-group" class="form-label">
<f:translate key="form.style" />
</label>
<div class="input-group">
<f:form.select name="search[group]" options="{allGroups}" value="{searchParams.group}" id="tx-indexedsearch-selectbox-group" class="form-select" />
<f:if condition="{settings.blind.extResume} == 0">
<div class="input-group-text">
<f:form.checkbox class="form-check-input mt-0" name="search[extResume]" id="tx_indexedsearch_extResume" checked="{searchParams.extResume}" value="1" />
</span>
</f:if>
</f:if>
<f:if condition="{allIndexConfigurations}">
<div class="col-12">
<label for="tx-indexedsearch-selectbox-freeIndexUid" class="form-label">
<f:translate key="form.freeIndexUid" />
</label>
<f:form.select name="search[freeIndexUid]" options="{allIndexConfigurations}" value="{searchParams.freeIndexUid}" id="tx-indexedsearch-selectbox-freeIndexUid" class="form-select" />
</div>
</div>
</f:if>
<f:if condition="{showSortOrders}">
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-order" class="form-label">
<f:translate key="form.orderBy" />
</label>
<f:form.select name="search[sortOrder]" options="{allSortOrders}" value="{searchParams.sortOrder}" id="tx-indexedsearch-selectbox-order" class="form-select" />
</div>
<div class="col-sm-6 col-xs-12">
<label for="tx-indexedsearch-selectbox-desc" class="form-label">
<f:translate key="searchForm.element.sortDesc.label" extensionName="bootstrap_package" />
</label>
<f:form.select name="search[sortDesc]" options="{allSortDescendings}" value="{searchParams.sortDesc}" id="tx-indexedsearch-selectbox-desc" class="form-select" />
</div>
</f:if>
<f:if condition="{allNumberOfResults}">
<div class="col-12">
<label for="tx-indexedsearch-selectbox-results" class="form-label">
<f:translate key="form.atATime" />
</label>
<f:form.select name="search[numberOfResults]" options="{allNumberOfResults}" value="{searchParams.numberOfResults}" id="tx-indexedsearch-selectbox-results" class="form-select" />
</div>
</f:if>
<f:if condition="{allGroups}">
<div class="col-12">
<label for="tx-indexedsearch-selectbox-group" class="form-label">
<f:translate key="form.style" />
</label>
<div class="input-group">
<f:form.select name="search[group]" options="{allGroups}" value="{searchParams.group}" id="tx-indexedsearch-selectbox-group" class="form-select" />
<f:if condition="{settings.blind.extResume} == 0">
<div class="input-group-text">
<f:form.checkbox class="form-check-input mt-0" name="search[extResume]" id="tx_indexedsearch_extResume" checked="{searchParams.extResume}" value="1" />
</span>
</f:if>
</div>
</div>
</f:if>
</f:if>
</f:if>
</div>
</fieldset>
</f:form>
</html>
6 changes: 3 additions & 3 deletions Resources/Private/Partials/IndexedSearch/Searchresult.html
View file
@@ -1,6 +1,6 @@
<div class="media">
<div class="media-body">
<h4 class="media-heading">
<article class="card">
<div class="card-body">
<h4>
<f:if condition="{settings.displayResultNumber}">
<span class="tx-indexedsearch-result-number">{row.result_number}</span>
</f:if>
Expand Down

0 comments on commit 8698ff9

Please sign in to comment.