Merge pull request #1590 from gethinode/develop

Develop

.github/codeql/codeql-config.yml

@@ -4,5 +4,6 @@ paths-ignore:
   - '**/vendor'
   - '**/critical/languageSelector.js'
   - '**/critical/color.js'
+  - '**/clipboard.js'
   - '**/navbar.js'
   - '**/sharing.js'

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

@@ -32,6 +32,7 @@ blueprint:
   width:
   justify:
   link-type:
+  fluid:
   theme:
   cover:
   links:

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

@@ -27,6 +27,8 @@ blueprint:
   more:
     title:
     link:
+    link-type:
+    icon:
   icon-rounded:
   icon-style:
   cols:
@@ -42,10 +44,12 @@ blueprint:
   bento:
   cover:
   header-style:
+  body-style:
   footer-style:
   orientation:
   class:
   width:
   justify:
+  fluid:
   theme:
   cover:

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

@@ -49,9 +49,13 @@
 {{ $moreButton := site.Params.modules.bookshop.articles.moreButton | default false }}
 {{ $moreTitle := T "more" (pluralize $args.input.section) }}
 {{ $moreLink := $args.input.section }}
+{{ $moreType := "button" }}
+{{ $moreIcon := "" }}
 {{ with $args.more }}
 	{{ if .title }}{{ $moreTitle = .title }}{{ end }}
 	{{ if .link }}{{ $moreLink = .link }}{{ end }}
+	{{ if index . "link-type" }}{{ $moreType = index . "link-type" }}{{ end }}
+	{{ if .icon }}{{ $moreIcon = .icon }}{{ end }}
 {{ end }}
 
 {{ $paginate := $args.paginate }}
@@ -76,15 +80,13 @@
 		{{ $partial := "assets/card-group.html" }}
 		{{ $params := dict }}
 		{{- $params = merge $params (dict
-			"page"         page
-			"list"         $pages
-			"limit"        $args.limit
-			"cols"         $args.cols
-			"icon-rounded" $args.iconRounded
-			"icon-style"   $args.iconStyle
-			"href"         (cond $moreButton $moreLink "")
-			"href-title"   (cond $moreButton $moreTitle "")
-			"href-force"   (gt $result.total (len $result.pages))
+			"page"           page
+			"list"           $pages
+			"cols"           $args.cols
+			"limit"          $args.limit
+			"padding"        $args.padding
+			"href"           (cond $moreButton $moreLink "")
+			"href-force"     (gt $result.total (len $result.pages))
 		)}}
 
 		{{ if $args.scroll }}
@@ -94,22 +96,26 @@
 				"body-style"   "title"
 				"footer-style" "none"
 				"gutter"       1
-				"padding"      3
 				"ratio"        "1x1"
 				"orientation"  "horizontal-sm"
 				"styles"       (cond $args.bento $styles "")
 			) -}}
 		{{ else }}
 			{{ $params = merge $params (dict 
-				"header-style" $args.headerStyle
-				"footer-style" $args.footerStyle
-				"padding"      $args.padding
-				"class"        (or $args.class "border-0")
-				"align"        "start"
-				"orientation"  $args.orientation
-				"hook"         "assets/live-card.html"
-				"pagination"   $args.pagination
-				"paginate"     $paginate
+				"header-style"   $args.headerStyle
+				"body-style"     $args.bodyStyle
+				"footer-style"   $args.footerStyle
+				"class"          (or $args.class "border-0")
+				"align"          "start"
+				"orientation"    $args.orientation
+				"href-title"     (cond $moreButton $moreTitle "")
+				"icon-rounded"   $args.iconRounded
+				"icon-style"     $args.iconStyle
+				"hook"           "assets/live-card.html"
+				"more-link-type" $moreType
+				"more-link-icon" $moreIcon
+				"pagination"     $args.pagination
+				"paginate"       $paginate
 			) -}}
 		{{ end }}
 		{{ if gt (len $pages) 0 }}

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

@@ -34,5 +34,6 @@ blueprint:
   width:
   justify:
   align:
+  fluid:
   theme:
   cover:

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

@@ -37,9 +37,9 @@ blueprint:
       icon:
       force:
   align:
-  fluid:
   padding:
   order:
   width:
+  fluid:
   theme:
   cover:

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

@@ -26,5 +26,6 @@ blueprint:
   items:
     - title:
       description:
+  fluid:
   theme:
   cover:

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

@@ -35,6 +35,7 @@ blueprint:
   align:
   order:
   overlay-mode:
+  fluid:
   theme:
   cover:
   orientation:

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

@@ -33,5 +33,6 @@ blueprint:
   class:
   width:
   justify:
+  fluid:
   theme:
   cover:

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

@@ -36,7 +36,7 @@
         "page"          page
         "heading"       (dict "content" $element.content "width" 8)
         "background"    $args.background
-        "illustration"  (dict "ratio" $args.ratio "icon" $element.icon "image" $element.image "mode" $element.mode)
+        "illustration"  (dict "ratio" $args.ratio "icon" $element.icon "image" $element.image "mode" $element.mode "justify" "end")
 		"order"         $args.order
         "link-type"     $args.linkType
         "links"         $args.links

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

@@ -24,5 +24,6 @@ blueprint:
   width:
   justify:
   data:
+  fluid:
   theme:
   cover:

component-library/components/video-message/video-message.bookshop.yml

@@ -42,6 +42,7 @@ blueprint:
   border:
   width:
   justify:
+  fluid:
   theme:
   cover:
 

data/structures/card-group.yml

@@ -69,6 +69,24 @@ arguments:
     release: v0.27.0
   button-label:
     release: v1.0.0
+  more-link-type:
+    type: select
+    optional: true
+    default: button
+    comment: Style of the more button or link.
+    options:
+      values:
+        - button
+        - link
+    release: v1.16.0
+  more-link-icon:
+    type: string
+    optional: true
+    comment: >-
+      Icon to include. You can use shorthand notation such as `fas sort` to
+      include a Font Awesome icon. The argument also supports files with an
+      `.svg` or `.json` extension.
+    release: v1.16.0
 
   # deprecated arguments
   header:

data/structures/hero.yml

@@ -25,6 +25,7 @@ arguments:
     default: px-4 px-xxl-0 py-4
   width:
     default: 8
+  fluid:
   theme:
   hook:
     default: assets/hero-image.html

data/structures/stack.yml

@@ -29,13 +29,16 @@ arguments:
     optional: true
     comment: Array of pages or structured content to be rendered as cards.
     group: partial
+  limit:
   max:
     type: int
     optional: true
-    comment: Maximum number of cards to display.
+    comment: Maximum number of elements to display.
     group: partial
     options:
       min: 1
+    deprecated: v1.16.2
+    alternative: limit
   cols:
     type: select
     optional: true
@@ -57,6 +60,9 @@ arguments:
       Address for the button or hyperlink. If set, a button is added if the
       list exceeds the maximum number of cards to display.
     group: partial
+  href-force:
+    release: v1.16.2
+    group: partial
   hrefTitle:
     type: string
     optional: true
@@ -87,4 +93,5 @@ arguments:
     comment: >-
       Styles to apply to the individual cards. Supported elements are `ratio`,
       `orientation`, `portrait`, and `width`.
-
+  padding:
+    release: v1.16.2

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/airbnb/lottie-web v5.13.0+incompatible // indirect
-	github.com/cloudcannon/bookshop/hugo/v3 v3.16.4 // indirect
+	github.com/cloudcannon/bookshop/hugo/v3 v3.16.5 // indirect
 	github.com/gethinode/mod-bootstrap v1.3.4 // indirect
 	github.com/gethinode/mod-csp v1.0.8 // indirect
 	github.com/gethinode/mod-flexsearch/v3 v3.0.0 // indirect
@@ -15,7 +15,7 @@ require (
 	github.com/gethinode/mod-lottie v1.6.1 // indirect
 	github.com/gethinode/mod-mermaid/v3 v3.0.1 // indirect
 	github.com/gethinode/mod-simple-datatables/v2 v2.0.2 // indirect
-	github.com/gethinode/mod-utils/v4 v4.16.1 // indirect
+	github.com/gethinode/mod-utils/v4 v4.18.0 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20250907103239-defb38b083f0 // indirect
 	github.com/twbs/bootstrap v5.3.8+incompatible // indirect
 )

go.sum

@@ -12,6 +12,8 @@ github.com/cloudcannon/bookshop/hugo/v3 v3.16.3 h1:/Z66xKILl1SNGQePHZCnxo6vFgED7
 github.com/cloudcannon/bookshop/hugo/v3 v3.16.3/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
 github.com/cloudcannon/bookshop/hugo/v3 v3.16.4 h1:k233xdD3ydE6iN8QB+c37//rSsFVtLIo5OUNRN4E3bc=
 github.com/cloudcannon/bookshop/hugo/v3 v3.16.4/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
+github.com/cloudcannon/bookshop/hugo/v3 v3.16.5 h1:RmqeSUQMPyi31YC6SaFNE2ubfFy13qVj5/lo+MCT+u8=
+github.com/cloudcannon/bookshop/hugo/v3 v3.16.5/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
 github.com/gethinode/mod-bootstrap v1.0.1 h1:NDZar+UEL42YHCvzzO+jVgqkZU5INA12BpjX3y6U4I4=
 github.com/gethinode/mod-bootstrap v1.0.1/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8=
 github.com/gethinode/mod-bootstrap v1.1.0 h1:BbalsW8kmFhv+J+dcc41TGcjIlM/p69AB0h0oGhAXIU=
@@ -514,6 +516,10 @@ github.com/gethinode/mod-utils/v4 v4.16.0 h1:yroLCeQyE/xU46YIKS81ZtFsOONTmVudrv2
 github.com/gethinode/mod-utils/v4 v4.16.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/gethinode/mod-utils/v4 v4.16.1 h1:HjV6TONU7ZbXC2xZIPRupjKOUORddtQH8bb4dnULY1U=
 github.com/gethinode/mod-utils/v4 v4.16.1/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.17.0 h1:nDyXpZ0mCtf3ZML8G6bjeYJsI7Ne/Ze8rEWEa9zh6CI=
+github.com/gethinode/mod-utils/v4 v4.17.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.18.0 h1:CLxuPCbsQBGVgAM1x5nmh6V0HJoOcltIfKG9sthpsTk=
+github.com/gethinode/mod-utils/v4 v4.18.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/_markup/render-heading-new.html

@@ -1,17 +0,0 @@
-{{ $text := chomp .Text }}
-{{ if site.Params.main.titleCase }}{{ $text = title $text }}{{ end }}
-
-{{ if eq page.RelPermalink "/en/privacy/" }}
-    {{ warnf "title: %s" (.Text | safeHTML) }}
-{{ end }}
-
-{{ if and site.Params.navigation.anchor $text }}
-<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="heading">
-    {{- $text | safeHTML -}}
-    <a href="#{{ .Anchor | safeURL }}" aria-labelledby="{{ .Anchor | safeURL }}">
-        {{- partial "assets/icon.html" (dict "icon" "fas link anchor") }}
-    </a>
-</h{{ .Level }}>
-{{ else }}
-<h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ $text | safeHTML }}</h{{ .Level }}>
-{{ end }}

layouts/_markup/render-heading.html

@@ -1,13 +1,14 @@
+{{ $class := .Attributes.class }}
 {{ $text := chomp .Text }}
 {{ if site.Params.main.titleCase }}{{ $text = (title ($text | htmlUnescape)) | htmlEscape }}{{ end }}
 
 {{ if and site.Params.navigation.anchor $text }}
-<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="heading">
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="heading {{ with $class }}{{ . }}{{ end }}">
     {{- $text | safeHTML -}}
     <a href="#{{ .Anchor | safeURL }}" aria-labelledby="{{ .Anchor | safeURL }}">
         {{- partial "assets/icon.html" (dict "icon" "fas link anchor") }}
     </a>
 </h{{ .Level }}>
 {{ else }}
-<h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ $text | safeHTML }}</h{{ .Level }}>
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" {{ with $class }} class="{{ . }}"{{ end }}>{{ $text | safeHTML }}</h{{ .Level }}>
 {{ end }}

layouts/_partials/assets/card-group.html

@@ -171,7 +171,7 @@
                     {{- $cardWrapper = printf "card-block card-block-%d" (int $size) -}}
                 {{- end -}}
 
-                {{/*add col-$width */}}
+                {{/* add col-$width */}}
                 <div class="{{ with $cardWrapper }}{{ . }}{{ else }}col{{ end }}">
                     {{- if $args.spacer -}}<div class="spacer"></div>{{ end -}}
                     {{- partial $args.hook $params -}}
@@ -197,9 +197,14 @@
                 {{- $href = printf "%s/" $href -}}
             {{- end -}}
             <div class="mt-{{ $padding.y }} w-100">
-                <a class="btn btn-outline-primary" href="{{ $href | safeURL }}" role="button">
-                    {{ $args.hrefTitle }}
-                </a>
+                {{ partial "assets/button.html" (dict 
+                    "href"      $href
+                    "title"     $args.hrefTitle
+                    "color"     "primary"
+                    "outline"   true
+                    "link-type" $args.moreLinkType
+                    "icon"      $args.moreLinkIcon
+                ) }}
             </div>
         {{- end -}}
     {{- end -}}

layouts/_partials/assets/card.html

@@ -180,8 +180,8 @@
 {{ end }}
 
 {{- if eq $args.orientation "none" }}{{ $thumbnail = "" }}{{ $icon = "" }}{{ end -}}
-{{- if eq $args.body "title" }}{{ $description = "" }}{{ end -}}
-{{- if eq $args.body "none" }}{{ $title = "" }}{{ $description = "" }}{{ end -}}
+{{- if or (eq $args.bodyStyle "title") (eq $args.body "title") }}{{ $description = "" }}{{ end -}}
+{{- if or (eq $args.bodyStyle "none") (eq $args.body "none") }}{{ $title = "" }}{{ $description = "" }}{{ end -}}
 {{ if site.Params.main.titleCase }}{{ $title = title $title }}{{ end }}
 
 {{- $thumbnailArgs := dict

layouts/_partials/assets/hero.html

@@ -75,6 +75,7 @@
     {{ else }}
         {{ $imageJustify = $align }}
     {{ end }}
+    {{ with $args.illustration.justify }}{{ $imageJustify = . }}{{ end }}
 
     {{ if $args.icon }}{{ $imageWrapper = $iconWrapper }}{{ end }}
 

layouts/_partials/assets/links.html

@@ -99,5 +99,5 @@
 </div>
 
 <div class="d-{{ $breakpoint.current }}-none pt-{{ $padding.y }}">
-    {{ partial "links-content.html" (dict "links" $args.links "justify" $args.justify "type" $args.linkType "li" true) }}
+    {{ partial "links-content.html" (dict "links" $args.links "justify" $args.justify "type" $args.linkType "li" false) }}
 </div>

layouts/_partials/assets/stack.html

@@ -24,26 +24,27 @@
 		{{ $params := dict
 			"page"         $args.page
 			"list"         $args.list
-			"max"          $args.max
+			"limit"        (or $args.limit $args.max)
 			"class"        "border-0 card-zoom"
 			"header-style" "none"
 			"body-style"   "title"
 			"footer-style" "none"
-			"href" $args.href
-			"href-title" $args.hrefTitle
-			"link-type" (or $args.linkType $args.buttonType)
+			"href"         $args.href
+			"href-force"   $args.hrefForce
+			"href-title"   $args.hrefTitle
+			"link-type"    (or $args.linkType $args.buttonType)
 		}}
 
 		{{- partial "assets/card-group.html" (merge $params
 			(dict 
 			"cols"        $args.cols
 			"gutter"      $args.gutter
-			"padding"     3
+			"padding"     $args.padding
 			"orientation" "stacked"
 			"scroll"      true
 			"bento"       true
 			"spacer"      $args.animated
-			"portrait"    true
+			"portrait"    false
 			"valign"      (cond $args.animated "" "end")
 			"styles"      $args.styles
 			"wrapper"     "card-stack p-0 my-3 d-none d-md-block"