Merge pull request #1475 from gethinode/develop

Refine arguments

component-library/components/articles/articles.bookshop.yml

@@ -29,7 +29,7 @@ blueprint:
     link:
   cols:
   padding:
-  max:
+  limit:
   pagination:
   paginate:
   background:

component-library/components/articles/articles.hugo.html

@@ -69,7 +69,7 @@
 	{{- $params = merge $params (dict
 		"page"         page
 		"list"         $pages
-		"max"          $args.max
+		"limit"        $args.limit
 		"cols"         $args.cols
 		"icon-rounded" $args.iconRounded
 		"href"         (cond $moreButton $moreLink "")

config/_default/params.toml

@@ -10,10 +10,10 @@
     footerBelowFold = false
     loading = "lazy"
     breakpoint = "md"
+    titleCase = false
     [main.padding]
         x = 4
         y = 4
-    titleCase = false
     [main.internalLinks]
         validate = true
         pretty = false

data/structures/card-group.yml

@@ -22,7 +22,8 @@ arguments:
     release: 1.0.0
   list:
   cards:
-  max:
+  limit:
+    release: v1.0.0
   cols:
     release: v0.19.0
   paginate:
@@ -158,3 +159,12 @@ arguments:
     group: partial
     deprecated: v1.0.0
     alternative: href-title
+  max:
+    type: int
+    optional: true
+    comment: Maximum number of elements to display.
+    group: partial
+    options:
+      min: 1
+    deprecated: v1.0.0
+    alternative: limit

data/structures/file.yml

@@ -11,8 +11,8 @@ arguments:
   full:
   id: 
   class:
-  options:
+  highlight-options:
-    release: v0.27.6
+    release: v1.0.0
   # deprecated arguments
   path:
     type: string
@@ -22,3 +22,11 @@ arguments:
       the path of the repository is used as base path instead.
     deprecated: v1.0.0
     alternative: file
+  options:
+    type: string
+    optional: true
+    comment: >-
+        Hugo highlighting options, see https://gohugo.io/shortcodes/highlight/#options-1.
+    release: v0.27.6
+    deprecated: v1.0.0
+    alternative: highlight-options

data/structures/video.yml

@@ -31,6 +31,11 @@ arguments:
     deprecated: v1.0.0
     alternative: media-id
   options:
+    type: string
+    optional: true
+    comment: >-
+      Optional query parameters to append to video asset's url. The query string
+      is prepended with a `?` symbol. Only applicable to Cloudinary.
     release: v0.28.2
     deprecated: v1.0.0
     alternative: query-args

exampleSite/config/_default/params.toml

@@ -8,10 +8,10 @@
     footerBelowFold = false
     loading = "lazy"
     breakpoint = "md"
+    titleCase = true
     [main.padding]
         x = 4
         y = 4
-    titleCase = true
     [main.internalLinks]
         validate = true
         pretty = true

exampleSite/content/en/_index.md

@@ -37,7 +37,7 @@ content_blocks:
     more:
       title: More Posts
     padding: 0
-    max: 3
+    limit: 3
     class: border-0 card-zoom card-body-margin
 
   - _bookshop_name: articles
@@ -55,7 +55,7 @@ content_blocks:
       title: More articles
     cols: 1
     padding: 4
-    max: 2
+    limit: 2
     header-style: none
     footer-style: tags
     orientation: horizontal-sm

exampleSite/content/en/blocks/_index.md

@@ -27,7 +27,7 @@ content_blocks:
       title: More Posts
     cols: 3
     padding: 0
-    max: 9
+    limit: 9
     paginate: true
     cover: false
     header-style: none

exampleSite/content/en/blocks/articles.md

@@ -26,12 +26,12 @@ The `articles` content block renders a group of article cards.
   more:
     title: More Blogs
   padding: 0
-  max: 3
+  limit: 3
   background:
     color: primary
     subtle: true
   class: border-0 card-zoom card-body-margin
-  justify: center
+  justify: start
 ```
 
 {{< /example-bookshop >}}

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

@@ -252,8 +252,6 @@ Use the `file` shortcode to print and highlight the full content of a given inpu
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->
 
-{{< file full="false" file="./config/_default/languages.toml" id="file-collapse-5" >}}
-
 ## Icon
 
 As an example, the following shortcodes show a square check, a brand logo, a circle check, and a custom icon.

exampleSite/hugo_stats.json

@@ -97,20 +97,12 @@
       "ball",
       "bg-bg-body-tertiary",
       "bg-bg-primary-subtle",
-      "bg-black",
       "bg-body",
       "bg-body-tertiary",
       "bg-danger",
-      "bg-dark",
-      "bg-info",
-      "bg-light",
       "bg-opacity-10",
       "bg-primary",
       "bg-primary-subtle",
-      "bg-secondary",
-      "bg-success",
-      "bg-warning",
-      "bg-white",
       "bi",
       "bi-activity",
       "border",
@@ -340,19 +332,8 @@
       "label",
       "lead",
       "leaflet-map",
-      "link-bg-black",
-      "link-bg-body",
       "link-bg-body-tertiary",
-      "link-bg-danger",
-      "link-bg-dark",
       "link-bg-footer",
-      "link-bg-info",
-      "link-bg-light",
-      "link-bg-primary",
-      "link-bg-secondary",
-      "link-bg-success",
-      "link-bg-warning",
-      "link-bg-white",
       "link-primary",
       "link-secondary",
       "link-success",
@@ -385,7 +366,7 @@
       "mt-auto",
       "mt-md-0",
       "multi-docs-collapse-15",
-      "multi-docs-collapse-17",
+      "multi-docs-collapse-16",
       "multi-file-collapse-1",
       "multi-file-collapse-5",
       "mx-auto",
@@ -419,7 +400,6 @@
       "order-first",
       "order-md-0",
       "order-md-1",
-      "p-",
       "p-0",
       "p-1",
       "p-2",
@@ -473,7 +453,6 @@
       "row-cols-lg-3",
       "row-cols-md-2",
       "row-cols-md-3",
-      "row-cols-md-4",
       "row-cols-sm-2",
       "row-cols-sm-3",
       "scrollbar-horizontal",
@@ -503,18 +482,12 @@
       "table-wrap",
       "tag-link",
       "text-",
-      "text-bg-black",
-      "text-bg-body",
       "text-bg-body-tertiary",
-      "text-bg-danger",
-      "text-bg-dark",
       "text-bg-info",
-      "text-bg-light",
       "text-bg-primary",
       "text-bg-secondary",
       "text-bg-success",
       "text-bg-warning",
-      "text-bg-white",
       "text-body",
       "text-body-secondary",
       "text-break",
@@ -599,7 +572,7 @@
       "block-diagram",
       "blog",
       "body-docs-collapse-15",
-      "body-docs-collapse-17",
+      "body-docs-collapse-16",
       "body-file-collapse-1",
       "body-file-collapse-5",
       "bouton",
@@ -618,7 +591,6 @@
       "cloudinary",
       "collapse",
       "collapse-1",
-      "colored-cards",
       "command-prompt",
       "comment-nous-partageons-vos-informations",
       "comment-utilisons-nous-les-cookies-",
@@ -644,56 +616,21 @@
       "fab-medium",
       "fab-whatsapp",
       "fab-x-twitter",
-      "faq-053659d52c3204ebc73c1b387efbbb07",
+      "faq-2ab61bd9d625ad933606ccabfaffa9a8",
-      "faq-053659d52c3204ebc73c1b387efbbb07-heading-faq-053659d52c3204ebc73c1b387efbbb07",
+      "faq-2ab61bd9d625ad933606ccabfaffa9a8-heading-faq-2ab61bd9d625ad933606ccabfaffa9a8",
-      "faq-053659d52c3204ebc73c1b387efbbb07-item-0",
+      "faq-2ab61bd9d625ad933606ccabfaffa9a8-item-0",
-      "faq-053659d52c3204ebc73c1b387efbbb07-item-1",
+      "faq-2ab61bd9d625ad933606ccabfaffa9a8-item-1",
-      "faq-053659d52c3204ebc73c1b387efbbb07-item-2",
+      "faq-2ab61bd9d625ad933606ccabfaffa9a8-item-2",
-      "faq-3b4f420cc7621af32c96109c12bca758",
+      "faq-471c32251ced209d707f5815bdaa693a",
-      "faq-3b4f420cc7621af32c96109c12bca758-heading-faq-3b4f420cc7621af32c96109c12bca758",
+      "faq-471c32251ced209d707f5815bdaa693a-heading-faq-471c32251ced209d707f5815bdaa693a",
-      "faq-3b4f420cc7621af32c96109c12bca758-item-0",
+      "faq-471c32251ced209d707f5815bdaa693a-item-0",
-      "faq-3b4f420cc7621af32c96109c12bca758-item-1",
+      "faq-471c32251ced209d707f5815bdaa693a-item-1",
-      "faq-3b4f420cc7621af32c96109c12bca758-item-2",
+      "faq-471c32251ced209d707f5815bdaa693a-item-2",
-      "faq-4f19b6f4505f05eaa5bbf531aed406b8",
+      "faq-67dbd72b681a398b4c77f0f3652e0905",
-      "faq-4f19b6f4505f05eaa5bbf531aed406b8-heading-faq-4f19b6f4505f05eaa5bbf531aed406b8",
+      "faq-67dbd72b681a398b4c77f0f3652e0905-heading-faq-67dbd72b681a398b4c77f0f3652e0905",
-      "faq-4f19b6f4505f05eaa5bbf531aed406b8-item-0",
+      "faq-67dbd72b681a398b4c77f0f3652e0905-item-0",
-      "faq-4f19b6f4505f05eaa5bbf531aed406b8-item-1",
+      "faq-67dbd72b681a398b4c77f0f3652e0905-item-1",
-      "faq-4f19b6f4505f05eaa5bbf531aed406b8-item-2",
+      "faq-67dbd72b681a398b4c77f0f3652e0905-item-2",
-      "faq-637b21f5a6c607752e51e0633243d2bf",
-      "faq-637b21f5a6c607752e51e0633243d2bf-heading-faq-637b21f5a6c607752e51e0633243d2bf",
-      "faq-637b21f5a6c607752e51e0633243d2bf-item-0",
-      "faq-637b21f5a6c607752e51e0633243d2bf-item-1",
-      "faq-637b21f5a6c607752e51e0633243d2bf-item-2",
-      "faq-9b51ee909251b9ba0de086282b0afc7a",
-      "faq-9b51ee909251b9ba0de086282b0afc7a-heading-faq-9b51ee909251b9ba0de086282b0afc7a",
-      "faq-9b51ee909251b9ba0de086282b0afc7a-item-0",
-      "faq-9b51ee909251b9ba0de086282b0afc7a-item-1",
-      "faq-9b51ee909251b9ba0de086282b0afc7a-item-2",
-      "faq-aa0a1905cab279bfffa949e96810a3a8",
-      "faq-aa0a1905cab279bfffa949e96810a3a8-heading-faq-aa0a1905cab279bfffa949e96810a3a8",
-      "faq-aa0a1905cab279bfffa949e96810a3a8-item-0",
-      "faq-aa0a1905cab279bfffa949e96810a3a8-item-1",
-      "faq-aa0a1905cab279bfffa949e96810a3a8-item-2",
-      "faq-d2df4da095dc8a0c45487af207ebf623",
-      "faq-d2df4da095dc8a0c45487af207ebf623-heading-faq-d2df4da095dc8a0c45487af207ebf623",
-      "faq-d2df4da095dc8a0c45487af207ebf623-item-0",
-      "faq-d2df4da095dc8a0c45487af207ebf623-item-1",
-      "faq-d2df4da095dc8a0c45487af207ebf623-item-2",
-      "faq-f7b27a38c3ee12525d7d0dc8acc1c600",
-      "faq-f7b27a38c3ee12525d7d0dc8acc1c600-heading-faq-f7b27a38c3ee12525d7d0dc8acc1c600",
-      "faq-f7b27a38c3ee12525d7d0dc8acc1c600-item-0",
-      "faq-f7b27a38c3ee12525d7d0dc8acc1c600-item-1",
-      "faq-f7b27a38c3ee12525d7d0dc8acc1c600-item-2",
-      "faq-fe0f1a534c1ceb0781d73fb79ec3eea1",
-      "faq-fe0f1a534c1ceb0781d73fb79ec3eea1-heading-faq-fe0f1a534c1ceb0781d73fb79ec3eea1",
-      "faq-fe0f1a534c1ceb0781d73fb79ec3eea1-item-0",
-      "faq-fe0f1a534c1ceb0781d73fb79ec3eea1-item-1",
-      "faq-fe0f1a534c1ceb0781d73fb79ec3eea1-item-2",
-      "faq-fe3528d7eb9c1abb5256a70492433843",
-      "faq-fe3528d7eb9c1abb5256a70492433843-heading-faq-fe3528d7eb9c1abb5256a70492433843",
-      "faq-fe3528d7eb9c1abb5256a70492433843-item-0",
-      "faq-fe3528d7eb9c1abb5256a70492433843-item-1",
-      "faq-fe3528d7eb9c1abb5256a70492433843-item-2",
       "fas-1",
       "fas-2",
       "fas-3",
@@ -728,7 +665,7 @@
       "file",
       "flowchart",
       "footer-docs-collapse-15",
-      "footer-docs-collapse-17",
+      "footer-docs-collapse-16",
       "footer-file-collapse-1",
       "footer-file-collapse-5",
       "formula-katex",

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/gethinode/mod-simple-datatables v1.1.7 // indirect
 	github.com/gethinode/mod-simple-datatables/v2 v2.0.1 // indirect
 	github.com/gethinode/mod-utils/v3 v3.3.1 // indirect
-	github.com/gethinode/mod-utils/v4 v4.6.0 // indirect
+	github.com/gethinode/mod-utils/v4 v4.8.0 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20250606060143-c28f52c09b7a // indirect
 	github.com/twbs/bootstrap v5.3.7+incompatible // indirect
 )

go.sum

@@ -440,6 +440,10 @@ github.com/gethinode/mod-utils/v4 v4.5.1 h1:VKmqi6+oC93noHUJ6HvFlelglHT/9+kXQjpJ
 github.com/gethinode/mod-utils/v4 v4.5.1/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/gethinode/mod-utils/v4 v4.6.0 h1:XQ7hiCrn15SzgkcD0j53XVZPQYeQKUxg/UUkr80pJ2w=
 github.com/gethinode/mod-utils/v4 v4.6.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.7.0 h1:JaL/+APOwdEzAi6y174ZdwoguCdALyGiGX8qBVXXBdU=
+github.com/gethinode/mod-utils/v4 v4.7.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.8.0 h1:/+M3EHqA8IzgBWXX1GLmT/xKbk2FVhUwmUfMnk/goF4=
+github.com/gethinode/mod-utils/v4 v4.8.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 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=

layouts/_partials/assets/args.html

@@ -125,7 +125,9 @@
     {{ if in (slice "types" "both") $args.renderType }}
         {{ $prefix := strings.Repeat $args.headerLevel "#" }}
         {{ range $k, $v := $types.udt }}
-            {{ printf "%s %s %s" $prefix $k (T "type") | $args.page.RenderString }}
+            {{ $title := $k }}
+            {{ if site.Params.main.titleCase }}{{ $title = title $title }}{{ end }}
+            {{ printf "%s %s %s" $prefix $title (T "type") | $args.page.RenderString }}
             {{ partial "inline/args-table.html" (merge $params (dict "args" $v)) }}
         {{ end }}
     {{ end }}

layouts/_partials/assets/card-group.html

@@ -113,7 +113,7 @@
 {{/* Limit list to max elements */}}
 {{- $count := len $elements -}}
 {{- $max := $count -}}
-{{- $max = math.Min ($args.max | default $count) $count -}}
+{{- $max = math.Min ((or $args.limit $args.max) | default $count) $count -}}
 {{- if not $args.paginate -}}
     {{- $elements = first $max $elements -}}
 {{- end -}}

layouts/_shortcodes/file.html

@@ -73,7 +73,7 @@
     </ul>
     <div class="border-start border-end border-bottom mb-3">
         <div class="collapse multi-{{ $id }}{{ if $args.show }} show{{ end }} syntax-highlight" id="body-{{ $id }}">
-            {{- highlight (trim $content "\r\n") $lang $args.options -}}
+            {{- highlight (trim $content "\r\n") $lang (or $args.highlightOptions $args.options) -}}
         </div>
         <div class="collapse multi-{{ $id }}{{ if not $args.show }} show{{ end }} p-3" id="footer-{{ $id }}">
             <a class="nav-link active" 

layouts/header.html

@@ -27,9 +27,10 @@
         {{ if .Date }}
             {{ $lastmodstr := (partial "utilities/date.html" (dict "date" .Lastmod "format" "long")) -}}
             {{ $datestr := (partial "utilities/date.html" (dict "date" .Date "format" "long")) -}}
+            {{ if gt .Lastmod .Date }}
+                {{ $lastmodstr | i18n "lastModified" }}
+            {{ else }}
                 {{ $datestr | i18n "postedOnDate" -}}
-            {{ if eq $metadata "full" }}
-                {{ if ne $datestr $lastmodstr -}} ({{ $lastmodstr | i18n "lastModified" }}){{ end }}
             {{ end }}
             •
         {{ end }}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "1.0.0-beta3",
+  "version": "1.0.0-beta4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "1.0.0-beta3",
+      "version": "1.0.0-beta4",
       "license": "MIT",
       "dependencies": {
         "@fullhuman/postcss-purgecss": "^7.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "1.0.0-beta3",
+  "version": "1.0.0-beta4",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",