From 3a281dfa8aff1ac87d33d8f5ffcfc0a931a9656a Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Sun, 15 Sep 2024 16:18:48 -0700 Subject: [PATCH] Load presets from front matter + allow both bundled and global bergamot files Signed-off-by: Danila Fedorin --- .../bergamot/rendering/minimal.bergamot | 0 layouts/partials/bergamotrenderpreset.html | 2 +- layouts/partials/head.html | 12 ++++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) rename {static => assets}/bergamot/rendering/minimal.bergamot (100%) diff --git a/static/bergamot/rendering/minimal.bergamot b/assets/bergamot/rendering/minimal.bergamot similarity index 100% rename from static/bergamot/rendering/minimal.bergamot rename to assets/bergamot/rendering/minimal.bergamot diff --git a/layouts/partials/bergamotrenderpreset.html b/layouts/partials/bergamotrenderpreset.html index 623cece..ae8d2d2 100644 --- a/layouts/partials/bergamotrenderpreset.html +++ b/layouts/partials/bergamotrenderpreset.html @@ -1,6 +1,6 @@ diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 2cffc6c..791ac04 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -63,10 +63,18 @@ {{ partial "defercss.html" (dict "url" $bergamotStyle.Permalink "extra" "") }} {{ if .Params.bergamot.render_presets }} {{ range $name, $rulefile := .Params.bergamot.render_presets }} - {{ partial "bergamotrenderpreset.html" (dict "name" $name "file" $rulefile) }} + {{ $file := default (resources.Get $rulefile) (page.Resources.Get $rulefile) }} + {{ partial "bergamotrenderpreset.html" (dict "name" $name "file" $file.Content) }} {{ end }} {{ else }} - {{ partial "bergamotrenderpreset.html" (dict "name" "default" "file" "minimal.bergamot") }} + {{ partial "bergamotrenderpreset.html" (dict "name" "default" "file" (resources.Get "bergamot/rendering/minimal.bergamot").Content) }} + {{ end }} + {{ if .Params.bergamot.presets }} + {{ range $name, $preset := .Params.bergamot.presets }} + {{ $file := default (resources.Get $preset.file) (page.Resources.Get $preset.file) }} + {{ $info := dict "name" $name "prompt" $preset.prompt "query" $preset.query "file" $file.Content "renderPreset" $preset.render_preset }} + {{ partial "bergamotpreset.html" $info }} + {{ end }} {{ end }} {{ end }}