Skip to content

GitLab

E
extensions.typo3.org
Commit 7d963045 authored by Thomas Löffler's avatar Thomas Löffler
Browse files
Options

Merge branch 'more-prominent-result-if-exact-match' into 'develop' 

Show exact match of extension key search more prominent

See merge request t3o/ter!349
parents 163e0388 654e37ed
Pipeline #4561 passed with stages
          in 14 minutes and 3 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 83 additions and 58 deletions
          html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html
          View file @ 7d963045
          ......@@ -2,63 +2,80 @@
          xmlns:f="http://typo3.org/ns/TYPO3/Fluid/ViewHelpers"
          xmlns:s="http://typo3.org/ns/ApacheSolrForTypo3/Solr/ViewHelpers">
          <f:section name="Document">
          <li class="card card-size-medium mb-3{f:if(condition:document.isElevated, then: ' results-elevated')}"
          data-document-score="{document.score}"
          data-document-id="{document.id}"
          data-document-url="{document.url}"
          >
          <f:if condition="{document.isElevated}">
          <div class="results-elevated-label">
          <s:translate key="sponsored" />
          </div>
          </f:if>
          <div class="card-body">
          <div class="align-items-center">
          <h3 class="card-title">
          <f:if condition="{document.extensionIcon_stringS}">
          <img class="ter-ext-icon" alt="{document.title}" src="{document.extensionIcon_stringS}" height="32" width="32">
          </f:if>
          <a href="{s:uri.result.addSearchWordList(url:document.url, searchWords:resultSet.usedQuery.keywords)}">{document.title}</a>
          </h3>
          <h4 class="card-subtitle text-muted mb-2">
          {document.extensionKey_stringS} /
          <span class="ter-ext-state ter-ext-state-{document.extensionState_stringS}">{document.extensionState_stringS}</span>
          </h4>
          <p>
          <small>
          <f:format.crop maxCharacters="180" respectWordBoundaries="true">{s:document.highlightResult(resultSet:resultSet, document:document, fieldName:'content')}</f:format.crop>
          <br>
          <em>
          Uploaded on
          <f:format.date format="d M Y">@{document.extensionLastUpload_intS}</f:format.date>
          <f:if condition="{document.author}">
          by
          <f:format.crop maxCharacters="50">{document.author}</f:format.crop>
          </f:if>
          </em>
          </small>
          </p>
          <ul class="list-inline">
          <f:if condition="{document.supports7_boolS}">
          <li class="list-inline-item badge badge-success">7 LTS</li>
          </f:if>
          <f:if condition="{document.supports8_boolS}">
          <li class="list-inline-item badge badge-success">8 LTS</li>
          </f:if>
          <f:if condition="{document.hasManual_boolS}">
          <li class="list-inline-item badge badge-info"><i class="fa fa-book"></i> Has manual</li>
          </f:if>
          </ul>
          <f:section name="DocumentWrap">
          <f:if condition="{exactMatchFound}">
          <f:then>
          <div class="card card-size-medium mb-3 border-primary bg-light"
          data-document-score="{document.score}"
          data-document-id="{document.id}"
          data-document-url="{document.url}"
          >
          <f:render section="Document" arguments="{_all}" />
          </div>
          </f:then>
          <f:else>
          <li class="card card-size-medium mb-3"
          data-document-score="{document.score}"
          data-document-id="{document.id}"
          data-document-url="{document.url}"
          >
          <f:render section="Document" arguments="{_all}" />
          </li>
          </f:else>
          </f:if>
          </f:section>
          <f:section name="Document">
          <f:if condition="{document.isElevated}">
          <div class="results-elevated-label">
          <s:translate key="sponsored" />
          </div>
          </f:if>
          <div class="card-body">
          <div class="align-items-center">
          <h3 class="card-title">
          <f:if condition="{document.extensionIcon_stringS}">
          <img class="ter-ext-icon" alt="{document.title}" src="{document.extensionIcon_stringS}" height="32" width="32">
          </f:if>
          <a href="{s:uri.result.addSearchWordList(url:document.url, searchWords:resultSet.usedQuery.keywords)}">{document.title}</a>
          </h3>
          <h4 class="card-subtitle text-muted mb-2">
          {document.extensionKey_stringS} /
          <span class="ter-ext-state ter-ext-state-{document.extensionState_stringS}">{document.extensionState_stringS}</span>
          </h4>
          <p>
          <small>
          <f:format.crop maxCharacters="{f:if(condition:exactMatchFound, then: '360', else: '180')}" respectWordBoundaries="true">{s:document.highlightResult(resultSet:resultSet, document:document, fieldName:'content')}</f:format.crop>
          <br>
          <em>
          Uploaded on
          <f:format.date format="d M Y">@{document.extensionLastUpload_intS}</f:format.date>
          <f:if condition="{document.author}">
          by
          <f:format.crop maxCharacters="{f:if(condition:exactMatchFound, then: '100', else: '50')}">{document.author}</f:format.crop>
          </f:if>
          </em>
          </small>
          </p>
          <ul class="list-inline">
          <f:if condition="{document.supports7_boolS}">
          <li class="list-inline-item badge badge-success">7 LTS</li>
          </f:if>
          <f:if condition="{document.supports8_boolS}">
          <li class="list-inline-item badge badge-success">8 LTS</li>
          </f:if>
          <f:if condition="{document.hasManual_boolS}">
          <li class="list-inline-item badge badge-info"><i class="fa fa-book"></i> Has manual</li>
          </f:if>
          </ul>
          </div>
          <f:if condition="{document.insecure_boolS}">
          <f:else>
          <a class="btn btn-outline-primary btn-block mb-0" href="{document.extensionDownloadZipUrl_stringS}">
          <i class="fa fa-download"></i> Download version {document.extensionVersion_stringS} as ZIP
          </a>
          </f:else>
          </f:if>
          </li>
          </div>
          <f:if condition="{document.insecure_boolS}">
          <f:else>
          <a class="btn {f:if(condition:exactMatchFound, then: 'btn-primary', else: 'btn-outline-primary')} btn-block mb-0" href="{document.extensionDownloadZipUrl_stringS}">
          <i class="fa fa-download"></i> Download version {document.extensionVersion_stringS} as ZIP
          </a>
          </f:else>
          </f:if>
          </f:section>
          html/typo3conf/ext/ter_layout/Resources/Private/Templates/Solr/Results.html
          View file @ 7d963045
          ......@@ -9,7 +9,6 @@
          <div class="container-fluid">
          <f:render partial="Search/Form" section="Form" arguments="{search:search, additionalFilters:additionalFilters, pluginNamespace: pluginNamespace, resultSet: resultSet}" />
          <f:if condition="{resultSet.usedSearch.numberOfResults}">
          <f:else>
          <div class="alert alert-danger mt-3">
          ......@@ -44,9 +43,18 @@
          <f:if condition="{hasSearched}">
          <s:widget.resultPaginate resultSet="{resultSet}" configuration="{templatePath:'EXT:ter_layout/Resources/Private/Templates/Solr/ViewHelpers/Widget/ResultPaginate/Index.html'}">
          <f:variable name="exactMatchFound" value="0" />
          <f:if condition="{resultSet.usedQuery.queryString -> f:format.case(mode:'lower')} == {documents.0.extensionKey_stringS}">
          <f:render partial="Result/Document" section="Document" arguments="{resultSet:resultSet, document:documents.0, exactMatchFound: 1}" />
          <f:variable name="exactMatchFound" value="1" />
          </f:if>
          <ol start="{pagination.displayRangeStart}" class="results-list list-unstyled card-container">
          <f:for each="{documents}" as="document" iteration="iterator">
          <f:render partial="Result/Document" section="Document" arguments="{resultSet:resultSet, document:document}" />
          <f:if condition="{exactMatchFound} && {iterator.isFirst}">
          <f:else>
          <f:render partial="Result/Document" section="DocumentWrap" arguments="{resultSet:resultSet, document:document}" />
          </f:else>
          </f:if>
          </f:for>
          </ol>
          </s:widget.resultPaginate>
          ......
          Markdown is supported
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment