Merge pull request #630 from gethinode/develop

Improve list overview of subsections
Merge branch 'main' into develop
2025-10-10 11:33:12 +00:00 · 2023-11-13 12:49:40 +01:00 · 2023-11-13 11:53:02 +01:00 · 2023-11-13 11:52:15 +01:00 · 2023-11-12 17:55:05 +01:00 · 2023-11-12 15:32:19 +01:00
8 changed files with 72 additions and 21 deletions
--- a/layouts/partials/assets/image.html
+++ b/layouts/partials/assets/image.html
@@ -223,6 +223,12 @@
    {{- if hasSuffix $url "svg" -}}
        {{- $fallbackURL = $url -}}
        {{- $isVector = true -}}
+        {{- $res := partial "utilities/GetResource.html" (dict "url" $url "page" $page) -}}
+        {{ if not $res }}
+            {{- if not (fileExists (path.Join "/static" $url)) -}}
+                {{ warnf "Cannot find vector image resource: %q" $url -}}
+            {{ end }}
+        {{ end }}
    {{- else -}}
        {{- $res := partial "utilities/GetImage.html" (dict "url" $url "page" $page) -}}
        {{- $img := "" -}}
--- a/layouts/partials/assets/section-list.html
+++ b/layouts/partials/assets/section-list.html
@@ -84,6 +84,8 @@
        {{ $opts := dict "namedSlices" (slice $keywords) }}
        {{ $list = site.RegularPages.Related $opts }}
    {{ end }}
+{{ else if $page.IsSection }}
+    {{ $list = $page.Pages }}
 {{ else if $nested }}
    {{ $list = where site.RegularPages "Type" "in" $section }}
 {{ else if $home }}
--- a/layouts/partials/utilities/GetImage.html
+++ b/layouts/partials/utilities/GetImage.html
@@ -13,18 +13,8 @@
 {{ $mirror := false }}

 {{ $supportedMediaTypes := slice "image/png" "image/jpeg" "image/gif" "image/tiff" "image/bmp" "image/webp" -}}
-{{ $img := "" }}
 {{ $remote := hasPrefix (lower $url) "http" }}
-{{ if $remote }}
-    {{ $img = resources.GetRemote $url -}}
-{{ else }}
-    {{ if $page }}
-        {{ $img = $page.Resources.Get $url -}}
-    {{ end }}
-    {{ if not $img }}
-        {{ $img = resources.GetMatch $url }}
-    {{ end }}
-{{ end }}
+{{- $img := partial "utilities/GetResource.html" (dict "url" $url "page" $page) -}}

 {{ with $img -}}
    {{ if in $supportedMediaTypes (string $img.MediaType) -}}
--- a/layouts/partials/utilities/GetResource.html
+++ b/layouts/partials/utilities/GetResource.html
@@ -0,0 +1,25 @@
+<!-- 
+    Retrieve a local or remote resource. If the url starts with 'http', the resource is retrieved from an external
+    location. Else, the url is matched with a page resource and site asset (in that order). The partial returns nil if
+    the resource cannot be found. The partial supports the following arguments:
+    "url"           Required path or url of the resource, e.g. "img/example.jpg" or "https://example.com/img.jpg"
+    "page"          Optional page context, used to retrieve a resource from page resources.
+-->
+
+{{ $url := .url -}}
+{{ $page := .page -}}
+
+{{ $res := "" }}
+{{ $remote := hasPrefix (lower $url) "http" }}
+{{ if $remote }}
+    {{ $res = resources.GetRemote $url -}}
+{{ else }}
+    {{ if $page }}
+        {{ $res = $page.Resources.Get $url -}}
+    {{ end }}
+    {{ if not $res }}
+        {{ $res = resources.GetMatch $url }}
+    {{ end }}
+{{ end }}
+
+{{ return $res -}}
--- a/layouts/shortcodes/card.html
+++ b/layouts/shortcodes/card.html
@@ -23,7 +23,7 @@

 {{ $path := or (.Get "path") "" }}
 {{ $page := .Page }}
-{{ with $path }}
+{{ if $path }}
    {{ $page = $.Site.GetPage $path }}
    {{ if not $page }}
        {{ errorf "Invalid or missing value for param 'path': %s" .Position -}}
--- a/layouts/shortcodes/timeline.html
+++ b/layouts/shortcodes/timeline.html
@@ -50,7 +50,7 @@
    <div class="col-{{ $col }} d-flex justify-content-{{ $direction }} align-items-center">
        <div class="d-flex">
            <div class="d-flex timeline-semi-circle-{{ $direction }} fa-wrapper align-items-center justify-content-center">
-                {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fluid" $icon)) }}
+                {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fluid" $icon) "spacing" false) }}
            </div>
            <div class="timeline-connector-{{ $direction }} {{ if eq $direction "start" }} order-first{{ end }}"></div>
        </div>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.5",
+  "version": "0.21.6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.21.5",
+      "version": "0.21.6",
      "license": "MIT",
      "devDependencies": {
        "@fullhuman/postcss-purgecss": "^5.0.0",
@@ -18,7 +18,7 @@
        "eslint": "^8.53.0",
        "eslint-config-standard": "^17.1.0",
        "eslint-plugin-import": "^2.29.0",
-        "eslint-plugin-n": "^16.3.0",
+        "eslint-plugin-n": "^16.3.1",
        "eslint-plugin-promise": "^6.1.1",
        "hugo-bin": "^0.116.4",
        "markdownlint-cli2": "^0.10.0",
@@ -1529,6 +1529,18 @@
        "node": "*"
      }
    },
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/builtins": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
@@ -2938,9 +2950,9 @@
      "dev": true
    },
    "node_modules/eslint-plugin-n": {
-      "version": "16.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.3.0.tgz",
-      "integrity": "sha512-/XZLH5CUXGK3laz3xYFNza8ZxLCq8ZNW6MsVw5z3d5hc2AwZzi0fPiySFZHQTdVDOHGs2cGv91aqzWmgBdq2gQ==",
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.3.1.tgz",
+      "integrity": "sha512-w46eDIkxQ2FaTHcey7G40eD+FhTXOdKudDXPUO2n9WNcslze/i/HT2qJ3GXjHngYSGDISIgPNhwGtgoix4zeOw==",
      "dev": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.4.0",
@@ -2948,6 +2960,7 @@
        "eslint-plugin-es-x": "^7.1.0",
        "get-tsconfig": "^4.7.0",
        "ignore": "^5.2.4",
+        "is-builtin-module": "^3.2.1",
        "is-core-module": "^2.12.1",
        "minimatch": "^3.1.2",
        "resolve": "^1.22.2",
@@ -4576,6 +4589,21 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dev": true,
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/is-callable": {
      "version": "1.2.7",
      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.5",
+  "version": "0.21.6",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -76,7 +76,7 @@
    "eslint": "^8.53.0",
    "eslint-config-standard": "^17.1.0",
    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.3.0",
+    "eslint-plugin-n": "^16.3.1",
    "eslint-plugin-promise": "^6.1.1",
    "hugo-bin": "^0.116.4",
    "markdownlint-cli2": "^0.10.0",
Author	SHA1	Message	Date
Mark Dumay	c349c28f08	Merge pull request #630 from gethinode/develop Improve list overview of subsections	2023-11-13 12:49:40 +01:00
Mark Dumay	e73f96ffe9	Merge branch 'main' into develop	2023-11-13 11:53:02 +01:00
mark	bd4ab51aff	Improve list overview of subsections	2023-11-13 11:52:15 +01:00
Mark Dumay	81823c35ec	Merge pull request #629 from gethinode/develop Fix variable scope error	2023-11-12 17:55:05 +01:00
Mark Dumay	c567949205	Merge branch 'main' into develop	2023-11-12 15:32:19 +01:00
mark	def136cb1b	Fix variable scope error	2023-11-12 15:31:55 +01:00
Mark Dumay	889dc2e5ef	Merge pull request #628 from gethinode/develop Fix spacing of timeline icons	2023-11-11 17:01:08 +01:00
Mark Dumay	371323f929	Merge branch 'main' into develop	2023-11-11 16:56:03 +01:00
mark	1694702d11	Fix spacing of timeline icons	2023-11-11 16:55:36 +01:00
Mark Dumay	048f50ddc4	Merge pull request #627 from gethinode/develop Add check for vector image availability	2023-11-10 19:34:22 +01:00
Mark Dumay	488cfc576b	Merge branch 'main' into develop	2023-11-10 18:25:39 +01:00
mark	1d8e564acf	Update package version	2023-11-10 18:25:02 +01:00
mark	6e94bc279b	Add check for vector image availability	2023-11-10 18:24:31 +01:00
github-actions[bot]	90ee15cccf	Merge pull request #626 from gethinode/dependabot/npm_and_yarn/eslint-plugin-n-16.3.1 Bump eslint-plugin-n from 16.3.0 to 16.3.1	2023-11-10 13:46:56 +00:00
dependabot[bot]	751ff334ac	Bump eslint-plugin-n from 16.3.0 to 16.3.1 Bumps [eslint-plugin-n](https://github.com/eslint-community/eslint-plugin-n) from 16.3.0 to 16.3.1. - [Release notes](https://github.com/eslint-community/eslint-plugin-n/releases) - [Commits](https://github.com/eslint-community/eslint-plugin-n/compare/16.3.0...16.3.1) --- updated-dependencies: - dependency-name: eslint-plugin-n dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-10 13:41:17 +00:00