hodapp/blag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Figure shortcode can specify page for page resource; redo one 2008 post

Browse Source
This commit is contained in:
Chris Hodapp 2020-04-25 00:18:21 -04:00
parent 4969191708
commit 2310c96256
5 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/old_crap/2008-03-24-workfest-with-christian-appalachian-project-day-one.markdown → content/posts/2008-03-24-workfest-with-christian-appalachian-project-day-one/index.md
View File

@ -33,8 +33,8 @@ They're out of that context. They look like they're in the context they belong.
My Canon camera is probably almost out of battery power, despite efforts. I should have brought the charger. But I have the Kodak too. Maybe it will show some of the picturesque terrain.
{{< figure src="/wp_old/2008/03/img_6262.jpg" caption="Camp AJ from one angle">}}
{{< figure src="/wp_old/2008/03/img_6253.jpg" caption="Arriving at Camp AJ">}}
{{< figure src="/wp_old/2008/03/img_6265.jpg" caption="Playground and climbing wall near entrance road">}}
{{< figure page="images" resource="2008-03-workfest/img_6262.jpg" caption="Camp AJ from one angle">}}
{{< figure page="images" resource="2008-03-workfest/img_6253.jpg" caption="Arriving at Camp AJ">}}
{{< figure page="images" resource="2008-03-workfest/img_6265.jpg" caption="Playground and climbing wall near entrance road">}}
(Later note: That is [Camp AJ, 2549 Sand Lick Rd, McKee, KY 40447](https://www.google.com/maps/dir/Cincinnati,+Ohio/Berea,+Kentucky/Camp+AJ,+2549+Sand+Lick+Rd,+McKee,+KY+40447/@37.488284,-84.0115257,16z/data=!4m19!4m18!1m5!1m1!1s0x884051b1de3821f9:0x69fb7e8be4c09317!2m2!1d-84.5120196!2d39.1031182!1m5!1m1!1s0x8842e18aa160b579:0xd32df1c2b2266672!2m2!1d-84.2963223!2d37.568694!1m5!1m1!1s0x884315ccbd7d479b:0x28e72c53d5d60a9d!2m2!1d-84.00718!2d37.4887543).)

2
content/posts/2014-02-06-hello-world.md
View File

@ -66,4 +66,4 @@ of it and just really want some basic things to be easy for me again
(like a photo gallery) given that I hate web stuff like crazy.
(Did you know my [old Wordpress](https://hodapp.wordpress.com/) is
*still* up? It's nearly 12 years old at this point.)
*still* up? It's 13 years old at this point.)

3
content/works/2011-11-04-crystal1.md
View File

@ -9,3 +9,6 @@ img: images/2011-11-04-crystal1.png
Created in [Context Free](https://www.contextfreeart.org/) with
[this](assets/2011-11-04-crystal1.cfdg) using random code "GNW".
I'm no longer able to reproduce this same image with modern Context
Free; something changed since 2011 with the variation codes.

60
content/works/front.md
View File

@ -9,34 +9,34 @@ tags:
<!-- link2 is to the actual page (until I can figure out how to link this properly) -->
<!-- class="no-photoswipe" to make a figure just link to 'link' but only if it's an image -->
{{< gallery >}}
{{< figure resource="placeholder/screw0006.jpg" title="Screw (April 12, 2020)" >}}
{{< figure resource="placeholder/cinquefoil0010.png" title="Cinquefoil (November 16, 2019)" caption="Foo">}}
{{< figure resource="placeholder/dream20191115b_1000.png" title="Dream (November 15, 2019)" >}}
{{< figure resource="placeholder/ramhorn_branch_0002.png" title="ramhorn_branch? (December 16, 2019)" >}}
{{< figure resource="portfolio/ramhorn-0004.jpg" title="Ram's Horn (September 15, 2019)" link2="../2019-09-15-rams-horns.md" >}}
{{< figure resource="placeholder/iso_draft_0017.png" title="Isosurface try 2 (August 24, 2019)" >}}
{{< figure resource="placeholder/appleseed_spiral_thing_thumb.jpg" title="Appleseed spiral thing (August 20, 2018)" >}}
{{< figure resource="placeholder/appleseed_spiral_thing2_thumb.jpg" title="Appleseed spiral thing 2 (June 25, 2018)" >}}
{{< figure resource="placeholder/2011-11-25-electron.png" title="Electron (November 25, 2011)" >}}
{{< figure resource="portfolio/2011-11-04-crystal1.png" title="Crystal #1 (November 4, 2011)" link2="../2011-11-04-crystal1.md" >}}
{{< figure resource="placeholder/2011-11-03-feather2-thumb.jpg" title="Feather #2 (November 3, 2011)" >}}
{{< figure resource="placeholder/2011-11-03-feather1-thumb.jpg" title="Feather #1 (November 3, 2011)" >}}
{{< figure resource="portfolio/2011-09-09-conch.jpg" title="Conch (September 9, 2011)" link2="../2011-09-11-conch.md" >}}
{{< figure resource="placeholder/2011-09-09-flow1-thumb.jpg" title="Flow? (September 9, 2011)" >}}
{{< figure resource="portfolio/2005-08-23-shear6.jpg" title="Shear #6 (August 23, 2005)" link2="../2005-08-23-shear6.md" >}}
{{< figure resource="portfolio/2005-08-19-beach.jpg" title="Beach (August 19, 2005)" link2="../2005-08-19-beach.md" >}}
{{< figure resource="portfolio/2005-08-06-tears.jpg" title="Tears (August 6, 2005)" link2="../2005-08-06-tears.md" >}}
{{< figure resource="portfolio/2005-08-05-oasis.jpg" title="Oasis (August 5, 2005)" link2="../2005-08-05-oasis.md" >}}
{{< figure resource="portfolio/2005-07-08-vaguely-celtic-metalwork.jpg" title="Vaguely Celtic Metalwork (July 8, 2005)" link2="../2005-07-08-vaguely-celtic-metalwork.md" >}}
{{< figure resource="portfolio/2005-07-05-spiral-isosurface2.jpg" title="Spiral Isosurface (July 5, 2005)" link2="../2005-07-05-spiral.md" >}}
{{< figure resource="portfolio/2005-06-09-superellipsoids.jpg" title="Superellipsoids (June 9, 2005)" link2="../2005-06-09-superellipsoids.md" >}}
{{< figure resource="portfolio/2005-05-11-unknown-planet.jpg" title="Unknown Planet (May 11, 2005)" link2="../2005-05-11-unknown-planet.md" >}}
{{< figure resource="portfolio/2005-05-10-haze.png" title="Haze 3 (May 10, 2005)" link2="../2005-05-10-haze.md" >}}
{{< figure resource="portfolio/2004-12-23-butterfly.jpg" title="Butterfly (December 23, 2004)" link2="../2004-12-23-butterfly.md" >}}
{{< figure resource="portfolio/2004-09-28-m4c-intro.png" title="M4C intro (September 28, 2004)" link2="../2004-09-28-m4c-intro.md" >}}
{{< figure resource="portfolio/2004-09-19-roses.png" title="Roses (September 19, 2004)" link2="../2004-09-19-roses.md" >}}
{{< figure resource="portfolio/2004-07-16-crunchy-bubbles.jpg" title="Crunchy Bubbles (July 16, 2004)" link2="../2004-07-16-crunchy-bubbles.md" >}}
{{< figure resource="portfolio/2004-07-15-kpovmodeler-test.jpg" title="KPovModeler test (?) (July 15, 2004)" link2="../2004-07-15-kpovmodeler.md" >}}
{{< figure resource="portfolio/1999-12-22-table.png" title="'Table' or something (Dec 22, 1999)" link2="../1999-12-22-table-polyray.md" >}}
{{< figure resource="portfolio/1999-12-21-moo.png" caption="*Foo* [link](./link)" title="Moo (Dec 21, 1999)" caption="*Foo* [link](./link)" link2="../1999-12-21-moo-polyray/">}}
{{< figure page="images" resource="placeholder/screw0006.jpg" title="Screw (April 12, 2020)" >}}
{{< figure page="images" resource="placeholder/cinquefoil0010.png" title="Cinquefoil (November 16, 2019)" caption="Foo">}}
{{< figure page="images" resource="placeholder/dream20191115b_1000.png" title="Dream (November 15, 2019)" >}}
{{< figure page="images" resource="placeholder/ramhorn_branch_0002.png" title="ramhorn_branch? (December 16, 2019)" >}}
{{< figure page="images" resource="portfolio/ramhorn-0004.jpg" title="Ram's Horn (September 15, 2019)" link2="../2019-09-15-rams-horns.md" >}}
{{< figure page="images" resource="placeholder/iso_draft_0017.png" title="Isosurface try 2 (August 24, 2019)" >}}
{{< figure page="images" resource="placeholder/appleseed_spiral_thing_thumb.jpg" title="Appleseed spiral thing (August 20, 2018)" >}}
{{< figure page="images" resource="placeholder/appleseed_spiral_thing2_thumb.jpg" title="Appleseed spiral thing 2 (June 25, 2018)" >}}
{{< figure page="images" resource="placeholder/2011-11-25-electron.png" title="Electron (November 25, 2011)" >}}
{{< figure page="images" resource="portfolio/2011-11-04-crystal1.png" title="Crystal #1 (November 4, 2011)" link2="../2011-11-04-crystal1.md" >}}
{{< figure page="images" resource="placeholder/2011-11-03-feather2-thumb.jpg" title="Feather #2 (November 3, 2011)" >}}
{{< figure page="images" resource="placeholder/2011-11-03-feather1-thumb.jpg" title="Feather #1 (November 3, 2011)" >}}
{{< figure page="images" resource="portfolio/2011-09-09-conch.jpg" title="Conch (September 9, 2011)" link2="../2011-09-11-conch.md" >}}
{{< figure page="images" resource="placeholder/2011-09-09-flow1-thumb.jpg" title="Flow? (September 9, 2011)" >}}
{{< figure page="images" resource="portfolio/2005-08-23-shear6.jpg" title="Shear #6 (August 23, 2005)" link2="../2005-08-23-shear6.md" >}}
{{< figure page="images" resource="portfolio/2005-08-19-beach.jpg" title="Beach (August 19, 2005)" link2="../2005-08-19-beach.md" >}}
{{< figure page="images" resource="portfolio/2005-08-06-tears.jpg" title="Tears (August 6, 2005)" link2="../2005-08-06-tears.md" >}}
{{< figure page="images" resource="portfolio/2005-08-05-oasis.jpg" title="Oasis (August 5, 2005)" link2="../2005-08-05-oasis.md" >}}
{{< figure page="images" resource="portfolio/2005-07-08-vaguely-celtic-metalwork.jpg" title="Vaguely Celtic Metalwork (July 8, 2005)" link2="../2005-07-08-vaguely-celtic-metalwork.md" >}}
{{< figure page="images" resource="portfolio/2005-07-05-spiral-isosurface2.jpg" title="Spiral Isosurface (July 5, 2005)" link2="../2005-07-05-spiral.md" >}}
{{< figure page="images" resource="portfolio/2005-06-09-superellipsoids.jpg" title="Superellipsoids (June 9, 2005)" link2="../2005-06-09-superellipsoids.md" >}}
{{< figure page="images" resource="portfolio/2005-05-11-unknown-planet.jpg" title="Unknown Planet (May 11, 2005)" link2="../2005-05-11-unknown-planet.md" >}}
{{< figure page="images" resource="portfolio/2005-05-10-haze.png" title="Haze 3 (May 10, 2005)" link2="../2005-05-10-haze.md" >}}
{{< figure page="images" resource="portfolio/2004-12-23-butterfly.jpg" title="Butterfly (December 23, 2004)" link2="../2004-12-23-butterfly.md" >}}
{{< figure page="images" resource="portfolio/2004-09-28-m4c-intro.png" title="M4C intro (September 28, 2004)" link2="../2004-09-28-m4c-intro.md" >}}
{{< figure page="images" resource="portfolio/2004-09-19-roses.png" title="Roses (September 19, 2004)" link2="../2004-09-19-roses.md" >}}
{{< figure page="images" resource="portfolio/2004-07-16-crunchy-bubbles.jpg" title="Crunchy Bubbles (July 16, 2004)" link2="../2004-07-16-crunchy-bubbles.md" >}}
{{< figure page="images" resource="portfolio/2004-07-15-kpovmodeler-test.jpg" title="KPovModeler test (?) (July 15, 2004)" link2="../2004-07-15-kpovmodeler.md" >}}
{{< figure page="images" resource="portfolio/1999-12-22-table.png" title="'Table' or something (Dec 22, 1999)" link2="../1999-12-22-table-polyray.md" >}}
{{< figure page="images" resource="portfolio/1999-12-21-moo.png" caption="*Foo* [link](./link)" title="Moo (Dec 21, 1999)" caption="*Foo* [link](./link)" link2="../1999-12-21-moo-polyray/">}}
{{< /gallery >}}

24
layouts/shortcodes/figure.html
View File

@ -8,26 +8,30 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/hugo-easy-gallery.css" />{{ end }}
{{- $.Page.Scratch.Add "figurecount" 1 -}}
<!-- Some constants: -->
<!-- What page to find images as Page Resources in -->
{{ $pagename := "images" }}
<!-- if 'resource' is given, look for a page resource by that name. -->
<!-- if 'page' is given, find the page resource there. -->
<!-- if not, find the page resource in the current page. -->
<!-- (yes, my description is probably at least 50% wrong) -->
<!-- Thumbnail image size/type -->
{{ $resize_opts := "600x jpg" }}
<!-- TODO: This isn't generating a JPEG on my configuration. Not sure why. -->
<!-- TODO: This isn't generating a JPEG on my configuration. Not sure
why. Hugo version issue? -->
<!-- if 'resource' is given, look there in the "images" bundle -->
<!-- (yes, my description is probably at least 50% wrong) -->
{{ $thumb := "" }}
{{ $href := "" }}
{{ if .Get "resource" }}
{{ $page := $.Site.GetPage $pagename }}
{{- if eq $page nil -}}
{{- errorf "Error: Can't find page %s" $pagename -}}
{{ $page := $.Page }}
{{ with .Get "page" }}
{{ $page = $.Site.GetPage . }}
{{ end }}
{{- if not $page -}}
{{- errorf "Error: Can't find page %s" (.Get "page") -}}
{{- end -}}
{{ $resource := (.Get "resource") }}
{{ $original := $page.Resources.GetMatch (printf "*%s*" $resource) }}
{{- if eq $original nil -}}
{{- errorf "Error: Can't find resource %s on page %s" $resource $pagename -}}
{{- errorf "Error: Can't find resource %s on page %s" $resource (.Get "page") -}}
{{- end -}}
{{ .Scratch.Set "image" ($original.Resize $resize_opts) }}
{{ $image := .Scratch.Get "image" }}