Merge pull request #242 from gethinode/develop

feat: parameterize hardcoded icon references

Author: markdumay

config.toml

@@ -24,10 +24,12 @@
     source = "static"
     target = "static"
 
+[params.icons]
+    search = "fas magnifying-glass"
+
 [params.navigation.search]
     enabled = true
     modal = true
-    icon = "fas magnifying-glass"
 
 [params.modules.flexsearch]
     integration = "core"

layouts/_partials/utilities/GetSearchConfig.html

@@ -1,14 +1,26 @@
 {{- $searchDefault := false -}}
 {{- $searchModal := false -}}
-{{- $searchIcon := "fas magnifying-glass" }}
+{{- $searchIcon := site.Params.icons.search -}}
 {{ if eq (printf "%T" site.Params.navigation.search) "bool" }}
     {{- $searchDefault = site.Params.navigation.search -}}
     {{- $searchModal = site.Params.navigation.searchModal -}}
     {{ warnf "site parameter %q: deprecated in v%s, use %q instead" "navigation.search" "1.12.0" "navigation.search.enabled" }}
 {{ else }}
     {{- $searchDefault = site.Params.navigation.search.enabled -}}
     {{- $searchModal = site.Params.navigation.search.modal -}}
-    {{- $searchIcon = site.Params.navigation.search.icon | default $searchIcon }}
+    {{- if not $searchIcon -}}
+        {{- with site.Params.navigation.search.icon -}}
+            {{- $searchIcon = . -}}
+            {{- partial "utilities/LogWarn.html" (dict
+                "partial" "utilities/GetSearchConfig.html"
+                "warnid"  "warn-deprecated-icons"
+                "msg"     "Deprecated icon params detected; migrate to the [icons] section in params.toml"
+                "details" (slice "Replace 'navigation.search.icon' with 'icons.search'")
+            ) -}}
+        {{- else -}}
+            {{- $searchIcon = "fas magnifying-glass" -}}
+        {{- end -}}
+    {{- end -}}
 {{ end }}
 {{- $search := $searchDefault -}}
 {{- if isset . "search" -}}