move iconpack with itemtype icons from search results to liszt_common…

…, style icons on page
slub · Oct 30, 2024 · dead641 · dead641
1 parent 05fe191
commit dead641
Show file tree

Hide file tree

Showing 14 changed files with 230 additions and 7 deletions.
diff --git a/Classes/Common/QueryParamsBuilder.php b/Classes/Common/QueryParamsBuilder.php
@@ -38,14 +38,15 @@ public static function createElasticParams(string $bibIndex, array $searchParams
         } else {
             $params['body']['query'] = [
                 'bool' => [
-                    'must' => [[
-                        'query_string' => [
-                            'query' => $searchParams['searchText']
-                        ]
-                    ]]
+                    'must' => [
+                            ['query_string' => ['query' => $searchParams['searchText']]],
+                    ]
                 ]
             ];
         }
+        if (isset($searchParams['f_itemType']) && $searchParams['f_itemType'] !== "") {
+            $params['body']['query']['bool']['filter']['term']['itemType.keyword'] = $searchParams['f_itemType'];
+        }
         return $params;
     }
 

diff --git a/Configuration/Iconpack/LisztSearchResultsIconpack.yaml b/Configuration/Iconpack/LisztSearchResultsIconpack.yaml
@@ -0,0 +1,40 @@
+iconpack:
+  title: "Liszt Custom Icons for Search Results in LQWV"
+  # The key of the iconpack (!)
+  key: "lziconsr"
+  version: 1.0.0
+
+  renderTypes:
+    svg:
+      # Source folder of the SVG files, which are rendered as <img> tag:
+      source: "EXT:liszt_common/Resources/Public/Icons/IconPackSearchResults/"
+      attributes:
+        class: "lzicon"
+
+    svgInline:
+      # Source folder of the SVG files that are rendered as <svg> tag (inline SVG):
+      source: "EXT:liszt_common/Resources/Public/Icons/IconPackSearchResults/"
+      attributes:
+        class: "lzicon-inline"
+        fill: "currentColor"
+
+
+    svgSprite:
+      source: "EXT:liszt_common/Resources/Public/Icons/IconPackSearchResults/IconSpritesSearchResults.svg"
+      attributes:
+        class: "lzicon-sprite"
+        fill: "currentColor"
+
+  # Define here which icons are provided by this iconpack
+  # In this case, the values here correspond to the file names (without file name extension)
+  icons:
+    - auctionCatalog
+    - lisztDocument
+    - book
+    - attachment
+    - encyclopediaArticle
+    - essay
+    - journalArticle
+    - lisztDocument
+    - musicSheet
+    - thesis
diff --git a/Resources/Private/Templates/Search/Index.html b/Resources/Private/Templates/Search/Index.html
@@ -1,4 +1,7 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<html
+    xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+    xmlns:i="http://typo3.org/ns/Quellenform/Iconpack/ViewHelpers"
+    data-namespace-typo3-fluid="true">
 
 
 
@@ -34,9 +37,12 @@ <h4 class="">{key}</h4>
                         {creator.firstName} {creator.lastName}
                     </f:for>
                 </div>
-                <h3 class="searchresults-item-title">
+                <div class="searchresults-item-title">
+                <div class="searchresults-item-icon"><i:icon iconfig="lziconsr,musicSheet" preferredRenderTypes="svgSprite" additionalAttributes="{aria-hidden:'true'}" /></div>
+                <h3 >
                     {hit._source.title}, {hit._source.title}
                 </h3>
+                </div>
             </header>
             <div class="searchresults-item-details">
                 {hit._source.date}, {hit._source.pages}, {hit._source.archiveLocation}

diff --git a/Resources/Public/Icons/IconPackSearchResults/IconSpritesSearchResults.svg b/Resources/Public/Icons/IconPackSearchResults/IconSpritesSearchResults.svg
diff --git a/Resources/Public/Icons/IconPackSearchResults/attachment.svg b/Resources/Public/Icons/IconPackSearchResults/attachment.svg
diff --git a/Resources/Public/Icons/IconPackSearchResults/auctionCatalog.svg b/Resources/Public/Icons/IconPackSearchResults/auctionCatalog.svg
diff --git a/Resources/Public/Icons/IconPackSearchResults/book.svg b/Resources/Public/Icons/IconPackSearchResults/book.svg
diff --git a/Resources/Public/Icons/IconPackSearchResults/encyclopediaArticle.svg b/Resources/Public/Icons/IconPackSearchResults/encyclopediaArticle.svg