Merge pull request #957 from gethinode/develop

Improve image handling
Merge branch 'main' into develop
2025-10-14 13:33:09 +00:00 · 2024-05-27 11:01:32 +02:00 · 2024-05-27 10:55:17 +02:00 · 2024-05-27 10:54:48 +02:00 · 2024-05-27 10:48:23 +02:00 · 2024-05-27 08:48:19 +00:00
6 changed files with 32 additions and 30 deletions
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/gethinode/mod-katex v1.1.0 // indirect
 	github.com/gethinode/mod-leaflet v1.1.0 // indirect
 	github.com/gethinode/mod-lottie v1.5.0 // indirect
-	github.com/gethinode/mod-utils/v2 v2.3.1 // indirect
+	github.com/gethinode/mod-utils/v2 v2.3.2 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -202,6 +202,8 @@ github.com/gethinode/mod-utils/v2 v2.3.0 h1:e3uhlAGasvXe+cgvcmzRe05Zo4UEx86uk0Tb
 github.com/gethinode/mod-utils/v2 v2.3.0/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
 github.com/gethinode/mod-utils/v2 v2.3.1 h1:blqynoRJ+H2SPfSU28iYheYWPH39MKNtK5HKJPghL3M=
 github.com/gethinode/mod-utils/v2 v2.3.1/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.3.2 h1:QxYtHqeiLfAg+38ULFr3qYwNuypcnV1KzsmmNUjbX+U=
+github.com/gethinode/mod-utils/v2 v2.3.2/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3 h1:H/qVR5O4BXjRjD+5PZB+r4ug2BSJ2Of4RtwOntd+OKo=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg=
--- a/layouts/partials/assets/helpers/image-definition.html
+++ b/layouts/partials/assets/helpers/image-definition.html
@@ -65,15 +65,15 @@
 {{ else }}
    {{ $transform = "fit" }}
    {{- $res := partial "utilities/GetImage.html" (dict "url" $url "page" $page) -}}
-    {{ with $res }}
+    {{ if and $res $res.resource }}
        {{ $img = $res.resource }}
        {{ if $res.mirror }}{{ $class = printf "%s mirrorred" $class }}{{ end }}
-    {{ end }}

-    {{ $widths := partial "assets/helpers/GetDimension.html" (dict "ratio" "auto") }}
-    {{ range $width := $widths -}}
-        {{- $dims = $dims | append (printf "%dx%d" (int $width) (int (math.Round (mul (div (float $width) $img.Width) $img.Height)))) -}}
-    {{- end -}}
+        {{ $widths := partial "assets/helpers/GetDimension.html" (dict "ratio" "auto") }}
+        {{ range $width := $widths -}}
+            {{- $dims = $dims | append (printf "%dx%d" (int $width) (int (math.Round (mul (div (float $width) $img.Width) $img.Height)))) -}}
+        {{- end -}}
+    {{ end }}
 {{ end }}

 <!-- Derive image width and height -->
--- a/layouts/partials/assets/image.html
+++ b/layouts/partials/assets/image.html
@@ -50,25 +50,25 @@
    )
 -}}

-{{- if $mode -}}
-    {{- $ext := path.Ext $url -}}
-    {{- $base := strings.TrimSuffix $ext $url -}}
-    {{- range $suffix := $modes -}}
-        {{- $base = strings.TrimSuffix (printf "-%s" $suffix) $base -}}
-    {{- end -}}
-
-    {{- range $suffix := $modes -}}
-        {{- $image := printf "%s-%s%s" $base $suffix $ext -}}
-        {{- $params = merge $params (dict
-            "url" $image
-            "mode" $suffix
-            "modes" $modes)
-        -}}
-    {{- end -}}
-{{ else }}
-    {{- $params = merge $params (dict "url" $url) -}}
-{{- end -}}
-
 {{ if not $error }}
-    {{- partial "assets/helpers/image-definition.html" $params -}}
+    {{- if $mode -}}
+        {{- $ext := path.Ext $url -}}
+        {{- $base := strings.TrimSuffix $ext $url -}}
+        {{- range $suffix := $modes -}}
+            {{- $base = strings.TrimSuffix (printf "-%s" $suffix) $base -}}
+        {{- end -}}
+
+        {{- range $suffix := $modes -}}
+            {{- $image := printf "%s-%s%s" $base $suffix $ext -}}
+            {{- $params = merge $params (dict
+                "url" $image
+                "mode" $suffix
+                "modes" $modes)
+            -}}
+            {{- partial "assets/helpers/image-definition.html" $params -}}
+        {{- end -}}
+    {{ else }}
+        {{- $params = merge $params (dict "url" $url) -}}
+        {{- partial "assets/helpers/image-definition.html" $params -}}
+    {{- end -}}
 {{ end }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.0-beta2",
+  "version": "0.24.0-beta4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.24.0-beta2",
+      "version": "0.24.0-beta4",
      "license": "MIT",
      "devDependencies": {
        "@fullhuman/postcss-purgecss": "^6.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.0-beta2",
+  "version": "0.24.0-beta4",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	7dde897e41	Merge pull request #957 from gethinode/develop Improve image handling	2024-05-27 11:01:32 +02:00
Mark Dumay	f2cad0fe88	Merge branch 'main' into develop	2024-05-27 10:55:17 +02:00
Mark Dumay	eed2d8f68d	Merge pull request #956 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-05-27 10:54:48 +02:00
Mark Dumay	d1aebe2fbe	Bump package release	2024-05-27 10:48:23 +02:00
markdumay	013614b149	fix: update Hugo module dependencies	2024-05-27 08:48:19 +00:00
Mark Dumay	d55446d5cc	Improve image handling	2024-05-27 10:35:06 +02:00
Mark Dumay	80a225e814	Merge pull request #955 from gethinode/develop Fix image color mode	2024-05-26 19:29:27 +02:00
Mark Dumay	c7e63308c5	Bump package release	2024-05-26 19:22:10 +02:00
Mark Dumay	7bc712b5f3	Merge branch 'main' into develop	2024-05-26 19:15:44 +02:00
Mark Dumay	cf95a84f2a	Fix image color mode	2024-05-26 19:14:59 +02:00