Merge pull request #1047 from gethinode/develop

Suppress undefined navbar links
Merge branch 'main' into develop
2025-10-07 10:04:22 +00:00 · 2024-07-23 12:16:34 +02:00 · 2024-07-23 11:55:18 +02:00 · 2024-07-23 11:54:47 +02:00 · 2024-07-22 14:03:48 +00:00 · 2024-07-22 13:57:31 +00:00
6 changed files with 36 additions and 27 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.5 // indirect
-	github.com/gethinode/mod-simple-datatables v1.0.2 // indirect
+	github.com/gethinode/mod-simple-datatables v1.0.3 // indirect
 	github.com/gethinode/mod-utils/v2 v2.3.10 // 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
@@ -188,6 +188,8 @@ github.com/gethinode/mod-simple-datatables v1.0.0 h1:Dj4WGw12OkaimwkCpLn5Jhmd49d
 github.com/gethinode/mod-simple-datatables v1.0.0/go.mod h1:K8T7fIdb8pMOB+OSW4A5lz5IW99+HyzcTgx764fvOGw=
 github.com/gethinode/mod-simple-datatables v1.0.2 h1:zhqxHet3iLQWYCBbGROALpOY9zQlptMycFkz1Tto5bA=
 github.com/gethinode/mod-simple-datatables v1.0.2/go.mod h1:mmrcvAJU2i3SMU56VmQ5PW43uDXBcsJKcZwCHrvl3Kc=
+github.com/gethinode/mod-simple-datatables v1.0.3 h1:JL2nBlEHWMmkE7EZrpfpmzka47dklJUh23/xKJkOQoI=
+github.com/gethinode/mod-simple-datatables v1.0.3/go.mod h1:mmrcvAJU2i3SMU56VmQ5PW43uDXBcsJKcZwCHrvl3Kc=
 github.com/gethinode/mod-utils v1.0.0 h1:cqHm2xS5uDiJzRm1KfHaNbq6uMVDKLhQa8/BuTZ1nhY=
 github.com/gethinode/mod-utils v1.0.0/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
 github.com/gethinode/mod-utils v1.0.1 h1:jhZGlGFHHL1f5HXbBMXfiZ2gCz4TVafAzjnRPTIBSEE=
--- a/layouts/partials/assets/helpers/image-definition.html
+++ b/layouts/partials/assets/helpers/image-definition.html
@@ -50,24 +50,26 @@
 <!-- Generate image definition -->
 {{- if $caption -}}
    <figure {{ with $wrapper }}class="{{ . }}"{{ end }}>
+{{ else }}
+    {{ with $wrapper }}<div class="{{ . }}">{{ end }}
+{{ end }}
+{{- if not $anchor -}}
+    <img class="img-fluid {{ $class }}"
+        src="{{ $fallbackURL }}"
+        {{ if $lazy }}loading="lazy"{{ end }}
+        {{ with $priority }}fetchpriority="{{ . }}"{{ end }}
+        {{ with $imgset -}}srcset="{{ . }}" sizes="{{ $sizes }}"{{- end }}
+        {{ with $height }}height="{{ . }}"{{ end }}
+        {{ with $width }}width="{{ . }}"{{ end }}
+        {{ with (or $title $caption) }}alt="{{ . }}"{{ end }}>
+{{- else }}
+    <svg class="{{ $class }}">
+        <use href="{{ $fallbackURL }}#{{ $anchor }}"></use>
+    </svg>
 {{ end }}
-<div class="{{ if not $caption }}{{ $wrapper }}{{ end }}">        
-    {{- if not $anchor -}}
-        <img class="img-fluid {{ $class }}"
-            src="{{ $fallbackURL }}"
-            {{ if $lazy }}loading="lazy"{{ end }}
-            {{ with $priority }}fetchpriority="{{ . }}"{{ end }}
-            {{ with $imgset -}}srcset="{{ . }}" sizes="{{ $sizes }}"{{- end }}
-            {{ with $height }}height="{{ . }}"{{ end }}
-            {{ with $width }}width="{{ . }}"{{ end }}
-            {{ with (or $title $caption) }}alt="{{ . }}"{{ end }}>
-    {{- else }}
-        <svg class="{{ $class }}">
-            <use href="{{ $fallbackURL }}#{{ $anchor }}"></use>
-        </svg>
-    {{ end }}
-</div>
 {{- if $caption -}}
        <figcaption class="figure-caption{{ with $figclass }} {{ . }}{{ end }}">{{ $caption | safeHTML }}</figcaption>
    </figure>
+{{ else if $wrapper }}
+    </div>
 {{- end -}}
--- a/layouts/partials/assets/navbar-item.html
+++ b/layouts/partials/assets/navbar-item.html
@@ -24,7 +24,7 @@
 {{- $menuURL := "" -}}
 {{ if or (strings.HasPrefix $menu.PageRef "http") (strings.HasPrefix $menu.URL "http") }}
    {{ $menuURL = or $menu.PageRef $menu.URL }}
-{{ else }}
+{{ else if (or $menu.PageRef $menu.URL) }}
    {{- $menuURL = urls.JoinPath $baseURL ((or $menu.PageRef $menu.URL) | relLangURL) -}}
 {{ end }}
 {{- $pageURL := $page.RelPermalink -}}
@@ -47,6 +47,11 @@
    {{- if $cue -}}
        {{ $suffix = partial "assets/icon.html" (dict "icon" "fas up-right-from-square fa-2xs") }}
    {{- end -}}
+{{ else if $menuURL }}
+    {{ $ref := partial "utilities/GetPage.html" (dict "url" $url.Path "page" $page) }}
+    {{- if not $ref -}}
+        {{- warnf "partial [assets/navbar-item.html] - Cannot find page of menu item '%s': %s" $menu.Name $url -}}
+    {{ end }}
 {{ end -}}

 {{- $mainNav := urlize (lower $menu.Name) -}}
@@ -82,7 +87,7 @@
        <a class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{ . }}{{ end }}" 
            {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
            data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
-            href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }} {{ $button | safeHTMLAttr }}>
+            {{ if $menuURL }} href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }}{{ end }} {{ $button | safeHTMLAttr }}>
            
            {{- with $menu.Pre }}
                {{ if hasPrefix . "<i" }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.16",
+  "version": "0.24.18",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.24.16",
+      "version": "0.24.18",
      "license": "MIT",
      "dependencies": {
        "@fullhuman/postcss-purgecss": "^6.0.0",
@@ -22,7 +22,7 @@
        "eslint-config-standard": "^17.1.0",
        "eslint-plugin-import": "^2.29.1",
        "eslint-plugin-n": "^16.6.2",
-        "eslint-plugin-promise": "^6.4.0",
+        "eslint-plugin-promise": "^6.6.0",
        "markdownlint-cli2": "^0.13.0",
        "netlify-plugin-hugo-cache-resources": "^0.2.1",
        "npm-run-all": "^4.1.5",
@@ -2296,9 +2296,9 @@
      }
    },
    "node_modules/eslint-plugin-promise": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.4.0.tgz",
-      "integrity": "sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
+      "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.16",
+  "version": "0.24.18",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -80,7 +80,7 @@
    "eslint-config-standard": "^17.1.0",
    "eslint-plugin-import": "^2.29.1",
    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.4.0",
+    "eslint-plugin-promise": "^6.6.0",
    "markdownlint-cli2": "^0.13.0",
    "netlify-plugin-hugo-cache-resources": "^0.2.1",
    "npm-run-all": "^4.1.5",
Author	SHA1	Message	Date
Mark Dumay	b944d818c8	Merge pull request #1047 from gethinode/develop Suppress undefined navbar links	2024-07-23 12:16:34 +02:00
Mark Dumay	f25fbb3440	Merge branch 'main' into develop	2024-07-23 11:55:18 +02:00
Mark Dumay	0b9d43f130	Suppress undefined navbar links	2024-07-23 11:54:47 +02:00
github-actions[bot]	884da31fd0	Merge pull request #1046 from gethinode/dependabot/npm_and_yarn/eslint-plugin-promise-6.6.0 Bump eslint-plugin-promise from 6.4.0 to 6.6.0	2024-07-22 14:03:48 +00:00
dependabot[bot]	6dbfb0ac64	Bump eslint-plugin-promise from 6.4.0 to 6.6.0 Bumps [eslint-plugin-promise](https://github.com/eslint-community/eslint-plugin-promise) from 6.4.0 to 6.6.0. - [Release notes](https://github.com/eslint-community/eslint-plugin-promise/releases) - [Changelog](https://github.com/eslint-community/eslint-plugin-promise/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint-community/eslint-plugin-promise/compare/v6.4.0...v6.6.0) --- updated-dependencies: - dependency-name: eslint-plugin-promise dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-22 13:57:31 +00:00
Mark Dumay	0ea1f92d4c	Merge pull request #1039 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-07-22 11:01:22 +02:00
Mark Dumay	77d44d44c6	Merge branch 'main' into hugo-mod-dependencies	2024-07-22 10:50:04 +02:00
Mark Dumay	e8c1eac2af	Merge pull request #1045 from gethinode/develop Suppress image container when wrapper class is empty	2024-07-22 10:49:51 +02:00
Mark Dumay	2f992b82cf	Merge branch 'main' into develop	2024-07-22 10:44:15 +02:00
Mark Dumay	fe70b24859	Suppress image container when wrapper class is empty	2024-07-22 10:41:52 +02:00
markdumay	497c5d0e5e	fix: update Hugo module dependencies	2024-07-21 03:05:30 +00:00
Mark Dumay	834435db00	Adjust warning for invalid local url	2024-07-20 07:01:13 +02:00
Mark Dumay	3d8195e24b	Merge pull request #1042 from gethinode/develop Validate local url of menu entries	2024-07-20 06:59:18 +02:00
Mark Dumay	ce31587f22	Merge branch 'main' into develop	2024-07-20 06:52:50 +02:00
Mark Dumay	6342ae1a33	Validate local url of menu entries	2024-07-20 06:51:49 +02:00