From ae37e19238d9332add3681d5de13bc70151008a7 Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 11:43:39 +0700 Subject: Added image gallery - modified from 'liwenyip' hugo-easy-gallery --- layouts/_default/single.html | 2 + layouts/partials/tail.html | 10 ++ layouts/shortcodes/figure.html | 29 ++++++ layouts/shortcodes/gallery.html | 53 +++++++++++ layouts/shortcodes/load-photoswipe.html | 75 +++++++++++++++ static/css/hugo-easy-gallery.css | 159 ++++++++++++++++++++++++++++++++ static/js/load-photoswipe.js | 80 ++++++++++++++++ 7 files changed, 408 insertions(+) create mode 100644 layouts/shortcodes/figure.html create mode 100644 layouts/shortcodes/gallery.html create mode 100644 layouts/shortcodes/load-photoswipe.html create mode 100644 static/css/hugo-easy-gallery.css create mode 100644 static/js/load-photoswipe.js diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 8b606f5..d4cdf05 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -22,6 +22,7 @@ {{ end }} +{{/* {{ $images := .Resources.Match "images/*" }} {{ if gt (len $images) 0 }} {{ end }} +*/}} {{ end }} {{ define "lists" }} diff --git a/layouts/partials/tail.html b/layouts/partials/tail.html index ac0526b..ed6fbd7 100644 --- a/layouts/partials/tail.html +++ b/layouts/partials/tail.html @@ -1,5 +1,15 @@ {{ "" | safeHTML }} + + + +{{ if ($.Scratch.Get "photoswipeloaded") }} + + + + +{{ end }} diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html new file mode 100644 index 0000000..4c6ff1f --- /dev/null +++ b/layouts/shortcodes/figure.html @@ -0,0 +1,29 @@ + + +{{- if not ($.Page.Scratch.Get "figurecount") }}{{ end }} +{{- $.Page.Scratch.Add "figurecount" 1 -}} + +{{- $thumb := .Get "src" | default (printf "%s." (.Get "thumb") | replace (.Get "link") ".") }} +
+
+
+ +
+ {{ with .Get "link" | default (.Get "src") }}{{ end }} + {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr")}} +
+ {{- with .Get "title" }}

{{.}}

{{ end }} + {{- if or (.Get "caption") (.Get "attr")}} +

+ {{- .Get "caption" -}} + {{- with .Get "attrlink"}}{{ .Get "attr" }}{{ else }}{{ .Get "attr"}}{{ end -}} +

+ {{- end }} +
+ {{- end }} +
+
diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html new file mode 100644 index 0000000..ab8671b --- /dev/null +++ b/layouts/shortcodes/gallery.html @@ -0,0 +1,53 @@ + + +{{- if not ($.Page.Scratch.Get "figurecount") }}{{ end }} +{{- $.Page.Scratch.Add "figurecount" 1 }} +{{ $baseURL := .Site.BaseURL }} +
+ {{- with (.Get "dir") -}} + + {{- if eq ($.Get "static") "true" -}} + {{ $.Page.Scratch.Set "dirURL" (print .) }} + {{ $.Page.Scratch.Set "dirFiles" (print "/static/" .) }} + {{- else -}} + {{- $dir := print (replace $.Page.Dir "\\" "/") "/" . }} + {{ $.Page.Scratch.Set "dirURL" $dir }} + {{ $.Page.Scratch.Set "dirFiles" (print "/content/" $dir "/") }} + {{- end -}} + {{- $dir := $.Page.Scratch.Get "dirURL" }} + {{- $files := readDir ($.Page.Scratch.Get "dirFiles" ) }} + {{ $.Page.Scratch.Delete "dirURL" }} + {{ $.Page.Scratch.Delete "dirFiles" }} + + {{- range $files -}} + + {{- $thumbext := $.Get "thumb" | default "-thumb" }} + {{- $isthumb := .Name | findRE ($thumbext | printf "%s\\.") }} + {{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp)" }} + {{- if and $isimg (not $isthumb) }} + {{- $caption := .Name | replaceRE "\\..*" "" | humanize }} + {{- $linkURL := print $baseURL $dir "/" .Name | absURL }} + {{- $thumb := .Name | replaceRE "(\\.)" ($thumbext | printf "%s.") }} + {{- $thumbexists := where $files "Name" $thumb }} + {{- $thumbURL := print $baseURL $dir "/" $thumb | absURL }} +
+
+
+ {{ $caption }} +
+
+

{{ $caption }}

+
+ +
+
+ {{- end }} + {{- end }} + {{- else -}} + + {{ .Inner }} + {{- end }} +
diff --git a/layouts/shortcodes/load-photoswipe.html b/layouts/shortcodes/load-photoswipe.html new file mode 100644 index 0000000..4b3bfad --- /dev/null +++ b/layouts/shortcodes/load-photoswipe.html @@ -0,0 +1,75 @@ + + + +{{ if not ($.Page.Scratch.Get "photoswipeloaded") }} + {{ $.Page.Scratch.Set "photoswipeloaded" 1 }} + + + + + + + + + + + +{{ end }} \ No newline at end of file diff --git a/static/css/hugo-easy-gallery.css b/static/css/hugo-easy-gallery.css new file mode 100644 index 0000000..d78dfec --- /dev/null +++ b/static/css/hugo-easy-gallery.css @@ -0,0 +1,159 @@ +/* +Put this file in /static/css/hugo-easy-gallery.css +Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ +*/ + + +/* +Grid Layout Styles +*/ +.gallery { + overflow: hidden; + margin: 10px; + max-width: 768px; +} +.gallery .box { + float: left; + position: relative; + /* Default: 1 tile wide */ + width: 100%; + padding-bottom: 100%; +} +@media only screen and (min-width : 365px) { + /* Tablet view: 2 tiles */ + .gallery .box { + width: 50%; + padding-bottom: 50%; + } +} +@media only screen and (min-width : 480px) { + /* Small desktop / ipad view: 3 tiles */ + .gallery .box { + width: 33.3%; + padding-bottom: 33.3%; /* */ + } +} +@media only screen and (min-width : 9999px) { + /* Medium desktop: 4 tiles */ + .box { + width: 25%; + padding-bottom: 25%; + } +} + +/* +Transition styles +*/ +.gallery.hover-transition figure, +.gallery.hover-effect-zoom .img, +.gallery:not(.caption-effect-appear) figcaption, +.fancy-figure:not(.caption-effect-appear) figcaption { + -webkit-transition: all 0.3s ease-in-out; + -moz-transition: all 0.3s ease-in-out; + -o-transition: all 0.3s ease-in-out; + transition: all 0.3s ease-in-out; +} +/* +figure styles +*/ +figure { + position:relative; /* purely to allow absolution positioning of figcaption */ + overflow: hidden; +} +.gallery figure { + position: absolute; + left: 5px; + right: 5px; + top: 5px; + bottom: 5px; +} +.gallery.hover-effect-grow figure:hover { + transform: scale(1.05); +} +.gallery.hover-effect-shrink figure:hover { + transform: scale(0.95); +} +.gallery.hover-effect-slidedown figure:hover { + transform: translateY(5px); +} +.gallery.hover-effect-slideup figure:hover { + transform: translateY(-5px); +} + +/* +img / a styles +*/ + +.gallery .img { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + background-size: cover; + background-position: 50% 50%; + background-repeat: no-repeat; +} +.gallery.hover-effect-zoom figure:hover .img { + transform: scale(1.05); +} +.gallery img { + display: none; /* only show the img if not inside a gallery */ +} +figure a { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; +} + +/* +figcaption styles +*/ +.gallery figcaption, +.fancy-figure figcaption { + position: absolute; + bottom: 0; + left: 0; + right: 0; + background: #000; + color: #FFF; + text-align: center; + font-size: 75%; /* change this if you want bigger text */ + background: rgba(0, 0, 0, 0.5); + opacity: 1; + cursor: pointer; +} +.gallery.caption-position-none figcaption, +.fancy-figure.caption-position-none figcaption { + display: none; +} +.gallery.caption-position-center figcaption, +.fancy-figure.caption-position-center figcaption { + top: 0; + padding: 40% 5px; +} +.gallery.caption-position-bottom figcaption, +.fancy-figure.caption-position-bottom figcaption { + padding: 5px; +} +.gallery.caption-effect-fade figure:not(:hover) figcaption, +.gallery.caption-effect-appear figure:not(:hover) figcaption, +.fancy-figure.caption-effect-fade figure:not(:hover) figcaption, +.fancy-figure.caption-effect-appear figure:not(:hover) figcaption { + background: rgba(0, 0, 0, 0); + opacity: 0; +} +.gallery.caption-effect-slide.caption-position-bottom figure:not(:hover) figcaption, +.fancy-figure.caption-effect-slide.caption-position-bottom figure:not(:hover) figcaption { + margin-bottom: -100%; +} +.gallery.caption-effect-slide.caption-position-center figure:not(:hover) figcaption, +.fancy-figure.caption-effect-slide.caption-position-center figure:not(:hover) figcaption { + top: 100%; +} +figcaption p { + margin: auto; /* override style in theme */ +} + diff --git a/static/js/load-photoswipe.js b/static/js/load-photoswipe.js new file mode 100644 index 0000000..978c66d --- /dev/null +++ b/static/js/load-photoswipe.js @@ -0,0 +1,80 @@ +/* +Put this file in /static/js/load-photoswipe.js +Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ +*/ + +/* Show an alert if this js file has been loaded twice */ +if (window.loadphotoswipejs) { + window.alert("You've loaded load-photoswipe.js twice. See https://github.com/liwenyip/hugo-easy-gallery/issues/6") +} +var loadphotoswipejs = 1 + +/* TODO: Make the share function work */ +$( document ).ready(function() { + /* + Initialise Photoswipe + */ + var items = []; // array of slide objects that will be passed to PhotoSwipe() + // for every figure element on the page: + $('figure').each( function() { + if ($(this).attr('class') == 'no-photoswipe') return true; // ignore any figures where class="no-photoswipe" + // get properties from child a/img/figcaption elements, + var $figure = $(this), + $a = $figure.find('a'), + $img = $figure.find('img'), + $src = $a.attr('href'), + $title = $img.attr('alt'), + $msrc = $img.attr('src'); + // if data-size on tag is set, read it and create an item + if ($a.data('size')) { + var $size = $a.data('size').split('x'); + var item = { + src : $src, + w : $size[0], + h : $size[1], + title : $title, + msrc : $msrc + }; + console.log("Using pre-defined dimensions for " + $src); + // if not, set temp default size then load the image to check actual size + } else { + var item = { + src : $src, + w : 800, // temp default size + h : 600, // temp default size + title : $title, + msrc : $msrc + }; + console.log("Using default dimensions for " + $src); + // load the image to check its dimensions + // update the item as soon as w and h are known (check every 30ms) + var img = new Image(); + img.src = $src; + var wait = setInterval(function() { + var w = img.naturalWidth, + h = img.naturalHeight; + if (w && h) { + clearInterval(wait); + item.w = w; + item.h = h; + console.log("Got actual dimensions for " + img.src); + } + }, 30); + } + // Save the index of this image then add it to the array + var index = items.length; + items.push(item); + // Event handler for click on a figure + $figure.on('click', function(event) { + event.preventDefault(); // prevent the normal behaviour i.e. load the hyperlink + // Get the PSWP element and initialise it with the desired options + var $pswp = $('.pswp')[0]; + var options = { + index: index, + bgOpacity: 0.8, + showHideOpacity: true + } + new PhotoSwipe($pswp, PhotoSwipeUI_Default, items, options).init(); + }); + }); +}); \ No newline at end of file -- cgit v1.2.3 From 6df1f70458d1747813c3e8887487d206fa76a01e Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 11:53:44 +0700 Subject: Image gallery: set logo images as 'non Photoswipe' --- layouts/_default/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d4cdf05..d7172ea 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,7 +6,7 @@ {{ if eq .ResourceType "image" }} {{ $image := .Fit "64x64" }}
  • -
    +
    • -- cgit v1.2.3 From 3e61c8a43910d27b1cfa511158a73d634f824d9f Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 12:08:54 +0700 Subject: Image gallery: removed 'share' button --- layouts/shortcodes/load-photoswipe.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layouts/shortcodes/load-photoswipe.html b/layouts/shortcodes/load-photoswipe.html index 4b3bfad..b4dc61c 100644 --- a/layouts/shortcodes/load-photoswipe.html +++ b/layouts/shortcodes/load-photoswipe.html @@ -46,7 +46,9 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
    + -- cgit v1.2.3 From 09da20da8cad89350be6179c284c17d8a1f84d6f Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 13:41:12 +0700 Subject: Image gallery: changed 'gallery' shortcode to partial --- layouts/_default/single.html | 11 +++++ layouts/partials/gallery.html | 84 +++++++++++++++++++++++++++++++++ layouts/partials/load-photoswipe.html | 77 ++++++++++++++++++++++++++++++ layouts/shortcodes/figure.html | 29 ------------ layouts/shortcodes/gallery.html | 53 --------------------- layouts/shortcodes/load-photoswipe.html | 77 ------------------------------ 6 files changed, 172 insertions(+), 159 deletions(-) create mode 100644 layouts/partials/gallery.html create mode 100644 layouts/partials/load-photoswipe.html delete mode 100644 layouts/shortcodes/figure.html delete mode 100644 layouts/shortcodes/gallery.html delete mode 100644 layouts/shortcodes/load-photoswipe.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d7172ea..566fdf7 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -42,6 +42,17 @@ {{ end }} */}} +{{/* +- "dir" .Params.images_directory + => if not defined: "images" +- "static" .Params.images_static + => if not defined: N/A +- "thumb" .Params.images_thumb_suffix + => if not defined: N/A +... +*/}} +{{ partial "gallery.html" (dict "page" . "dir" "images") }} +{{ partial "load-photoswipe.html" (dict "page" .) }} {{ end }} {{ define "lists" }} diff --git a/layouts/partials/gallery.html b/layouts/partials/gallery.html new file mode 100644 index 0000000..72e11d2 --- /dev/null +++ b/layouts/partials/gallery.html @@ -0,0 +1,84 @@ + + + + +{{- if not (.page.Scratch.Get "figurecount") }}{{ end }} +{{- .page.Scratch.Add "figurecount" 1 }} +{{ $baseURL := .page.Site.BaseURL }} +
    + {{- with .dir -}} + + {{- if eq $.static "true" -}} + {{ $.page.Scratch.Set "dirURL" (print .) }} + {{ $.page.Scratch.Set "dirFiles" (print "/static/" .) }} + {{- else -}} + {{- $tmpDir := print (replace $.page.Dir "\\" "/") "/" . }} + {{ $.page.Scratch.Set "dirURL" $tmpDir }} + {{ $.page.Scratch.Set "dirFiles" (print "/content/" $tmpDir "/") }} + {{- end -}} + {{- $dir := $.page.Scratch.Get "dirURL" }} + {{ if (fileExists $dir) -}} + {{- $files := readDir ($.page.Scratch.Get "dirFiles" ) }} + + {{- range $files -}} + + {{- $thumbext := $.thumb | default "-thumb" }} + {{- $isthumb := .Name | findRE ($thumbext | printf "%s\\.") }} + {{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp)" }} + {{- if and $isimg (not $isthumb) }} + {{- $caption := .Name | replaceRE "\\..*" "" | humanize }} + {{- $linkURL := print $baseURL $dir "/" .Name | absURL }} + {{- $thumb := .Name | replaceRE "(\\.)" ($thumbext | printf "%s.") }} + {{- $thumbexists := where $files "Name" $thumb }} + {{- $thumbURL := print $baseURL $dir "/" $thumb | absURL }} +
    +
    +
    + {{ $caption }} +
    +
    +

    {{ $caption }}

    +
    +     +
    +
    + {{- end }} + {{- end }} + {{- end }} + {{ $.page.Scratch.Delete "dirURL" }} + {{ $.page.Scratch.Delete "dirFiles" }} + + {{- else -}} + + {{ .Inner }} + {{- end }} +
    diff --git a/layouts/partials/load-photoswipe.html b/layouts/partials/load-photoswipe.html new file mode 100644 index 0000000..d9921b1 --- /dev/null +++ b/layouts/partials/load-photoswipe.html @@ -0,0 +1,77 @@ + + + +{{ if not (.page.Scratch.Get "photoswipeloaded") }} + {{ .page.Scratch.Set "photoswipeloaded" 1 }} + + + + + + + + + + + +{{ end }} \ No newline at end of file diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html deleted file mode 100644 index 4c6ff1f..0000000 --- a/layouts/shortcodes/figure.html +++ /dev/null @@ -1,29 +0,0 @@ - - -{{- if not ($.Page.Scratch.Get "figurecount") }}{{ end }} -{{- $.Page.Scratch.Add "figurecount" 1 -}} - -{{- $thumb := .Get "src" | default (printf "%s." (.Get "thumb") | replace (.Get "link") ".") }} -
    -
    -
    - -
    - {{ with .Get "link" | default (.Get "src") }}{{ end }} - {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr")}} -
    - {{- with .Get "title" }}

    {{.}}

    {{ end }} - {{- if or (.Get "caption") (.Get "attr")}} -

    - {{- .Get "caption" -}} - {{- with .Get "attrlink"}}{{ .Get "attr" }}{{ else }}{{ .Get "attr"}}{{ end -}} -

    - {{- end }} -
    - {{- end }} -
    -
    diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html deleted file mode 100644 index ab8671b..0000000 --- a/layouts/shortcodes/gallery.html +++ /dev/null @@ -1,53 +0,0 @@ - - -{{- if not ($.Page.Scratch.Get "figurecount") }}{{ end }} -{{- $.Page.Scratch.Add "figurecount" 1 }} -{{ $baseURL := .Site.BaseURL }} -
    - {{- with (.Get "dir") -}} - - {{- if eq ($.Get "static") "true" -}} - {{ $.Page.Scratch.Set "dirURL" (print .) }} - {{ $.Page.Scratch.Set "dirFiles" (print "/static/" .) }} - {{- else -}} - {{- $dir := print (replace $.Page.Dir "\\" "/") "/" . }} - {{ $.Page.Scratch.Set "dirURL" $dir }} - {{ $.Page.Scratch.Set "dirFiles" (print "/content/" $dir "/") }} - {{- end -}} - {{- $dir := $.Page.Scratch.Get "dirURL" }} - {{- $files := readDir ($.Page.Scratch.Get "dirFiles" ) }} - {{ $.Page.Scratch.Delete "dirURL" }} - {{ $.Page.Scratch.Delete "dirFiles" }} - - {{- range $files -}} - - {{- $thumbext := $.Get "thumb" | default "-thumb" }} - {{- $isthumb := .Name | findRE ($thumbext | printf "%s\\.") }} - {{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp)" }} - {{- if and $isimg (not $isthumb) }} - {{- $caption := .Name | replaceRE "\\..*" "" | humanize }} - {{- $linkURL := print $baseURL $dir "/" .Name | absURL }} - {{- $thumb := .Name | replaceRE "(\\.)" ($thumbext | printf "%s.") }} - {{- $thumbexists := where $files "Name" $thumb }} - {{- $thumbURL := print $baseURL $dir "/" $thumb | absURL }} -
    -
    -
    - {{ $caption }} -
    -
    -

    {{ $caption }}

    -
    - -
    -
    - {{- end }} - {{- end }} - {{- else -}} - - {{ .Inner }} - {{- end }} -
    diff --git a/layouts/shortcodes/load-photoswipe.html b/layouts/shortcodes/load-photoswipe.html deleted file mode 100644 index b4dc61c..0000000 --- a/layouts/shortcodes/load-photoswipe.html +++ /dev/null @@ -1,77 +0,0 @@ - - - -{{ if not ($.Page.Scratch.Get "photoswipeloaded") }} - {{ $.Page.Scratch.Set "photoswipeloaded" 1 }} - - - - - - - - - - - -{{ end }} \ No newline at end of file -- cgit v1.2.3 From f764775985b446655701ed740c116d598980cb77 Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 14:08:49 +0700 Subject: Image gallery: fixed directory check & added params in 'single.html' call to partial --- layouts/_default/single.html | 15 ++++----------- layouts/partials/gallery.html | 5 +++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 566fdf7..b4d3641 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -42,17 +42,10 @@ {{ end }} */}} -{{/* -- "dir" .Params.images_directory - => if not defined: "images" -- "static" .Params.images_static - => if not defined: N/A -- "thumb" .Params.images_thumb_suffix - => if not defined: N/A -... -*/}} -{{ partial "gallery.html" (dict "page" . "dir" "images") }} -{{ partial "load-photoswipe.html" (dict "page" .) }} + {{ $images_directory := .Params.images_directory | default "images" }} + {{ $images_static := .Params.images_static | default "false" }} + {{ partial "gallery.html" (dict "page" . "dir" $images_directory "static" $images_static) }} + {{ partial "load-photoswipe.html" (dict "page" .) }} {{ end }} {{ define "lists" }} diff --git a/layouts/partials/gallery.html b/layouts/partials/gallery.html index 72e11d2..6c7fc4b 100644 --- a/layouts/partials/gallery.html +++ b/layouts/partials/gallery.html @@ -46,8 +46,9 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ {{ $.page.Scratch.Set "dirFiles" (print "/content/" $tmpDir "/") }} {{- end -}} {{- $dir := $.page.Scratch.Get "dirURL" }} - {{ if (fileExists $dir) -}} - {{- $files := readDir ($.page.Scratch.Get "dirFiles" ) }} + {{- $dirFiles := $.page.Scratch.Get "dirFiles" }} + {{ if (fileExists $dirFiles) -}} + {{- $files := readDir ($dirFiles ) }} {{- range $files -}} -- cgit v1.2.3 From efbd6a27f869a7b405479e1f2db6a7529cd19652 Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 14:20:02 +0700 Subject: Image gallery: removed call to '.Inner' when no directory specified - as not working and not required for now --- layouts/partials/gallery.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/layouts/partials/gallery.html b/layouts/partials/gallery.html index 6c7fc4b..ca77ac0 100644 --- a/layouts/partials/gallery.html +++ b/layouts/partials/gallery.html @@ -48,7 +48,7 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ {{- $dir := $.page.Scratch.Get "dirURL" }} {{- $dirFiles := $.page.Scratch.Get "dirFiles" }} {{ if (fileExists $dirFiles) -}} - {{- $files := readDir ($dirFiles ) }} + {{- $files := readDir $dirFiles }} {{- range $files -}} @@ -79,7 +79,11 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ {{ $.page.Scratch.Delete "dirFiles" }} {{- else -}} +{{/* +TODO: Need to change the "figure" shortcode to a partial. +Not required for now as not used. {{ .Inner }} +*/}} {{- end }} -- cgit v1.2.3 From 43e5f5971006d59b58f81879cdc01dd9bbda03e7 Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 17:53:06 +0700 Subject: Image gallery: Added caption & copyright handling --- layouts/_default/single.html | 4 +++- layouts/partials/gallery.html | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b4d3641..7fa2910 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -44,7 +44,9 @@ */}} {{ $images_directory := .Params.images_directory | default "images" }} {{ $images_static := .Params.images_static | default "false" }} - {{ partial "gallery.html" (dict "page" . "dir" $images_directory "static" $images_static) }} + {{ $images_copyright := .Params.images_copyright }} + {{ $images_params := .Params.images }} + {{ partial "gallery.html" (dict "page" . "dir" $images_directory "static" $images_static "images_params" $images_params "images_copyright" $images_copyright) }} {{ partial "load-photoswipe.html" (dict "page" .) }} {{ end }} diff --git a/layouts/partials/gallery.html b/layouts/partials/gallery.html index ca77ac0..e8f2084 100644 --- a/layouts/partials/gallery.html +++ b/layouts/partials/gallery.html @@ -13,6 +13,17 @@ Input Parameters: - "thumb": String (suffix) - $.Get "thumb" => $.thumb (if defined, else "-thumb" by default) +(TODO: detail/document...) +- "images_copyright" +("MULTITEL") +- images: + - "src" +("1.png") + - "title" +("Plan") + - "copyright" +(...) + TODO: - .Get "caption-position" default "bottom" @@ -47,7 +58,7 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ {{- end -}} {{- $dir := $.page.Scratch.Get "dirURL" }} {{- $dirFiles := $.page.Scratch.Get "dirFiles" }} - {{ if (fileExists $dirFiles) -}} + {{- if (fileExists $dirFiles) -}} {{- $files := readDir $dirFiles }} {{- range $files -}} @@ -56,7 +67,28 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ {{- $isthumb := .Name | findRE ($thumbext | printf "%s\\.") }} {{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp)" }} {{- if and $isimg (not $isthumb) }} - {{- $caption := .Name | replaceRE "\\..*" "" | humanize }} + {{ $name := .Name }} + {{ with $.images_copyright }} + {{ $.page.Scratch.Set "copyright" (print " - © " .) }} + {{ end }} + + {{ range $.images_params }} + {{ if eq .src $name }} + {{ with .title }} + {{ $.page.Scratch.Set "title" . }} + {{ end }} + {{ with .copyright }} + {{ $.page.Scratch.Set "copyright" (print " - © " .) }} + {{ end }} + {{ end }} + {{ end }} + + {{- $title := ($.page.Scratch.Get "title") | default (.Name | replaceRE "\\..*" "") }} + {{- $copyright := ($.page.Scratch.Get "copyright") | default "" }} + + {{- $captionthumb := $title }} + {{- $caption := (print $title $copyright) }} + {{- $linkURL := print $baseURL $dir "/" .Name | absURL }} {{- $thumb := .Name | replaceRE "(\\.)" ($thumbext | printf "%s.") }} {{- $thumbexists := where $files "Name" $thumb }} @@ -67,17 +99,18 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/ {{ $caption }}
    -

    {{ $caption }}

    +

    {{ $captionthumb }}

    + {{ $.page.Scratch.Delete "title" }} + {{ $.page.Scratch.Delete "copyright" }} {{- end }} {{- end }} {{- end }} {{ $.page.Scratch.Delete "dirURL" }} {{ $.page.Scratch.Delete "dirFiles" }} - {{- else -}} {{/* TODO: Need to change the "figure" shortcode to a partial. -- cgit v1.2.3 From 5fc4fb0f7d26c94f5e3d28366dbb4ec33dd3227a Mon Sep 17 00:00:00 2001 From: Derek Severin Date: Sun, 10 Feb 2019 17:57:36 +0700 Subject: Image gallery: Deleted commented code --- layouts/_default/single.html | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 7fa2910..551431e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,4 +1,5 @@ {{ define "content" }} + {{ $logos := .Resources.Match "logos/*" }} {{ if gt (len $logos) 0 }}