Merge pull request #1188 from gethinode/develop

Fix bootstrap form validation when purging styles

.eslintignore

@@ -1,8 +0,0 @@
-assets/js/critical/languageSelector.js
-assets/js/critical/color.js
-assets/js/analytics.js
-assets/js/flexsearch.js
-assets/js/navbar.js
-assets/js/sharing.js
-assets/js/vendor
-node_modules

assets/js/alert.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 const alert = document.getElementById('page-alert')
 const closeBtn = document.getElementById('page-alert-btn-close')
 if (alert !== null && closeBtn !== null) {

config/postcss.config.js

@@ -10,7 +10,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
     return [...(els.tags || []), ...(els.classes || []), ...(els.ids || [])]
   },
   dynamicAttributes: ['data-bs-theme'],
-  safelist: [
+  safelist: ['was-validated',
     ...whitelister([
       './assets/scss/components/_clipboard.scss',
       './assets/scss/components/_command.scss',

data/structures/card-group.yml

@@ -96,12 +96,14 @@ arguments:
       screens.
   wrapper:
     type: string
+    default: p-0
     optional: true
     comment: >-
       Class attributes of the wrapper element, e.g. `p-4 px-xxl-0`.
   responsive:
     type: bool
     optional: true
+    default: true
     comment: >-
       Flag indicating if the number of columns should be responsive, defaults to
       `true`.
@@ -132,5 +134,33 @@ arguments:
   hook:
     type: string
     optional: true
+    default: assets/card.html
     comment: Render hook for the card partial.
     group: partial
+  bento:
+    type: bool
+    optional: true
+    default: false
+    comment: >-
+      Trigger to use a bento-style layout instead of default grid layout.
+    release: v0.27.0
+  valign:
+    type: select
+    optional: true
+    comment: >-
+      Defines the vertical card alignment, only applicable in bento layout.
+    release: v0.27.0
+    options:
+      values:
+        - start
+        - center
+        - end
+  styles:
+    type:
+      - '[]map[string]interface {}'
+    optional: true
+    comment: >-
+      Styles to apply to the individual cards. Supported elements are `ratio`,
+      `orientation`, `portrait`, and `width`. The styles are rotated when the
+      amount of cards exceeds the available amount of styles.
+    release: v0.27.0

data/structures/card.yml

@@ -101,6 +101,7 @@ arguments:
     options:
       values:
         - full
+        - title
         - none
   footer:
     type: select
@@ -227,6 +228,7 @@ arguments:
         - stacked
         - horizontal
         - horizontal-sm
+        - overlay
         - none
   subtle:
     type: bool

eslint.config.js

@@ -0,0 +1,14 @@
+'use strict'
+
+module.exports = require('neostandard')({
+  ignores: [
+    'assets/js/critical/languageSelector.js',
+    'assets/js/critical/color.js',
+    'assets/js/analytics.js',
+    'assets/js/flexsearch.js',
+    'assets/js/navbar.js',
+    'assets/js/sharing.js',
+    'assets/js/vendor',
+    'node_modules',
+  ]
+})

exampleSite/config/postcss.config.js

@@ -10,7 +10,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
     return [...(els.tags || []), ...(els.classes || []), ...(els.ids || [])]
   },
   dynamicAttributes: ['data-bs-theme'],
-  safelist: [
+  safelist: ['was-validated',
     ...whitelister([
       './_vendor/github.com/gethinode/hinode/assets/scss/components/_clipboard.scss',
       './_vendor/github.com/gethinode/hinode/assets/scss/components/_command.scss',

exampleSite/content/en/blog/bootstrap-elements.md

@@ -418,7 +418,7 @@ As an example, the following shortcode displays superscript text.
 
 As an example, the following shortcode displays a responsive table.
 
-<!-- markdownlint-disable MD037 -->
+<!-- markdownlint-disable MD037 MD058 -->
 {{< example lang="markdown" >}}
 {{</* table */>}}
 | #  | Heading | Heading | Heading | Heading | Heading | Heading | Heading | Heading | Heading |
@@ -428,7 +428,7 @@ As an example, the following shortcode displays a responsive table.
 | 3. | cell    | cel     | cel     | cel     | cel     | cel     | cel     | cel     | cel     |
 {{</* /table */>}}
 {{< /example >}}
-<!-- markdownlint-enable MD037 -->
+<!-- markdownlint-enable MD037 MD058 -->
 
 ## Timeline
 

exampleSite/content/en/blog/components.md

@@ -29,7 +29,7 @@ As an example, the following shortcode shows an animation that plays on hover.
 
 As an example, the following shortcode displays a responsive table that uses advanced controls.
 
-<!-- markdownlint-disable MD037 -->
+<!-- markdownlint-disable MD037 MD058 -->
 {{< example lang="markdown" >}}
 {{</* table sortable="true" paging="true" searchable="true" */>}}
 |  #  | Heading |

exampleSite/content/en/blog/image.md

@@ -14,7 +14,7 @@ As an example, the following shortcode displays an image with rounded corners an
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* image src="https://res.cloudinary.com/demo/image/upload/dog.webp"
+{{</* image src="https://res.cloudinary.com/demo/dog.webp"
     ratio="21x9" caption="Cloudinary image" class="rounded" plain=true */>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->

go.mod

@@ -9,9 +9,9 @@ require (
 	github.com/gethinode/mod-fontawesome v1.10.0 // indirect
 	github.com/gethinode/mod-katex v1.1.2 // indirect
 	github.com/gethinode/mod-leaflet v1.1.1 // indirect
-	github.com/gethinode/mod-lottie v1.5.7 // indirect
+	github.com/gethinode/mod-lottie v1.5.8 // indirect
-	github.com/gethinode/mod-simple-datatables v1.0.8 // indirect
+	github.com/gethinode/mod-simple-datatables v1.0.10 // indirect
-	github.com/gethinode/mod-utils/v2 v2.5.2 // indirect
+	github.com/gethinode/mod-utils/v2 v2.7.0 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240501124520-961c3ae84a87 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
 )

go.sum

@@ -204,6 +204,8 @@ github.com/gethinode/mod-lottie v1.5.6 h1:dxz5nmD0XXEt/DAOc1s5fIPynj5bhzDL32EEwL
 github.com/gethinode/mod-lottie v1.5.6/go.mod h1:VTvBxD8VokICwnEqM0VUZFZHBYxLf4/grDFQyEh1DL0=
 github.com/gethinode/mod-lottie v1.5.7 h1:hcf04kmKv7xrI2byxtgHwkScYIHfP9aquInHNZP+qbk=
 github.com/gethinode/mod-lottie v1.5.7/go.mod h1:rhWg+MSSnWmqHKNEViE/9/78RjQD6uWWFASgjvFjgyo=
+github.com/gethinode/mod-lottie v1.5.8 h1:glg5HcjOBkFt5MoF7p24NN+RzctExPQUDXvdhPx9u6I=
+github.com/gethinode/mod-lottie v1.5.8/go.mod h1:Z/FlAcCJWYI1Z9tQnL0yRN4lqhyZl9CqYpfJUPVDaGc=
 github.com/gethinode/mod-simple-datatables v1.0.0 h1:Dj4WGw12OkaimwkCpLn5Jhmd49dvNJW9O2P/W9F+HlQ=
 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=
@@ -218,6 +220,10 @@ github.com/gethinode/mod-simple-datatables v1.0.7 h1:pfxWhgmn/njJcynNIDnUyeOBW0t
 github.com/gethinode/mod-simple-datatables v1.0.7/go.mod h1:Y7AzIYAWpzDKLvH96eqBA/Gs3jompWCgxadLuoKZ/rc=
 github.com/gethinode/mod-simple-datatables v1.0.8 h1:J8hA+SXdTLaRNZwN70ZEyADn+VgNoAaxVDMXsMPTZBg=
 github.com/gethinode/mod-simple-datatables v1.0.8/go.mod h1:RsTHWAt1J9/m7kzhYNSJB7CDyk+8DrG+46/aFrP6KJw=
+github.com/gethinode/mod-simple-datatables v1.0.9 h1:8OnpY/axFkgxJ598DHW4nDtxsCYmgTakAG4ZC2wRS3A=
+github.com/gethinode/mod-simple-datatables v1.0.9/go.mod h1:rgQWdDZ6lTR9+08dGY1zBDLZI/UneKPufakAK20+lmI=
+github.com/gethinode/mod-simple-datatables v1.0.10 h1:/nYy4oCgooUJhTBgLdQzMnJEjolkD+dp2nkfLNT9Klg=
+github.com/gethinode/mod-simple-datatables v1.0.10/go.mod h1:rgQWdDZ6lTR9+08dGY1zBDLZI/UneKPufakAK20+lmI=
 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=
@@ -270,6 +276,10 @@ github.com/gethinode/mod-utils/v2 v2.5.0 h1:9QboNU9KTpmJDS9JBjxavbknLVBJilocqo5K
 github.com/gethinode/mod-utils/v2 v2.5.0/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
 github.com/gethinode/mod-utils/v2 v2.5.2 h1:URGTpJo0dN4/oF2yL6o2d2pkcSlG1F0hgIF9UqpIs/E=
 github.com/gethinode/mod-utils/v2 v2.5.2/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.6.0 h1:r7l/E6fbPZHnjFyJY4T/xzekd7Xp3czNVCMgKoKR8wc=
+github.com/gethinode/mod-utils/v2 v2.6.0/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.7.0 h1:5CKygjsc7X4dFtb90ihWyDVvUp2iqoJE8C7M+jeWYus=
+github.com/gethinode/mod-utils/v2 v2.7.0/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=

hugo_stats.json

@@ -2,16 +2,11 @@
   "htmlElements": {
     "tags": [
       "a",
-      "blockquote",
       "body",
       "button",
-      "code",
       "div",
-      "em",
       "footer",
       "form",
-      "h2",
-      "h3",
       "head",
       "html",
       "img",
@@ -21,24 +16,16 @@
       "link",
       "meta",
       "nav",
-      "noscript",
       "ol",
       "p",
       "path",
-      "pre",
       "script",
       "small",
       "span",
       "strong",
       "svg",
       "symbol",
-      "table",
-      "tbody",
-      "td",
-      "th",
-      "thead",
       "title",
-      "tr",
       "ul",
       "use"
     ],
@@ -47,44 +34,21 @@
       "align-items-center",
       "align-self-center",
       "align-self-end",
-      "anchor",
       "ball",
       "bg-body",
-      "bg-body-tertiary",
       "bg-opacity-10",
       "bg-primary",
-      "blockquote-alert",
-      "blockquote-alert-heading",
-      "blockquote-alert-important",
-      "border",
-      "border-0",
-      "border-bottom",
-      "border-none",
-      "border-primary",
-      "border-top",
       "bottom-0",
       "bottom-bar",
       "breadcrumb",
       "breadcrumb-item",
       "btn",
       "btn-close",
-      "btn-outline-primary",
-      "btn-outline-secondary",
       "btn-primary",
-      "btn-social",
-      "card",
-      "card-body",
-      "card-body-link",
-      "card-text",
-      "card-title",
-      "card-zoom",
       "checkbox",
-      "chroma",
       "col",
       "col-12",
       "col-6",
-      "col-lg-2",
-      "col-lg-8",
       "col-md-2",
       "col-md-3",
       "col-md-4",
@@ -95,15 +59,10 @@
       "collapsed",
       "container-fluid",
       "container-xxl",
-      "d-block",
       "d-flex",
-      "d-grid",
       "d-inline",
-      "d-lg-block",
       "d-md-block",
-      "d-md-none",
       "d-none",
-      "data-table",
       "display-1",
       "display-4",
       "emphasis",
@@ -113,60 +72,37 @@
       "fa-2x",
       "fa-book-open",
       "fa-ellipsis",
-      "fa-exclamation",
       "fa-face-frown",
-      "fa-facebook",
       "fa-fw",
       "fa-github",
-      "fa-link",
       "fa-linkedin",
       "fa-medium",
       "fa-moon",
-      "fa-share-nodes",
-      "fa-sort",
       "fa-sun",
-      "fa-whatsapp",
-      "fa-x-twitter",
       "fab",
       "fas",
       "fixed-top",
       "flex-column",
       "flex-fill",
-      "font-monospace",
       "footer",
       "form-control",
       "fs-3",
       "fs-5",
-      "fs-6",
-      "fs-lg-5",
       "fw-30",
       "fw-bold",
-      "fw-semibold",
-      "g-4",
-      "gap-1",
-      "gap-2",
-      "h-100",
-      "h6",
-      "heading",
-      "highlight",
       "hstack",
       "img-fluid",
       "img-wrap",
       "invisible",
       "is-search",
-      "justify-content-between",
       "justify-content-center",
       "justify-content-end",
       "justify-content-start",
       "label",
-      "lead",
       "link-bg-footer",
       "link-secondary",
       "main-content",
       "main-nav-toggler",
-      "mb-3",
-      "mb-5",
-      "mb-lg-5",
       "me-auto",
       "middle-bar",
       "min-vh-100",
@@ -179,9 +115,7 @@
       "mt-md-0",
       "mx-auto",
       "mx-md-0",
-      "my-2",
       "my-auto",
-      "my-md-0",
       "my-md-auto",
       "nav-item",
       "nav-link",
@@ -193,7 +127,6 @@
       "navbar-fixed-top",
       "navbar-mode-selector",
       "navbar-nav",
-      "navbar-nav-scroll",
       "navbar-toggler",
       "no-js",
       "order-0",
@@ -201,124 +134,58 @@
       "order-md-0",
       "order-md-1",
       "p-0",
-      "p-1",
       "p-2",
       "p-3",
       "p-4",
-      "pb-2",
-      "pb-3",
       "pb-4",
-      "pb-5",
       "pb-md-0",
-      "pe-3",
       "position-fixed",
       "position-relative",
       "ps-1",
-      "ps-3",
+      "pt-4",
       "pt-5",
       "pt-md-3",
       "px-4",
       "px-xxl-0",
-      "py-1",
       "py-3",
       "rounded",
-      "rounded-2",
-      "rounded-bottom",
-      "rounded-top",
       "row",
       "row-cols-1",
       "row-cols-2",
-      "row-cols-lg-3",
       "row-cols-md-2",
-      "row-cols-md-3",
-      "row-cols-sm-2",
       "row-cols-sm-3",
       "search",
       "search-input",
       "search-suggestions",
       "shadow",
-      "sidebar-overflow",
-      "sticky-top",
-      "stretched-link",
       "svg-inline--fa",
-      "syntax-highlight",
-      "table",
-      "table-bordered",
-      "table-borderless",
-      "table-hover",
-      "table-responsive",
-      "table-responsive-lg",
-      "table-responsive-md",
-      "table-responsive-sm",
-      "table-responsive-xl",
-      "table-responsive-xxl",
-      "table-sm",
-      "table-striped",
-      "table-striped-columns",
-      "table-success",
-      "text-body",
-      "text-body-secondary",
       "text-center",
       "text-decoration-none",
-      "text-end",
       "text-muted",
       "text-secondary",
       "text-sm-start",
       "text-start",
-      "text-uppercase",
       "toast",
       "toast-body",
       "toast-container",
       "toast-header",
-      "toc",
-      "toc-button",
-      "toc-panel",
-      "toc-sidebar",
       "toggler-icon",
       "top-bar"
     ],
     "ids": [
-      "TableOfContents",
-      "accented-tables",
-      "aligned-cells-and-headers",
-      "always-responsive",
-      "basic-tables",
-      "blogs",
-      "bordered-tables",
-      "breakpoint-specific",
-      "btn-webshare",
-      "colored-tables",
-      "data-tables",
-      "default-alignment",
       "fa-face-frown",
-      "fab-facebook",
       "fab-github",
       "fab-linkedin",
       "fab-medium",
-      "fab-whatsapp",
-      "fab-x-twitter",
       "fas-book-open",
       "fas-ellipsis",
-      "fas-exclamation",
-      "fas-link",
       "fas-moon",
-      "fas-share-nodes",
-      "fas-sort",
       "fas-sun",
-      "hoverable-rows",
       "navbar-0-collapse",
       "navbar-mode",
       "navbar-mode-checkbox",
-      "responsive-tables",
-      "small-tables",
-      "striped-columns",
-      "striped-rows",
-      "table-borders",
-      "tables-without-borders",
       "toast-container",
-      "toast-copied-code-message",
+      "toast-copied-code-message"
-      "toast-message-email-4",
-      "toc-collapse"
     ]
   }
 }

layouts/_default/_markup/render-blockquote.html

@@ -9,10 +9,18 @@
 }}
 
 {{ if eq .Type "alert" }}
-    <blockquote class="blockquote-alert blockquote-alert-{{ .AlertType }}">
+    {{ $alert := .AlertType }}
+    {{ $icon := (index $icons $alert) }}
+
+    <blockquote class="blockquote-alert blockquote-alert-{{ $alert }}">
         <p class="blockquote-alert-heading">
-            {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fw" (index $icons .AlertType))) }}
+            {{ with $icon }} 
-            {{ or (i18n .AlertType) (title .AlertType) }}
+                {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fw" .)) }}
+                {{ or (i18n $alert) (title $alert) }}
+            {{ else }}
+                {{ title $alert }}
+                {{ warnf "Unsupported alert type: '%s'. See %s" $alert $.Position }}
+            {{ end }}
         </p>
     {{ trim .Text "\n\r" | safeHTML }}
     </blockquote>

layouts/_default/baseof.html

@@ -14,7 +14,7 @@
 {{- end -}}
 
 {{- /* Initialize module configuration */ -}}
-{{- $modules := partial "utilities/InitModules.html" (dict "page" .) -}}
+{{- $modules := partialCached "utilities/InitModules.html" . -}}
 {{- $.Scratch.Set "modules" $modules -}}
 
 {{- $fullCover := or (or (and .IsHome .Site.Params.home.fullCover) .Page.Params.fullCover) .Site.Params.main.footerBelowFold }}
@@ -27,7 +27,7 @@
 {{- $.Scratch.Set "sections" $sections -}}
 
 {{- /* Define main breakpoint */ -}}
-{{- $.Scratch.Set "breakpoint" (partial "utilities/GetBreakpoint.html") }}
+{{- $.Scratch.Set "breakpoint" (partialCached "utilities/GetBreakpoint.html" .) }}
 
 {{- /* Define base URL */ -}}
 {{ $lang := site.LanguageCode | default site.Language.Lang }}

layouts/partials/assets/adapters/cloudinary.html

@@ -39,13 +39,22 @@
 {{ $element := "" }}
 
 <!-- Split path between upload dir and sub dir -->
-{{ $newdir := urls.JoinPath (index (split $dir "upload") 0) "upload" }}
+{{ $dir = path.Clean (trim .dir "/") }}
-{{ $file = urls.JoinPath (index (split $dir "upload") 1) $file }}
+{{ $api := "image/upload" }}
-{{ $dir = $newdir }}
+
+<!-- Define the account, optional API segment, and directory -->
+{{ $elements := split $dir "/" }}
+{{ $account := index $elements 0 }}
+{{ $operation := "" }}
+{{ if and (in (slice "image" "video") (index $elements 1)) (eq (index $elements 2) "upload") }}
+    {{ $api = delimit (slice | append (index $elements 1) | append (index $elements 2)) "/" }}
+    {{ $dir = delimit (after 3 $elements) "/" }}
+{{ else }}
+    {{ $dir = delimit (after 1 $elements) "/" }}
+{{ end }}
 
 <!-- Generate image URL -->
 {{ if not $error }}
-    {{ $operation := "" }}
     {{ if $format }}
         {{ $operation = printf "%s,h_%d,w_%d" $transform $height $width }}
         {{ $file = printf "%s.%s" (strings.TrimSuffix (path.Ext $file) $file) $format }}
@@ -55,7 +64,7 @@
     {{ with $anchor }}
         {{ $operation = printf "%s,g_%s" $operation . }}
     {{ end }}
-    {{- $element = urls.JoinPath (slice "https://" $host $dir $operation $file) -}}
+    {{- $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $account $api $operation $dir $file)) -}}
 {{ end }}
 
 {{ return $element }}

layouts/partials/assets/adapters/hugo.html

@@ -23,9 +23,9 @@
 {{ $anchor := .anchor | default "" }}
 {{ $element := "" }}
 {{ $absoluteURL := .absoluteURL }}
-{{ $url := urls.JoinPath $dir $file }}
+{{ $url := partial "utilities/URLJoin.html" (dict "elements" (slice $dir $file)) }}
 {{ if $host }}
-    {{ $url = urls.JoinPath "https://" $host $url }}
+    {{ $url = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $url)) }}
 {{ end }}
 
 <!-- Initialize image if needed, do not raise additional warnings -->

layouts/partials/assets/adapters/imagekit-rewrite.html

@@ -22,9 +22,9 @@
 {{ with $container }}{{ $dir = strings.TrimPrefix (printf "/%s" .) $dir }}{{ end }}
 
 {{ if ne $host "ik.imagekit.io" }}
-    {{ $element = urls.JoinPath (slice "https://ik.imagekit.io" $account $dir $file) }}
+    {{ $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://ik.imagekit.io" $account $dir $file)) }}
 {{ else }}
-    {{ $element = urls.JoinPath (slice "https://" $host $dir $file) }}
+    {{ $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $dir $file)) }}
 {{ end }}
 
 {{ return $element }}

layouts/partials/assets/adapters/imagekit.html

@@ -46,7 +46,7 @@
 
 <!-- Split path between end point and image path -->
 {{ $newdir := printf "/%s" (index (split $dir "/") 1) }}
-{{ $file = urls.JoinPath (strings.TrimPrefix $newdir $dir) $file }}
+{{ $file = partial "utilities/URLJoin.html" (dict "elements" (slice (strings.TrimPrefix $newdir $dir) $file)) }}
 {{ $dir = $newdir }}
 
 <!-- Generate image URL -->
@@ -60,7 +60,7 @@
     {{ with $anchor }}
         {{ $operation = printf "%s,fo-%s" $operation . }}
     {{ end }}
-    {{- $element = urls.JoinPath (slice "https://" $host $dir $operation $file) -}}
+    {{- $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $dir $operation $file)) -}}
 {{ end }}
 
 {{ return $element }}

layouts/partials/assets/adapters/imgix.html

@@ -55,7 +55,7 @@
     {{ with $anchor }}
         {{ $operation = printf "%s&crop=%s" $operation . }}
     {{ end }}
-    {{- $element = printf "%s?%s" (urls.JoinPath (slice "https://" $host $dir $file)) $operation -}}
+    {{- $element = printf "%s?%s" (partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $dir $file))) $operation -}}
 {{ end }}
 
 {{ return $element }}

layouts/partials/assets/card-group.html

@@ -4,73 +4,75 @@
     Visit gethinode.com/license for more details.
 -->
 
-<!-- Validate arguments -->
+<!-- Define inline partials -->
-{{ if partial "utilities/IsInvalidArgs.html" (dict "structure" "card-group" "child" "card" "args" .) }}
+{{ define "partials/assets/style.html" }}
-    {{- errorf "partial [assets/card-group.html] - Invalid arguments" -}}
+	{{ $style := "" }}
-{{ end }}
+    {{ if gt (len .styles) 0 }}
-
+        {{ $def := index .styles (mod .index (len .styles)) }}
-<!-- Initialize arguments and default values -->
+        {{ $style = index $def .key }}
-{{- $page := .page -}}
-{{- $breakpoint := partial "utilities/GetBreakpoint.html" -}}
-{{ $pages := .list }}
-{{ $cards := .cards }}
-{{- $paginate := .paginate | default false -}}
-{{- $moreURL := .href -}}
-{{- $moreTitle := .hrefTitle -}}
-{{- $gutter := .gutter | default 4 -}}
-{{- $separator := .separator | default false -}}
-{{- $class := .class -}}
-{{- $color := .color -}}
-{{- $padding := .padding -}}
-{{- $header := .header -}}
-{{- $body := .body -}}
-{{- $footer := .footer -}}
-{{- $orientation := .orientation -}}
-{{- $ratio := .ratio -}}
-{{- $portrait := .portrait | default false -}}
-{{- $wrapper := .wrapper | default "p-0" -}}
-{{- $style := .style -}}
-{{- $align := .align -}}
-{{- $subtle := .subtle }}
-{{- $loading := .loading -}}
-{{- $button := .button -}}
-{{- $buttonLabel := .buttonLabel -}}
-{{- $buttonType := .buttonType -}}
-{{- $iconRounded := .iconRounded }}
-{{- $scroll := .scroll | default false }}
-{{- $spacer := .spacer | default false }}
-{{- $hook := .hook | default "assets/card.html" }}
-{{- $cols := string .cols | default "3" -}}
-
-<!-- Override arguments -->
-{{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $pages) }}
-{{ $paginator := "" }}
-{{ if and $isPages $paginate }}
-    {{ with .pagination }}
-        {{ $paginator = $page.Paginate $pages . }}
-    {{ else }}
-        {{ $paginator = $page.Paginate $pages }}
     {{ end }}
-    {{ $pages = first $paginator.PagerSize (after (mul (sub $paginator.PageNumber 1) $paginator.PagerSize) $pages) }}
+    {{ return ($style | default .default ) }}
 {{ end }}
 
+<!-- Initialize arguments -->
+{{ $args := partial "utilities/InitArgs.html" (dict "structure" "card-group" "child" "card" "args" .) }}
+{{ if $args.err }}
+    {{ partial "utilities/LogErr.html" (dict 
+        "partial" "assets/card-group.html" 
+        "msg" "Invalid arguments"
+        "details" $args.errmsg
+        "file" page.File
+    )}}
+{{ end }}
+
+<!-- Initialize local variables -->
+{{ $list := $args.list }}
+{{- $class := $args.class -}}
+{{- $orientation := $args.orientation -}}
 {{ $cardWrapper := "" }}
-{{ if $scroll }}
+
-    {{ $cardWrapper = printf "card-block card-block-%d" (int $cols) }}
+{{- $breakpoint := partial "utilities/GetBreakpoint.html" -}}
+{{ $colsMap := dict
+    "auto" ""
+    "1" "row-cols-1"
+    "2" (printf "row-cols-1 row-cols-%s-1 row-cols-%s-2" $breakpoint.prev $breakpoint.current)
+    "3" (printf "row-cols-1 row-cols-%s-2 row-cols-%s-3" $breakpoint.prev $breakpoint.current)
+    "4" (printf "row-cols-1 row-cols-%s-2 row-cols-%s-4" $breakpoint.prev $breakpoint.current)
+    "5" (printf "row-cols-1 row-cols-%s-3 row-cols-%s-5" $breakpoint.prev $breakpoint.current)
+}}
+{{ $sizesMap := dict
+    "auto" "100vw"
+    "1" "100vw"
+    "2" (printf "(min-width: %s) 50vw, 100vw" $breakpoint.currentSize)
+    "3" (printf "(min-width: %s) 33.3vw, (min-width: %s) 50vw, 100vw" $breakpoint.currentSize $breakpoint.prevSize)
+    "4" (printf "(min-width: %s) 25vw, (min-width: %s) 50vw, 100vw" $breakpoint.currentSize $breakpoint.prevSize)
+    "5" (printf "(min-width: %s) 20vw, (min-width: %s) 33.3vw, 100vw" $breakpoint.currentSize $breakpoint.prevSize)
+}}
+
+<!-- Apply optional pagination -->
+{{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $list) }}
+{{ $paginator := "" }}
+{{ if and $isPages $args.paginate }}
+    {{ with $args.pagination }}
+        {{ $paginator = $args.page.Paginate $list . }}
+    {{ else }}
+        {{ $paginator = $args.page.Paginate $list }}
+    {{ end }}
+    {{ $list = first $paginator.PagerSize (after (mul (sub $paginator.PageNumber 1) $paginator.PagerSize) $list) }}
 {{ end }}
 
-{{ if not $spacer }}{{ $class = printf "%s h-100" $class }}{{ end }}
+<!-- Initialize list elements -->
-
+{{ $elements := slice }}
-{{ $list := slice }}
 {{ if $isPages }}
-    {{ range $index, $element := $pages }}
+    {{ range $index, $element := $list }}
         {{ $params := dict }}
         <!-- regular page -->
         {{- if and $element.RelPermalink $element.File -}}
             {{- $params = merge $params (dict "path" $element.File.Path) -}}
         <!-- headless page -->
         {{- else -}}
-            {{- $thumbnail := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.url) $element.Params.Thumbnail) -}}
+            {{- $thumbnail := "" -}}
+            {{ if reflect.IsMap $element.Params.Thumbnail }}{{ $thumbnail = $element.Params.Thumbnail.url }}{{ else }}{{ $thumbnail = $element.Params.Thumbnail }}{{ end }}
             {{- $anchor := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.anchor) "") -}}
             {{- $params = merge $params (dict
                 "title" $element.Title
@@ -82,102 +84,95 @@
             ) -}}
         {{- end -}}
 
-        {{- $list = $list | append $params }}
+        {{- $elements = $elements | append $params }}
     {{ end }}
-{{ else if $pages }}
+{{ else if $list }}
-    {{ $list = $list | append $pages }}
+    {{ $elements = $elements | append $list }}
 {{ end }}
 
-{{- $count := len $list -}}
+<!-- Limit list to max elements -->
+{{- $count := len $elements -}}
 {{- $max := $count -}}
-{{- $max = math.Min (.max | default $count) $count -}}
+{{- $max = math.Min ($args.max | default $count) $count -}}
-{{- $responsive := .responsive | default true -}}
+{{- if not $args.paginate -}}
-
+    {{- $elements = first $max $elements -}}
-{{- $sizes := "100vw" }}
-{{- $colGrid := "" -}}
-{{ if not $scroll }}
-    {{ $colGrid = printf "row-cols-%s" $cols }}
-    {{- if eq $cols "1" }}
-        {{ $colGrid = "row-cols-1" -}}
-    {{- else if eq $cols "2" }}
-        {{ if $responsive }}
-            {{ $colGrid = printf "row-cols-1 row-cols-%s-1 row-cols-%s-2" $breakpoint.prev $breakpoint.current }}
-        {{ end -}}
-        {{ $sizes = printf "(min-width: %s) 50vw, 100vw" $breakpoint.currentSize }}
-    {{- else if eq $cols "3" }}
-        {{ if $responsive }}
-            {{ $colGrid = printf "row-cols-1 row-cols-%s-2 row-cols-%s-3" $breakpoint.prev $breakpoint.current }}
-        {{ end -}}
-        {{ $sizes = printf "(min-width: %s) 33.3vw, (min-width: %s) 50vw, 100vw" $breakpoint.currentSize $breakpoint.prevSize }}
-    {{- else if eq $cols "4" }}
-        {{ if $responsive }}
-            {{ $colGrid = printf "row-cols-1 row-cols-%s-2 row-cols-%s-4" $breakpoint.prev $breakpoint.current }}
-        {{ end -}}
-        {{ $sizes = printf "(min-width: %s) 25vw, (min-width: %s) 50vw, 100vw" $breakpoint.currentSize $breakpoint.prevSize }}
-    {{- else if eq $cols "5" }}
-        {{ if $responsive }}
-            {{ $colGrid = printf "row-cols-1 row-cols-%s-3 row-cols-%s-5" $breakpoint.prev $breakpoint.current }}
-        {{ end -}}
-        {{ $sizes = printf "(min-width: %s) 20vw, (min-width: %s) 33.3vw, 100vw" $breakpoint.currentSize $breakpoint.prevSize }}
-    {{ end -}}
-{{ else }}
-    {{ if in (slice "2" "3" "4" "5") $cols }}
-        {{ $sizes = replace (printf "%.1fvw" (div 100.0 (int $cols))) ".0" "" }}
-    {{ end }}
-{{ end }}
-
-{{- if not $paginate -}}
-    {{- $list = first $max $list -}}
 {{- end -}}
 
-{{- if and (eq $cols "1") (eq $orientation "horizontal") }}{{ $orientation = "horizontal-sm" }}{{ end -}}
+{{/* Initialize grid and layout */}}
+{{- $sizes := "100vw" }}
+{{- $colGrid := "" -}}
+{{ if not $args.scroll }}
+    {{ $colGrid = index $colsMap $args.cols }}
+    {{ if $args.responsive }}{{ $sizes = index $sizesMap $args.cols }}{{ end }}
+{{ else }}
+    {{ if in (slice "2" "3" "4" "5") $args.cols }}
+        {{ $sizes = replace (printf "%.1fvw" (div 100.0 (int $args.cols))) ".0" "" }}
+    {{ end }}
+{{ end }}
+
+{{- if and (eq $args.cols "1") (eq $orientation "horizontal") }}{{ $orientation = "horizontal-sm" }}{{ end -}}
+
+{{ if not $args.spacer }}
+    {{ $class = printf "%s h-100" $class }}
+{{ end }}
 
 <!-- Main code -->
-<div class="container-fluid {{ $wrapper }} {{ if $scroll }}card-container-wrapper{{ end }}">
+<div class="{{ $args.wrapper }}">
-    <div class="row g-{{ $gutter }} {{ if $scroll }}d-flex flex-row flex-nowrap card-container scrollbar-horizontal pb-4 w-100 {{ end  }} {{ $colGrid }}">
+    <div class="container-fluid {{ if $args.scroll }}card-container-wrapper{{ end }} p-0">
-        {{ range $index, $element := $list }}
+        <div class="row g-{{ $args.gutter }} {{ if $args.scroll }}d-flex flex-row flex-nowrap card-container scrollbar-horizontal pb-4 w-100 {{ end }}
-            {{- $params := (dict
+        {{ if $args.bento }}{{ with $args.valign }}align-items-{{ . }}{{ end }}{{ else }}{{ $colGrid }}{{ end }}">
-                "class" (printf " %s" $class)
+            {{ range $index, $element := $elements }}
-                "color" $color
+                {{- $params := (dict
-                "footer" $footer
+                    "class" (printf " %s" $class)
-                "body" $body
+                    "color" $args.color
-                "header" $header
+                    "footer" $args.footer
-                "loading" $loading
+                    "body" $args.body
-                "sizes" $sizes
+                    "header" $args.header
-                "orientation" $orientation
+                    "loading" $args.loading
-                "padding" $padding
+                    "sizes" $sizes
-                "ratio" $ratio
+                    "orientation" (partial "assets/style.html" (dict "styles" $args.styles "index" $index "key" "orientation" "default" $orientation))
-                "portrait" $portrait
+                    "padding" $args.padding
-                "subtle" $subtle
+                    "ratio" (partial "assets/style.html" (dict "styles" $args.styles "index" $index "key" "ratio" "default" $args.ratio))
-                "style" $style
+                    "portrait" (partial "assets/style.html" (dict "styles" $args.styles "index" $index "key" "portrait" "default" $args.portrait))
-                "align" $align
+                    "subtle" $args.subtle
-                "button" $button
+                    "style" $args.style
-                "buttonLabel" $buttonLabel
+                    "align" $args.align
-                "buttonType" $buttonType
+                    "button" $args.button
-                "iconRounded" $iconRounded
+                    "buttonLabel" $args.buttonLabel
-            ) -}}
+                    "buttonType" $args.buttonType
-            {{- $params = merge $element $params }}
+                    "iconRounded" $args.iconRounded
+                ) -}}
+                {{- $params = merge $element $params }}
 
-            <div class="{{ with $cardWrapper }}{{ . }}{{ else }}col{{ end }}">
+                {{ if $args.scroll }}
-                {{ if $spacer }}<div class="spacer"></div>{{ end }}
+                    {{ $width := (partial "assets/style.html" (dict "styles" $args.styles "index" $index "key" "width" "default" "3")) }}
-                {{- partial $hook $params -}}
+                    {{ $size := $args.cols }}
-            </div>
+                    {{ if and (gt $args.cols 1) (eq $width "6") }}{{ $size = sub (int $args.cols) 1 }}{{ end }}
-            {{- if and (lt $index (sub $max 1)) $separator -}}
+                    {{ $cardWrapper = printf "card-block card-block-%d" (int $size) }}
-                <div class="col d-block d-sm-none">
+                {{ end }}
-                    <hr>
+
+                <!--add col-$width -->
+                <div class="{{ with $cardWrapper }}{{ . }}{{ else }}col{{ end }}">
+                    {{ if $args.spacer }}<div class="spacer"></div>{{ end }}
+                    {{- partial $args.hook $params -}}
                 </div>
+                {{- if and (lt $index (sub $max 1)) $args.separator -}}
+                    <div class="col d-block d-sm-none">
+                        <hr>
+                    </div>
+                {{- end -}}
             {{- end -}}
-        {{- end -}}
+            {{ if $args.cards }}{{- print $args.cards | safeHTML }}{{ end }}
-        {{ if $cards }}{{- print $cards | safeHTML }}{{ end }}
+        </div>
     </div>
 
     {{ if $paginator }}
         {{- if gt $paginator.TotalPages 1 -}}
-            <div class="pt-3">{{ partial "assets/pagination.html" (dict "page" $page "format" "terse") }}</div>
+            <div class="pt-3">{{ partial "assets/pagination.html" (dict "page" $args.page "format" "terse") }}</div>
         {{- end -}} 
     {{ else }}
-        {{ if and (gt $count $max) $moreTitle }}
+        {{ if and (gt $count $max) $args.hrefTitle }}
-            <a class="btn btn-outline-primary mt-4" href="{{ $moreURL| safeURL }}" role="button">{{ $moreTitle }}</a>
+            <a class="btn btn-outline-primary mt-4" href="{{ $args.href| safeURL }}" role="button">{{ $args.hrefTitle }}</a>
         {{ end }}
     {{ end }}
 </div>

layouts/partials/assets/card.html

@@ -64,7 +64,9 @@
     {{- if not $title }}{{ $title = .Title }}{{ end -}}
     {{- if not $href }}{{ $href = .RelPermalink  }}{{ end -}}
     {{- if not $description }}{{ $description = partial "utilities/GetDescription.html" (dict "page" .) }}{{ end -}}
-    {{- if and (not $thumbnail) (not $icon) }}{{ $thumbnail = (or (and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.url) .Params.Thumbnail) }}{{ end -}}
+    {{- if and (not $thumbnail) (not $icon) }}
+        {{ if reflect.IsMap .Params.Thumbnail }}{{ $thumbnail = .Params.Thumbnail.url }}{{ else }}{{ $thumbnail = .Params.Thumbnail }}{{ end }}
+    {{ end -}}
     {{ if not $ratio }}
         {{- if and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.ratio }}{{ $ratio = .Params.Thumbnail.ratio }}{{ end -}}
     {{ end }}
@@ -80,7 +82,8 @@
 {{ end }}
 
 {{- if eq $orientation "none" }}{{ $thumbnail = "" }}{{ $icon = "" }}{{ end -}}
-{{- if eq $body "none" }}{{ $description = "" }}{{ end -}}
+{{- if eq $body "title" }}{{ $description = "" }}{{ end -}}
+{{- if eq $body "none" }}{{ $title = "" }}{{ $description = "" }}{{ end -}}
 
 <!-- Inline partial to render the card's body -->
 {{- define "partials/card-body.html" -}}
@@ -216,6 +219,7 @@
     </div>
 {{- else -}}
     <!-- Render stacked / default card -->
+    {{ $overlay := eq $orientation "overlay" }}
     <div class="card {{ $colorStyle }} {{ $class }} text-{{ $align }}">
         {{- if $thumbnail -}}
             {{- partial $hook (dict "url" $thumbnail "ratio" (or $ratio "16x9") "portrait" $portrait "anchor" $anchor "sizes" $sizes "wrapper" "card-img-wrap" "class" "card-img-top card-img-bg" "title" (or $alt $title) "loading" $loading) -}}
@@ -229,7 +233,8 @@
                 {{ end }}
             </div>
         {{- end -}}
-        <div class="card-body d-flex flex-column p-{{ $padding }}">
+        <div class="card-body d-flex flex-column p-{{ $padding }} {{ if $overlay }}card-img-overlay card-overlay-gradient p-4{{ end }}" {{ if $overlay }}data-bs-theme="dark"{{ end }}>
+            {{ if $overlay }}<div class="flex-grow-1"></div>{{ end }}
             {{ if $page }}{{- partial "card-caption.html" (dict "page" $page "keywords" $header "color" $color) -}}{{ end }}
             {{- partial "card-body.html" (dict "title" $title "href" $href "color" $color "description" $description) -}}
             {{ if $page }}{{- partial "card-caption.html" (dict "page" $page "keywords" $footer "color" $color) -}}{{ end }}

layouts/partials/assets/link.html

@@ -67,9 +67,9 @@
                 {{- errorf "partial [assets/link.html] - Cannot find page or asset: '%s' at '%s'" $destination $page.File.Path -}}
                 {{- $error = true -}}
             {{ else if $isPageRes }}
-                {{ $destination = urls.JoinPath "/" (strings.TrimPrefix "/content" $pageContext) $destination }}
+                {{ $destination = partial "utilities/URLJoin.html" (dict "elements" (slice "/" (strings.TrimPrefix "/content" $pageContext) $destination)) }}
             {{ else if $isStatic }}
-                {{ $destination = urls.JoinPath "/" $destination }}
+                {{ $destination = partial "utilities/URLJoin.html" (dict "base" "/" "path" $destination) }}
             {{ end }}
             {{- with $anchor }}{{ $destination = printf "%s#%s" (strings.TrimSuffix "/" $destination) . -}}{{ end -}}
         {{ end }}

layouts/partials/assets/list.html

@@ -47,7 +47,8 @@
     <div class="d-none d-md-block p-0">
         {{- range $index, $item := $list -}}
             {{- $odd := eq (mod $index 2) 1 -}}
-            {{- $thumbnail := (or (and (reflect.IsMap $item.Params.Thumbnail) $item.Params.Thumbnail.url) $item.Params.Thumbnail) -}}
+            {{- $thumbnail := "" -}}
+            {{ if reflect.IsMap $item.Params.Thumbnail }}{{ $thumbnail = $item.Params.Thumbnail.url }}{{ else }}{{ $thumbnail = $item.Params.Thumbnail }}{{ end }}
             <div class="container ratio-section d-flex flex-column">
                 <div class="row pt-5 pb-5 align-items-center flex-fill row-cols-2">
                     <div class="col-6{{ if $odd }} order-last{{ end }}">
@@ -69,7 +70,8 @@
     <div class="d-md-none">
         {{- range $index, $item := $list -}}
             {{- $odd := eq (mod $index 2) 1 -}}
-            {{- $thumbnail := (or (and (reflect.IsMap $item.Params.Thumbnail) $item.Params.Thumbnail.url) $item.Params.Thumbnail) -}}
+            {{- $thumbnail := "" -}}
+            {{ if reflect.IsMap $item.Params.Thumbnail }}{{ $thumbnail = $item.Params.Thumbnail.url }}{{ else }}{{ $thumbnail = $item.Params.Thumbnail }}{{ end }}
             <div class="container d-flex flex-column">
                 <div class="row pt-5 pb-5 align-items-center flex-fill row-cols-2">
                     <div class="col-12 text-center">

layouts/partials/assets/nav.html

@@ -66,7 +66,8 @@
                 {{ $header := $item.Title }}
                 {{ $body := $item.Content }}
                 {{ $show := eq $index 0}}
-                {{- $thumbnail := (or (and (reflect.IsMap $item.Params.Thumbnail) $item.Params.Thumbnail.url) $item.Params.Thumbnail) -}}
+                {{- $thumbnail := "" -}}
+                {{ if reflect.IsMap $item.Params.Thumbnail }}{{ $thumbnail = $item.Params.Thumbnail.url }}{{ else }}{{ $thumbnail = $item.Params.Thumbnail }}{{ end }}
                 <div class="tab-pane{{ if $show }} active{{ end }}" id="nav-{{ $id }}-{{ $index }}" role="tabpanel" aria-labelledby="{{ $id }}-btn-{{ $index }}" tabindex="0">
                     {{- if eq $pane "persona" -}}
                         {{- partial "assets/persona.html" (dict  

layouts/partials/assets/navbar-item.html

@@ -25,7 +25,7 @@
 {{ if or (strings.HasPrefix $menu.PageRef "http") (strings.HasPrefix $menu.URL "http") }}
     {{ $menuURL = or $menu.PageRef $menu.URL }}
 {{ else if (or $menu.PageRef $menu.URL) }}
-    {{- $menuURL = urls.JoinPath $baseURL ((or $menu.PageRef $menu.URL) | relLangURL) -}}
+    {{- $menuURL = partial "utilities/URLJoin.html" (dict "base" $baseURL "path" ((or $menu.PageRef $menu.URL) | relLangURL)) -}}
 {{ end }}
 {{- $pageURL := $page.RelPermalink -}}
 {{- $isActive := or (and (hasPrefix $pageURL $menuURL) (ne $menuURL ("/" | relLangURL))) (eq $pageURL $menuURL) -}}

layouts/partials/assets/navbar.html

@@ -51,7 +51,7 @@
                 {{- end -}}
                 {{ if $item.url }}
                     <li>
-                        {{- $url := (urls.JoinPath $baseURL $item.url) | relLangURL -}}
+                        {{- $url := partial "utilities/URLJoin.html" (dict "base" $baseURL "path" $item.url) | relLangURL -}}
                         <a class="pe-5 dropdown-item{{ if $collapsed }} switch-mode-collapsed{{ end }}{{ if $active }} active{{ end }}{{ if $disabled }} disabled{{ end }}" href="{{ $url }}">{{ $item.label }}
                             {{ if $item.latest }}&nbsp;({{ T "latest" }}){{ end }}
                             {{ if $active }}
@@ -67,7 +67,7 @@
             {{- if site.Params.docs.overview -}}
                 {{ if gt (len $list) 0 }}<li><hr class="dropdown-divider"></li>{{ end }}
                 <li>
-                    {{- $url := (urls.JoinPath $baseURL site.Params.docs.overview) | relLangURL -}}
+                    {{- $url := partial "utilities/URLJoin.html" (dict "base" $baseURL "path" site.Params.docs.overview) | relLangURL -}}
                     <a class="dropdown-item{{ if $collapsed }} switch-mode-collapsed{{ end }}" href="{{ $url }}">{{ T "allVersions" }}</a>
                 </li>
             {{- end -}}
@@ -142,9 +142,9 @@
     {{- end -}}
 {{- end -}}
 
-{{ if $logo }}{{ $logo = urls.JoinPath $baseURL $logo }}{{ end }}
+{{ if $logo }}{{ $logo = partial "utilities/URLJoin.html" (dict "base" $baseURL "path" $logo) }}{{ end }}
-{{ if $logoLight }}{{ $logoLight = urls.JoinPath $baseURL $logoLight }}{{ end }}
+{{ if $logoLight }}{{ $logoLight = partial "utilities/URLJoin.html" (dict "base" $baseURL "path" $logoLight) }}{{ end }}
-{{ if $logoDark }}{{ $logoDark = urls.JoinPath $baseURL $logoDark }}{{ end }}
+{{ if $logoDark }}{{ $logoDark = partial "utilities/URLJoin.html" (dict "base" $baseURL "path" $logoDark) }}{{ end }}
 
 {{- $title := site.Title -}}
 {{- if .title -}}
@@ -276,7 +276,7 @@
                                     {{- end -}}
                                 {{- else -}}
                                     {{- range site.Languages -}}
-                                        <li><a class="dropdown-item" href="{{ urls.JoinPath $baseURL .Lang }}" hreflang="{{.Lang}}">{{ default .Lang .LanguageName }}</a></li>
+                                        <li><a class="dropdown-item" href="{{ partial "utilities/URLJoin.html" (dict "base" $baseURL "path" .Lang) }}" hreflang="{{.Lang}}">{{ default .Lang .LanguageName }}</a></li>
                                     {{- end -}}
                                 {{- end -}}
                             </ul>

layouts/partials/assets/persona.html

@@ -32,7 +32,9 @@
     {{- if not $title }}{{ $title = .Title }}{{ end -}}
     {{- if not $href }}{{ $href = .RelPermalink  }}{{ end -}}
     {{- if not $content }}{{ $content = .Content }}{{ end -}}
-    {{- if not $thumbnail }}{{ $thumbnail = (or (and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.url) .Params.Thumbnail) }}{{ end -}}
+    {{- if not $thumbnail }}
+        {{ if reflect.IsMap .Params.Thumbnail }}{{ $thumbnail = .Params.Thumbnail.url }}{{ else }}{{ $thumbnail = .Params.Thumbnail }}{{ end }}
+    {{ end -}}
 {{- end -}}
 
 {{- $class := .class -}}

layouts/partials/assets/section-list.html

@@ -143,7 +143,7 @@
 
     <div class="container-fluid {{ with $background }} bg-{{ . }}{{ end }} p-0">
         <div class="container-xxl {{ $wrapper }}">
-            {{- partial "assets/section-header.html" (dict  "title" $title "description" $description "content" $content) -}}
+            {{- partial "assets/section-header.html" (dict "title" $title "description" $description "content" $content) -}}
             {{ if eq $layout "card" }}
                 {{- $partial = "assets/card-group.html" -}}
                 {{- $params = merge $params (dict 

layouts/partials/assets/sidebar.html

@@ -26,7 +26,7 @@
     {{- $group := .group -}}
     {{- $data := .menu -}}
 
-    {{- $doc_slug := urls.JoinPath $baseURL ($group.title | urlize) -}}
+    {{- $doc_slug := partial "utilities/URLJoin.html" (dict "base" $baseURL "path" ($group.title | urlize)) -}}
     {{- $href := or $group.link $doc_slug -}}
     {{- $collapsed := strings.HasPrefix $page.RelPermalink $href -}}
 
@@ -78,10 +78,10 @@
         {{ if hasPrefix . "http" }}
             {{ $href = . }}
         {{ else }}
-            {{- $href = urls.JoinPath $baseURL . -}}
+            {{- $href = partial "utilities/URLJoin.html" (dict "base" $baseURL "path" .) -}}
         {{ end }}
     {{ else }}
-        {{- $href = urls.JoinPath $baseURL ($title | urlize) -}}
+        {{- $href = partial "utilities/URLJoin.html" (dict "base" $baseURL "path" ($title | urlize)) -}}
     {{ end }}
     {{- $active := eq (strings.TrimSuffix "/" $page.RelPermalink) (strings.TrimSuffix "/" $href) -}}
 
@@ -122,7 +122,7 @@
         {{- $sectionBreak := false -}}
         {{- $level := 0 -}}
         {{ $baseURL := $page.Scratch.Get "baseURL" | default "/" -}}
-        {{ $baseURL = urls.JoinPath "/" (strings.TrimPrefix $baseURL (urls.JoinPath $section $version | relLangURL)) }}
+        {{ $baseURL = partial "utilities/URLJoin.html" (dict "elements" (slice "/" (strings.TrimPrefix $baseURL (urls.JoinPath $section $version | relLangURL)))) }}
 
         <ul class="list-unstyled ps-0">
         {{- range $index, $item := $data -}}

layouts/partials/assets/video.html

@@ -58,7 +58,7 @@
 {{ end }}
 
 {{ $origin := $position }}
-{{ if not $origin }}{{ with $page.File }}{{ $origin = .Path}}{{ end }}{{ end }}
+{{ if not $origin }}{{ with $page.File }}{{ $origin = .Path }}{{ end }}{{ end }}
 
 <!-- Main code -->
 {{ if not $error -}}
@@ -95,7 +95,6 @@
         {{ $padding := "56.25%" }}
 
         {{- $dnt := cond $pc.EnableDNT 1 0 -}}
-        {{- $source := urls.JoinPath "https://vimeo.com" $id -}}
         {{- $query := querify "url" $url "dnt" $dnt -}}
         {{- $api := printf "https://vimeo.com/api/oembed.json?%s" $query -}}
         {{- with resources.GetRemote $api -}}
@@ -123,10 +122,10 @@
         {{ with $params }}{{ $url = print $url . }}{{ end }}
         {{ $padding := "56.25%" }}
 
-        {{ $thumbnail := urls.JoinPath (path.Dir $id) (printf "%s.jpg" (path.BaseName $id)) }}
+        {{ $thumbnail := partial "utilities/URLJoin.html" (dict "base" (path.Dir $id) "path" (printf "%s.jpg" (path.BaseName $id))) }}
         {{ $metadata := partial "assets/helpers/image-dimension.html" (dict 
             "page" $page
-            "url" (printf "https://res.cloudinary.com/%s/video/upload/%s" $account $thumbnail)
+            "url" (printf "https://res.cloudinary.com/%s/video/upload/%s" $account (path.Clean $thumbnail))
             "ratio" $ratio
             "imageset" false
         ) }}

layouts/partials/head/seo.html

@@ -13,7 +13,9 @@
 {{ end }}
 {{ $.Scratch.Set "description" $description -}}
 
-{{- $thumbnail := (or (and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.url) .Params.Thumbnail) -}}
+{{- $thumbnail := "" -}}
+{{ if reflect.IsMap .Params.Thumbnail }}{{ $thumbnail = .Params.Thumbnail.url }}{{ else }}{{ $thumbnail = .Params.Thumbnail }}{{ end }}
+
 {{ if $thumbnail -}}
     {{ $imgURL := index (partial "assets/helpers/image-dimension.html" (dict "url" $thumbnail "width" 1280 "height" 640 "page" .)) "target" }}
     {{ $.Scratch.Set "thumbnail" ($imgURL | absURL) -}}

layouts/partials/list/featured.html

@@ -61,7 +61,8 @@
             {{ partial "assets/icon.html" (dict "icon" "mode" $mode $icon "wrapper" "col-6 mx-auto text-center")}}
         {{ end }}
     {{ else }}
-        {{- $thumbnail := (or (and (reflect.IsMap $page.Params.Thumbnail) $page.Params.Thumbnail.url) $page.Params.Thumbnail) -}}
+        {{- $thumbnail := "" -}}
+        {{ if reflect.IsMap $page.Params.Thumbnail }}{{ $thumbnail = $page.Params.Thumbnail.url }}{{ else }}{{ $thumbnail = $page.Params.Thumbnail }}{{ end }}
         {{- if $thumbnail }}
             {{ partial "assets/image.html" (dict "url" $thumbnail "ratio" "16x9" "sizes" $sizes "wrapper" $style "class" "rounded" "title" $page.Site.Title "priority" "high") }}
         {{ end }}

layouts/partials/utilities/GetIllustration.html

@@ -12,7 +12,8 @@
         {{ $illustration = partial "assets/icon.html" (dict "icon" "mode" $mode $icon "wrapper" "mx-auto text-center")}}
     {{ end }}
 {{ else }}
-    {{- $thumbnail := (or (and (reflect.IsMap $item.Params.Thumbnail) $item.Params.Thumbnail.url) $item.Params.Thumbnail) -}}
+    {{- $thumbnail := "" -}}
+    {{ if reflect.IsMap $item.Params.Thumbnail }}{{ $thumbnail = $item.Params.Thumbnail.url }}{{ else }}{{ $thumbnail = $item.Params.Thumbnail }}{{ end }}
     {{- if $thumbnail }}
         {{ $illustration = partial "assets/image.html" (dict "url" $thumbnail "ratio" "16x9" "wrapper" $style "inner" "rounded" "title" $item.Site.Title) }}
     {{ end }}

layouts/partials/utilities/GetSections.html

@@ -46,7 +46,8 @@
         {{- with index . "title" }}{{ $title = or . $title }}{{ end -}}
     {{- end -}}
 
-    {{- $thumbnail := (or (and (reflect.IsMap $sectionPage.Params.Thumbnail) $sectionPage.Params.Thumbnail.url) $sectionPage.Params.Thumbnail) -}}
+    {{- $thumbnail := "" -}}
+    {{ if reflect.IsMap $sectionPage.Params.Thumbnail }}{{ $thumbnail = $sectionPage.Params.Thumbnail.url }}{{ else }}{{ $thumbnail = $sectionPage.Params.Thumbnail }}{{ end }}
     {{- $icon := $sectionPage.Params.Icon -}}
     {{- $content := "" -}}
     {{ if not $sectionPage.IsSection }}{{ $content = $sectionPage.Content }}{{ end -}}

layouts/partials/utilities/InitModules.html

@@ -1,5 +1,3 @@
-{{ $page := .page }}
-
 {{ $core := slice }}
 {{ $optional := slice }}
 {{ $excludeSCSS := slice }}
@@ -7,7 +5,7 @@
 {{ $localize := slice }}
 {{ $modules := dict }}
 
-{{ range $key, $mod := $page.Site.Params.modules }}
+{{ range $key, $mod := .Site.Params.modules }}
     {{ if eq $key "core" }}
         {{ warnf "DEPRECATED: module parameter `core` has been deprecated in release v0.24.0" }}
         {{ $core = $core | append $mod }}
@@ -57,7 +55,7 @@
     "localize" $localize
 }}
 
-{{- if and $page.IsPage (not (in $core "bootstrap")) -}}
+{{- if and .IsPage (not (in $core "bootstrap")) -}}
     {{- errorf "Bootstrap is a required module, please add it to 'modules.core' in your site parameters" -}}
 {{- end -}}
 

netlify.toml

@@ -4,12 +4,12 @@
     command = "npm run build:example"
 
 [build.environment]
-    DART_SASS_VERSION = "1.77.5"
+    DART_SASS_VERSION = "1.78.0"
-    HUGO_VERSION = "0.131.0"
+    HUGO_VERSION = "0.134.1"
     HUGO_ENV = "production"
     HUGO_ENABLEGITINFO = "true"
-    NODE_VERSION = "20.16.0"
+    NODE_VERSION = "20.17.0"
-    NPM_VERSION = "10.8.1"
+    NPM_VERSION = "10.8.2"
 # toml-docs-end netlify
 
 [[headers]]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.26.7",
+  "version": "0.27.0-alpha6",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",
@@ -69,19 +69,16 @@
   "dependencies": {
     "@fullhuman/postcss-purgecss": "^6.0.0",
     "autoprefixer": "^10.4.20",
-    "cssnano": "^7.0.5",
+    "cssnano": "^7.0.6",
-    "cssnano-preset-advanced": "^7.0.5",
+    "cssnano-preset-advanced": "^7.0.6",
-    "hugo-bin": "0.131.0",
+    "hugo-bin": "0.131.2",
     "purgecss-whitelister": "^2.4.0"
   },
   "devDependencies": {
     "@gethinode/netlify-plugin-dartsass": "^0.3.0",
-    "eslint": "^8.57.0",
+    "eslint": "^9.10.0",
-    "eslint-config-standard": "^17.1.0",
+    "markdownlint-cli2": "^0.14.0",
-    "eslint-plugin-import": "^2.30.0",
+    "neostandard": "^0.11.4",
-    "eslint-plugin-n": "^16.6.2",
-    "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",
     "postcss-cli": "^11.0.0",