From 7e2f6606bfe2a1e770d86a8f12875e98288cf08a Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Tue, 4 Jun 2024 09:05:11 +0200 Subject: [PATCH 1/2] Fix external links in navbar --- layouts/partials/assets/navbar-item.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/layouts/partials/assets/navbar-item.html b/layouts/partials/assets/navbar-item.html index 865c9f9a3..002e2f936 100644 --- a/layouts/partials/assets/navbar-item.html +++ b/layouts/partials/assets/navbar-item.html @@ -19,9 +19,13 @@ {{- $class := .class -}} {{- $cue := .cue | default site.Params.main.externalLinks.cue -}} {{- $tab := .tab | default site.Params.main.externalLinks.tab -}} -{{- $baseURL := $page.Scratch.Get "baseURL" -}} - -{{- $menuURL := urls.JoinPath $baseURL ((or $menu.PageRef $menu.URL) | relLangURL) -}} +{{- $baseURL := $page.Scratch.Get "baseURL" | default "/" -}} +{{- $menuURL := "" -}} +{{ if or (strings.HasPrefix $menu.PageRef "http") (strings.HasPrefix $menu.URL "http") }} + {{ $menuURL = or $menu.PageRef $menu.URL }} +{{ else }} + {{- $menuURL = urls.JoinPath $baseURL ((or $menu.PageRef $menu.URL) | relLangURL) -}} +{{ end }} {{- $pageURL := $page.RelPermalink -}} {{- $isActive := or (and (hasPrefix $pageURL $menuURL) (ne $menuURL ("/" | relLangURL))) (eq $pageURL $menuURL) -}} {{- $isAlias := $menu.Params.alias -}} From 1477ff7bb20d47d4f0388ff5e8b750b0cda0b297 Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Tue, 4 Jun 2024 09:05:47 +0200 Subject: [PATCH 2/2] Bump package release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6bf5edca4..23aaad8cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gethinode/hinode", - "version": "0.24.0", + "version": "0.24.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gethinode/hinode", - "version": "0.24.0", + "version": "0.24.1", "license": "MIT", "dependencies": { "@fullhuman/postcss-purgecss": "^6.0.0", diff --git a/package.json b/package.json index aab34b890..8db7f76e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gethinode/hinode", - "version": "0.24.0", + "version": "0.24.1", "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator", "keywords": [ "hugo",