diff --git a/exampleSite/content/shortcodes/gallery/index.md b/exampleSite/content/shortcodes/gallery/index.md index 1dc9bd66..8b901215 100644 --- a/exampleSite/content/shortcodes/gallery/index.md +++ b/exampleSite/content/shortcodes/gallery/index.md @@ -213,14 +213,14 @@ Code: ```go-text-template {{}} - {{}} + {{}} {{}} ``` Result: {{< paige/gallery caption="1 image" >}} - {{< paige/gallery image="*-1*.jpg" caption="Image 1" />}} + {{< paige/image src="*-1*.jpg" >}} {{< /paige/gallery >}} --- @@ -229,16 +229,16 @@ Code: ```go-text-template {{}} - {{}} - {{}} + {{}} + {{}} {{}} ``` Result: {{< paige/gallery caption="2 images" >}} - {{< paige/gallery image="*-2*.jpg" caption="Image 1" />}} - {{< paige/gallery image="*-3*.jpg" caption="Image 2" />}} + {{< paige/image src="*-2*.jpg" >}} + {{< paige/image src="*-3*.jpg" >}} {{< /paige/gallery >}} --- @@ -247,18 +247,18 @@ Code: ```go-text-template {{}} - {{}} - {{}} - {{}} + {{}} + {{}} + {{}} {{}} ``` Result: {{< paige/gallery caption="3 images" >}} - {{< paige/gallery image="*-4*.jpg" caption="Image 1" />}} - {{< paige/gallery image="*-5*.jpg" caption="Image 2" />}} - {{< paige/gallery image="*-6*.jpg" caption="Image 3" />}} + {{< paige/image src="*-4*.jpg" >}} + {{< paige/image src="*-5*.jpg" >}} + {{< paige/image src="*-6*.jpg" >}} {{< /paige/gallery >}} --- @@ -267,20 +267,20 @@ Code: ```go-text-template {{}} - {{}} - {{}} - {{}} - {{}} + {{}} + {{}} + {{}} + {{}} {{}} ``` Result: {{< paige/gallery caption="4 images" >}} - {{< paige/gallery image="*-7*.jpg" caption="Image 1" />}} - {{< paige/gallery image="*-8*.jpg" caption="Image 2" />}} - {{< paige/gallery image="*-9*.jpg" caption="Image 3" />}} - {{< paige/gallery image="*-10.jpg*" caption="Image 4" />}} + {{< paige/image src="*-7*.jpg" >}} + {{< paige/image src="*-8*.jpg" >}} + {{< paige/image src="*-9*.jpg" >}} + {{< paige/image src="*-10.jpg*" >}} {{< /paige/gallery >}} --- @@ -289,22 +289,22 @@ Code: ```go-text-template {{}} - {{}} - {{}} - {{}} - {{}} - {{}} + {{}} + {{}} + {{}} + {{}} + {{}} {{}} ``` Result: {{< paige/gallery caption="5 images" >}} - {{< paige/gallery image="*-11*.jpg" caption="Image 1" />}} - {{< paige/gallery image="*-12*.jpg" caption="Image 2" />}} - {{< paige/gallery image="*-13*.jpg" caption="Image 3" />}} - {{< paige/gallery image="*-14*.jpg" caption="Image 4" />}} - {{< paige/gallery image="*-15*.jpg" caption="Image 5" />}} + {{< paige/image src="*-11*.jpg" >}} + {{< paige/image src="*-12*.jpg" >}} + {{< paige/image src="*-13*.jpg" >}} + {{< paige/image src="*-14*.jpg" >}} + {{< paige/image src="*-15*.jpg" >}} {{< /paige/gallery >}} --- @@ -313,24 +313,24 @@ Code: ```go-text-template {{}} - {{}} - {{}} - {{}} - {{}} - {{}} - {{}} + {{}} + {{}} + {{}} + {{}} + {{}} + {{}} {{}} ``` Result: {{< paige/gallery caption="6 images" >}} - {{< paige/gallery image="*-16*.jpg" caption="Image 1" />}} - {{< paige/gallery image="*-17*.jpg" caption="Image 2" />}} - {{< paige/gallery image="*-18*.jpg" caption="Image 3" />}} - {{< paige/gallery image="*-19*.jpg" caption="Image 4" />}} - {{< paige/gallery image="*-20*.jpg" caption="Image 5" />}} - {{< paige/gallery image="*-21*.jpg" caption="Image 6" />}} + {{< paige/image src="*-16*.jpg" >}} + {{< paige/image src="*-17*.jpg" >}} + {{< paige/image src="*-18*.jpg" >}} + {{< paige/image src="*-19*.jpg" >}} + {{< paige/image src="*-20*.jpg" >}} + {{< paige/image src="*-21*.jpg" >}} {{< /paige/gallery >}}
Photos by Lanty.
diff --git a/layouts/partials/paige/style.html b/layouts/partials/paige/style.html index 7becb774..adbddcba 100644 --- a/layouts/partials/paige/style.html +++ b/layouts/partials/paige/style.html @@ -47,6 +47,10 @@ body, html { margin-bottom: 0; } +.paige-gallery .paige-image { + margin-bottom: 0; +} + .paige-figure .paige-image { margin-bottom: 0; } diff --git a/layouts/shortcodes/paige/gallery.html b/layouts/shortcodes/paige/gallery.html index 06b4d298..0dca3eb0 100644 --- a/layouts/shortcodes/paige/gallery.html +++ b/layouts/shortcodes/paige/gallery.html @@ -1,7 +1,6 @@ {{ $align := .Get "align" | default "center" }} {{ $caption := .Get "caption" }} {{ $height := .Get "height" }} -{{ $image := .Get "image" }} {{ $images := .Get 0 | default (.Get "images") }} {{ $justify := .Get "justify" | default "center" }} {{ $maxwidth := .Get "maxwidth" }} @@ -9,138 +8,91 @@ {{ $number := .Get "number" }} {{ $numbered := .Get "numbered" }} {{ $options := .Get "options" | default "550x webp picture Lanczos" }} -{{ $raw := .Get "raw" }} {{ $type := .Get "type" | default "rows" }} {{ $width := .Get "width" }} -{{ if $image }} - {{ $link := $image }} - {{ $resource := "" }} +{{ $inner := chomp .Inner }} +{{ $resources := slice }} +{{ $showcaption := $caption }} - {{ if not $raw }} - {{ $resource = partial "paige/resource.html" (dict - "page" .Page - "url" $image - ) }} - {{ $link = $resource.RelPermalink }} - {{ end }} - - {{ if $caption }} - {{ partial "paige/image-figure.html" (dict - "caption" $caption - "compact" true - "gap" 2 - "height" $height - "link" $link - "maxwidth" $maxwidth - "method" $method - "options" $options - "page" .Page - "raw" $raw - "resource" $resource - "src" $image - "table" true - "width" $width - ) }} +{{ with $images }} + {{ with $.Page.Resources.Match . }} + {{ $resources = . }} {{ else }} - {{ partial "paige/a.html" (dict - "content" (partial "paige/img.html" (dict - "class" "img-fluid" - "height" $height - "maxwidth" $maxwidth - "method" $method - "options" $options - "resource" $resource - "src" $image - "width" $width - )) - "href" $link - ) }} + {{ $resources = resources.Match . }} {{ end }} {{ else }} - {{ $inner := chomp .Inner }} - {{ $resources := slice }} - {{ $showcaption := $caption }} - - {{ with $images }} - {{ with $.Page.Resources.Match . }} - {{ $resources = . }} - {{ else }} - {{ $resources = resources.Match . }} - {{ end }} + {{ with .Page.Resources.ByType "image" }} + {{ $resources = . }} {{ else }} - {{ with .Page.Resources.ByType "image" }} - {{ $resources = . }} - {{ else }} - {{ $resources = resources.ByType "image" }} - {{ end }} + {{ $resources = resources.ByType "image" }} {{ end }} +{{ end }} - {{ if $caption }} - {{ if $number }} - {{ $caption = printf "%v %v: %v" (i18n "paige_figure") $number $caption }} - {{ end }} - {{ else }} - {{ if $number }} - {{ $caption = printf "%v %v" (i18n "paige_figure") $number }} - {{ $showcaption = true }} - {{ else if $numbered }} - {{ $showcaption = true }} - {{ end }} +{{ if $caption }} + {{ if $number }} + {{ $caption = printf "%v %v: %v" (i18n "paige_figure") $number $caption }} + {{ end }} +{{ else }} + {{ if $number }} + {{ $caption = printf "%v %v" (i18n "paige_figure") $number }} + {{ $showcaption = true }} + {{ else if $numbered }} + {{ $showcaption = true }} {{ end }} +{{ end }} -
- {{ if eq $type "grid" }} -
-
- {{ with $inner }} - {{ . }} - {{ else }} - {{ range $resources }} -
- {{ partial "paige/a.html" (dict - "content" (partial "paige/img.html" (dict - "class" "img-fluid" - "height" $height - "maxwidth" $maxwidth - "method" $method - "options" $options - "resource" . - "width" $width - )) - "href" .RelPermalink - ) }} -
- {{ end }} - {{ end }} -
-
- {{ else if eq $type "rows" }} -
+
+ {{ if eq $type "grid" }} +
+
{{ with $inner }} {{ . }} {{ else }} {{ range $resources }} - {{ partial "paige/a.html" (dict - "content" (partial "paige/img.html" (dict - "class" "img-fluid" - "height" $height - "maxwidth" $maxwidth - "method" $method - "options" $options - "resource" . - "width" $width - )) - "href" .RelPermalink - ) }} +
+ {{ partial "paige/a.html" (dict + "content" (partial "paige/img.html" (dict + "class" "img-fluid" + "height" $height + "maxwidth" $maxwidth + "method" $method + "options" $options + "resource" . + "width" $width + )) + "href" .RelPermalink + ) }} +
{{ end }} {{ end }}
- {{ else }} - {{ errorf "invalid type: %q" $type }} - {{ end }} - {{ if $showcaption }} -
{{ $caption }}
- {{ end }} -
-{{ end }} +
+ {{ else if eq $type "rows" }} +
+ {{ with $inner }} + {{ . }} + {{ else }} + {{ range $resources }} + {{ partial "paige/a.html" (dict + "content" (partial "paige/img.html" (dict + "class" "img-fluid" + "height" $height + "maxwidth" $maxwidth + "method" $method + "options" $options + "resource" . + "width" $width + )) + "href" .RelPermalink + ) }} + {{ end }} + {{ end }} +
+ {{ else }} + {{ errorf "invalid type: %q" $type }} + {{ end }} + {{ if $showcaption }} +
{{ $caption }}
+ {{ end }} +