Merge pull request #753 from gethinode/develop

Allow raw content for headless pages
Merge branch 'main' into develop
2025-10-17 15:03:20 +00:00 · 2024-02-05 14:52:29 +01:00 · 2024-02-05 14:37:23 +01:00 · 2024-02-05 14:36:56 +01:00 · 2024-02-05 14:36:21 +01:00 · 2024-02-05 11:05:45 +01:00
13 changed files with 54 additions and 30 deletions
--- a/assets/scss/components/_navbar.scss
+++ b/assets/scss/components/_navbar.scss
@@ -17,6 +17,7 @@

 .nav-active, .navbar-expanded {
    background-color: var(--bs-navbar-expanded-color);
+    border-bottom: 1px solid var(--bs-secondary-bg);
 }

 .nav-link {
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -135,5 +135,5 @@ home = ["HTML", "RSS", "REDIR"]
  [[module.imports]]
    path = "github.com/gethinode/mod-lottie"
  [[module.imports]]
-    path = "github.com/gethinode/mod-utils"
+    path = "github.com/gethinode/mod-utils/v2"
 # toml-docs-end modules
--- a/data/structures/card-group.yml
+++ b/data/structures/card-group.yml
@@ -43,6 +43,8 @@ arguments:
    optional: true
    comment: Maximum number of cards to display.
    group: partial
+    options:
+      min: 1
  cols:
    type: select
    optional: true
--- a/exampleSite/hugo_stats.json
+++ b/exampleSite/hugo_stats.json
@@ -277,6 +277,7 @@
      "ms-md-3",
      "mt-2",
      "mt-3",
+      "mt-4",
      "mt-5",
      "mt-auto",
      "multi-docs-collapse-15",
--- a/go.mod
+++ b/go.mod
@@ -6,11 +6,11 @@ require (
 	github.com/airbnb/lottie-web v5.12.2+incompatible // indirect
 	github.com/gethinode/mod-bootstrap v1.2.2 // indirect
 	github.com/gethinode/mod-flexsearch v1.9.0 // indirect
-	github.com/gethinode/mod-fontawesome v1.8.0 // indirect
+	github.com/gethinode/mod-fontawesome v1.8.1 // indirect
 	github.com/gethinode/mod-katex v1.0.5 // indirect
-	github.com/gethinode/mod-leaflet v0.4.0 // indirect
-	github.com/gethinode/mod-lottie v1.4.1 // indirect
-	github.com/gethinode/mod-utils v1.0.3 // indirect
-	github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 // indirect
+	github.com/gethinode/mod-leaflet v1.0.0 // indirect
+	github.com/gethinode/mod-lottie v1.4.2 // indirect
+	github.com/gethinode/mod-utils/v2 v2.0.3 // indirect
+	github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 // indirect
 	github.com/twbs/bootstrap v5.3.2+incompatible // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -80,6 +80,8 @@ github.com/gethinode/mod-fontawesome v1.7.3 h1:YzRCYSasVRIcImVmTJYjqNJ+KmyNWfm/b
 github.com/gethinode/mod-fontawesome v1.7.3/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.8.0 h1:YEuCmvCdzcemF1eFK35Wnp1asKKO3/xbxGArnjq6PRY=
 github.com/gethinode/mod-fontawesome v1.8.0/go.mod h1:uvuC2YL8mdXNp6NRzFOu4TWsHvtY9AZ8YxJkF23/M/8=
+github.com/gethinode/mod-fontawesome v1.8.1 h1:iyvULrpaGizQoI5Vl9WjFYcMGWefdyG90NGK2UKax+k=
+github.com/gethinode/mod-fontawesome v1.8.1/go.mod h1:xBKsZH3WJtMOItZVlp9SbO51uaBy6IbvUZSKpNu3b6Y=
 github.com/gethinode/mod-katex v1.0.0 h1:me/3dIIZBkfk1mRIFt8QiAGYwYDoSG5bc2hHRtIutFc=
 github.com/gethinode/mod-katex v1.0.0/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.1 h1:809QUztxmKgMNchU+v03iMO7Ma+ISc3ZzhXYauc21rs=
@@ -104,6 +106,8 @@ github.com/gethinode/mod-leaflet v0.3.5 h1:69Bv/6zRXhbcTzo7TMr58h3ry47srHRpM1k81
 github.com/gethinode/mod-leaflet v0.3.5/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.4.0 h1:Xc6c1UTf4m1saQLFfFWT5sEpwj25xVGuS8csGC82UUI=
 github.com/gethinode/mod-leaflet v0.4.0/go.mod h1:yr+bUKAstifdB16mbYh69OayAmgPOlNUubAmVn5eL2M=
+github.com/gethinode/mod-leaflet v1.0.0 h1:HdnWafOGkkK1hYGfqLYF3pp9dAFS/caxlzML9sO1rCc=
+github.com/gethinode/mod-leaflet v1.0.0/go.mod h1:Ei0x9WiL7Dbi4JeG6yI1CE63bT1QJ8sKi67Jea1wFSE=
 github.com/gethinode/mod-lottie v1.0.0 h1:1CUZMcgN5FAyjjyuP3qkaOQ6M5sv6HUAbosW4sIT5VE=
 github.com/gethinode/mod-lottie v1.0.0/go.mod h1:erRCgSL2FCfKHI0jQbSpM+g0jXl7SjKVJrh7kWGteKs=
 github.com/gethinode/mod-lottie v1.0.1 h1:+IE7xtnSVQpJS56oBJq9RWKZeFEfxrOZAqE3BSrS/u0=
@@ -120,6 +124,8 @@ github.com/gethinode/mod-lottie v1.4.0 h1:0Ls1Q/8p0gQpuX9+dtfNGKcjBNeymjE7gERdnN
 github.com/gethinode/mod-lottie v1.4.0/go.mod h1:57eu6glS5oxkew2dB1P2zsbhw444aRX0XfuyDe7k/dk=
 github.com/gethinode/mod-lottie v1.4.1 h1:RzCjYsxFPqyBsYAcdPeUP0rvF+hD9eEl7NrxuaRiKQQ=
 github.com/gethinode/mod-lottie v1.4.1/go.mod h1:QjKlEmYbekrNGwa9EdFlPcXxwWWcraJUQ6xIL+syA60=
+github.com/gethinode/mod-lottie v1.4.2 h1:rHBhbMVRlkVMxVY+3g1u2kolDv695uL8Zur4mDeoIO8=
+github.com/gethinode/mod-lottie v1.4.2/go.mod h1:H6y1e3/2bBR1ujuM5N1iY39kpyN3RtcSRahX90+tlQI=
 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=
@@ -128,9 +134,21 @@ github.com/gethinode/mod-utils v1.0.2 h1:0b3i+/bBHY1Td9N6khDbL1nf3d5HGc4QzI4BbEW
 github.com/gethinode/mod-utils v1.0.2/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
 github.com/gethinode/mod-utils v1.0.3 h1:FF6lnam0Bcdj7G1E5P+qi5ByPrl1npL+3uS5YoPx1C0=
 github.com/gethinode/mod-utils v1.0.3/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
+github.com/gethinode/mod-utils v1.0.4 h1:Lr7hAVaWHv0O5TJXhRHGhvlOvWwIATJm9mpLQhCsopM=
+github.com/gethinode/mod-utils v1.0.4/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
+github.com/gethinode/mod-utils v1.1.0 h1:a82h/DQTKc5hxf/ExDoZqJCJmVLT0dtyU8tf78yOPFw=
+github.com/gethinode/mod-utils v1.1.0/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
+github.com/gethinode/mod-utils/v2 v2.0.1 h1:yy8Qaytrk55YNMzyldYKDWJr6mpQs7s7TWBkSYRMBng=
+github.com/gethinode/mod-utils/v2 v2.0.1/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.0.2 h1:pocFT/mWPcfmABltZwe76D1IB3TZIrD1k1kH9zCDO1M=
+github.com/gethinode/mod-utils/v2 v2.0.2/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.0.3 h1:4BsRNGi+0a3Mq021Gq/TwDNiyuIfZ8xnpYU0DkNbUYI=
+github.com/gethinode/mod-utils/v2 v2.0.3/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=
 github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
+github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 h1:H6xa5YyCHr78M+qqCApM4Kvz/eMA7pfGskYmfkEBRCA=
+github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/twbs/bootstrap v5.3.2+incompatible h1:tuiO5acc6xnZUR77Sbi5aKWXxjYxbmsSbJwYrhAKoQQ=
 github.com/twbs/bootstrap v5.3.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
--- a/layouts/partials/assets/breadcrumb.html
+++ b/layouts/partials/assets/breadcrumb.html
@@ -16,18 +16,20 @@
 {{ $page := .page }}

 <!-- Main code -->
-<nav aria-label="breadcrumb">
-    <ol class="breadcrumb">
-        {{- range $index, $item := $page.Ancestors.Reverse -}}
-            {{- $title := .LinkTitle -}}
-            {{- if .IsHome }}{{ $title = T "home" }}{{ end -}} 
-            {{- $address := or .RelPermalink (.Params.Redirect | relLangURL) -}}
-            {{ if $address }}
-                <li class="breadcrumb-item"><a href="{{ $address }}">{{ $title }}</a></li>
-            {{ else }}
-                <li class="breadcrumb-item">{{ $title }}</li>
-            {{ end }}
-        {{- end -}}
-        <li class="breadcrumb-item active" aria-current="page">{{ $page.LinkTitle }}</li>
-    </ol>
-</nav>
+{{ if not $error }}
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            {{- range $index, $item := $page.Ancestors.Reverse -}}
+                {{- $title := .LinkTitle -}}
+                {{- if .IsHome }}{{ $title = T "home" }}{{ end -}} 
+                {{- $address := or .RelPermalink (.Params.Redirect | relLangURL) -}}
+                {{ if $address }}
+                    <li class="breadcrumb-item"><a href="{{ $address }}">{{ $title }}</a></li>
+                {{ else }}
+                    <li class="breadcrumb-item">{{ $title }}</li>
+                {{ end }}
+            {{- end -}}
+            <li class="breadcrumb-item active" aria-current="page">{{ $page.LinkTitle }}</li>
+        </ol>
+    </nav>
+{{ end }}
--- a/layouts/partials/assets/card-group.html
+++ b/layouts/partials/assets/card-group.html
@@ -53,7 +53,7 @@
            {{- $params = merge $params (dict
                "title" $element.Title
                "href" $element.RelPermalink
-                "description" (partial "utilities/GetDescription.html" $element)
+                "description" (partial "utilities/GetDescription.html" (dict "page" $element "raw" true))
                "thumbnail" $thumbnail
                "icon" $element.Params.icon
            ) -}}
@@ -122,7 +122,7 @@
        {{- end -}} 
    {{ else }}
        {{ if and (gt $count $max) $moreTitle }}
-            <a class="btn btn-outline-primary" href="{{ $moreURL| safeURL }}" role="button">{{ $moreTitle }}</a>
+            <a class="btn btn-outline-primary mt-4" href="{{ $moreURL| safeURL }}" role="button">{{ $moreTitle }}</a>
        {{ end }}
    {{ end }}
 </div>
--- a/layouts/partials/assets/card.html
+++ b/layouts/partials/assets/card.html
@@ -24,7 +24,7 @@
 {{- $style := .style | default "" -}}
 {{- $loading := .loading -}}
 {{- $orientation := .orientation | default "stacked" -}}
-{{- $padding := .padding | default "auto" -}}
+{{- $padding := (string .padding) | default "auto" -}}
 {{- $ratio := .ratio -}}
 {{- $thumbnail := .thumbnail -}}
 {{- $title := .title -}}
@@ -49,7 +49,7 @@
 {{- with $page -}}
    {{- if not $title }}{{ $title = .Title }}{{ end -}}
    {{- if not $href }}{{ $href = .RelPermalink  }}{{ end -}}
-    {{- if not $description }}{{ $description = partial "utilities/GetDescription.html" . }}{{ end -}}
+    {{- if not $description }}{{ $description = partial "utilities/GetDescription.html" (dict "page" .) }}{{ end -}}
    {{- if not $thumbnail }}{{ $thumbnail = (or (and (reflect.IsMap .Params.Thumbnail) .Params.Thumbnail.url) .Params.Thumbnail) }}{{ end -}}
    {{- if not $icon }}{{ $icon = .Params.icon }}{{ end -}}
 {{- end -}}
--- a/layouts/partials/assets/nav.html
+++ b/layouts/partials/assets/nav.html
@@ -73,7 +73,7 @@
                            "title" $item.Title
                            "class" $class
                            "color" $color
-                            "content" (partial "utilities/GetDescription.html" $item)
+                            "content" (partial "utilities/GetDescription.html" (dict "page" $item))
                            "thumbnail" $thumbnail
                        ) -}}
                    {{- else -}}
--- a/layouts/partials/head/seo.html
+++ b/layouts/partials/head/seo.html
@@ -7,7 +7,7 @@
    {{ $.Scratch.Set "title" .Site.Title -}}
 {{ end -}}

-{{ $description := or (partial "utilities/GetDescription.html" .) .Site.Params.main.description }}
+{{ $description := or (partial "utilities/GetDescription.html" (dict "page" .)) .Site.Params.main.description }}
 {{ if gt (strings.RuneCount $description) 150 }}
    {{ $description = print (substr $description 0 150) "..." }}
 {{ end }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha5",
+  "version": "0.23.0-alpha8",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.23.0-alpha5",
+      "version": "0.23.0-alpha8",
      "license": "MIT",
      "devDependencies": {
        "@fullhuman/postcss-purgecss": "^5.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha5",
+  "version": "0.23.0-alpha8",
  "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	0a2a1a8b1a	Merge pull request #753 from gethinode/develop Allow raw content for headless pages	2024-02-05 14:52:29 +01:00
Mark Dumay	154ddfe1cc	Merge branch 'main' into develop	2024-02-05 14:37:23 +01:00
Mark Dumay	14786383ec	Bump package release	2024-02-05 14:36:56 +01:00
Mark Dumay	e5aae017a6	Allow raw content for headless pages	2024-02-05 14:36:21 +01:00
Mark Dumay	68ceb8c71e	Merge pull request #752 from gethinode/develop Drop max range requirement of card groups	2024-02-05 11:05:45 +01:00
Mark Dumay	dcd94a7137	Bump dependencies	2024-02-05 10:59:35 +01:00
Mark Dumay	1e75a3675e	Merge branch 'main' into develop	2024-02-05 10:23:40 +01:00
Mark Dumay	6c301e2512	Drop max range requirement	2024-02-05 10:22:26 +01:00
Mark Dumay	59c06c7f02	Merge pull request #751 from gethinode/develop Fix more button spacing	2024-02-04 09:47:22 +01:00
Mark Dumay	85aad4c431	Merge branch 'main' into develop	2024-02-04 09:22:52 +01:00
Mark Dumay	ade4df79ed	Bump package release	2024-02-04 09:22:18 +01:00
Mark Dumay	ec12b41293	Fix more button spacing	2024-02-04 09:21:51 +01:00
Mark Dumay	7216c88e0b	Merge pull request #750 from gethinode/develop Restrict max range	2024-02-04 08:57:20 +01:00
Mark Dumay	fac87c69e2	Merge branch 'main' into develop	2024-02-04 08:15:24 +01:00
Mark Dumay	62d4fdeb32	Merge pull request #749 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-02-04 08:00:42 +01:00
Mark Dumay	91da0c7d0d	Restrict max range	2024-02-04 07:42:28 +01:00
markdumay	b116c2582f	fix: update Hugo module dependencies	2024-02-04 06:39:58 +00:00
Mark Dumay	276307fb5c	Merge pull request #748 from gethinode/develop Refine fixed navbar rendering	2024-02-04 07:06:31 +01:00
Mark Dumay	54ae613298	Merge branch 'main' into develop	2024-02-04 06:57:32 +01:00
Mark Dumay	a22040f4e3	Refine fixed navbar rendering	2024-02-04 06:56:50 +01:00
Mark Dumay	630cc55361	Improve error handling	2024-02-04 06:56:06 +01:00
Mark Dumay	2aacace6ad	Merge pull request #747 from gethinode/develop Fix init of card padding with zero value	2024-02-04 06:04:34 +01:00
Mark Dumay	91714727c3	Merge branch 'main' into develop	2024-02-04 05:52:12 +01:00
Mark Dumay	8e21f36619	Bump package release	2024-02-04 05:51:39 +01:00
Mark Dumay	baa88ca957	Fix init of padding with zero value	2024-02-04 05:50:25 +01:00