From d59b1035168d901eecae90fbd1d37677fe43d485 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 16 Jul 2019 22:44:03 -0500 Subject: [PATCH] fix some photos + added categories/ , tags/ , and series/ --- content/post/2018/11/quick-photos-from-trf.md | 2 + .../post/2018/12/trf-2018-photos-general.md | 84 +++++++++---------- .../post/2018/12/trf-2018-photos-holiday.md | 42 +++++----- .../post/2018/12/trf-2018-photos-people.md | 16 +++- .../2018/12/trf-2018-photos-water-lilies.md | 14 ++-- .../nederburg/layouts/_default/taxonomy.html | 1 - themes/nederburg/layouts/partials/series.html | 70 ++++++++++++++++ .../layouts/taxonomy/category.terms.html | 48 +++++++++++ themes/nederburg/layouts/taxonomy/series.html | 26 ++++++ .../layouts/taxonomy/series.terms.html | 48 +++++++++++ .../nederburg/layouts/taxonomy/tag.terms.html | 48 +++++++++++ 11 files changed, 325 insertions(+), 74 deletions(-) create mode 100644 themes/nederburg/layouts/partials/series.html create mode 100644 themes/nederburg/layouts/taxonomy/category.terms.html create mode 100644 themes/nederburg/layouts/taxonomy/series.html create mode 100644 themes/nederburg/layouts/taxonomy/series.terms.html create mode 100644 themes/nederburg/layouts/taxonomy/tag.terms.html diff --git a/content/post/2018/11/quick-photos-from-trf.md b/content/post/2018/11/quick-photos-from-trf.md index 62afdc42..ab8e488c 100644 --- a/content/post/2018/11/quick-photos-from-trf.md +++ b/content/post/2018/11/quick-photos-from-trf.md @@ -3,6 +3,8 @@ date = "2018-11-19T20:52:27-07:00" title = "Quick Photos from TRF" slug = "quick-photos-from-trf" image = "/uploads/2018/11/P1010726.jpg" +categories = ["photos"] +series = ["TRF 2018"] +++ As is our habit, we often go to TRF.  This weekend, we finally made it.  However, the weather was less than perfect.  Around 50F and raining off and on.  I still had a good time, and the family mainly enjoyed themselves as well, but I kept the small camera I brought with me away for most of the day. diff --git a/content/post/2018/12/trf-2018-photos-general.md b/content/post/2018/12/trf-2018-photos-general.md index 4f65a8a0..b21a3def 100644 --- a/content/post/2018/12/trf-2018-photos-general.md +++ b/content/post/2018/12/trf-2018-photos-general.md @@ -1,50 +1,50 @@ +++ date = "2018-12-14T12:15:27-07:00" -title = "'TRF 2018 Photos : General'" +title = "TRF 2018 Photos : General" slug = "trf-2018-photos-:-general" image = "/uploads/2018/12/PB250107.jpg" +categories = ["photos"] +series = ["TRF 2018"] +++ Part four of my TRF Photos series.  This time the photos which did not fall into any of the other categories. - +![Fall Colors I](/uploads/2018/12/PB250084.jpg) +Fall Colors I + +![Fall Colors II](/uploads/2018/12/PB250107.jpg) +Fall Colors II + +![Yellow Dragon](/uploads/2018/12/PB250080.jpg) +Yellow Dragon + +![Sunflower](/uploads/2018/12/PB250092.jpg) +Sunflower + +![Green Man](/uploads/2018/12/PB250090.jpg) +Green Man + +![Press](/uploads/2018/12/PB250109.jpg) +Press + +![Hanging Shadows](/uploads/2018/12/PB250147.jpg) +Hanging Shadows + +![Rat Pack](/uploads/2018/12/PB250141.jpg) +Rat Pack + +![Bird Whistles](/uploads/2018/12/PB250192.jpg) +Bird Whistles + +![Here Be Dragons!](/uploads/2018/12/PB250203.jpg) +Here Be Dragons! + +![Straw Brooms](/uploads/2018/12/PB250155.jpg) +Straw Brooms + +![Play with Me](/uploads/2018/12/PB250222.jpg) +Play with Me + +![Fairy Wings](/uploads/2018/12/PB250272.jpg) +Fairy Wings + diff --git a/content/post/2018/12/trf-2018-photos-holiday.md b/content/post/2018/12/trf-2018-photos-holiday.md index a513ade8..433b6a10 100644 --- a/content/post/2018/12/trf-2018-photos-holiday.md +++ b/content/post/2018/12/trf-2018-photos-holiday.md @@ -1,29 +1,29 @@ +++ date = "2018-12-11T12:15:26-07:00" -title = "'TRF 2018 Photos : Holiday'" +title = "TRF 2018 Photos : Holiday" slug = "trf-2018-photos-:-holiday" image = "/uploads/2018/12/PB250099.jpg" +categories = ["photos"] +series = ["TRF 2018"] +++ Part three of my TRF Photos series.  This time looking at Holiday decorations. - +![Beaver and Tree](/uploads/2018/12/PB250077.jpg) +Beaver and Tree + +![Hanging Ornament I](/uploads/2018/12/PB250101.jpg) +Hanging Ornament I + +![Hanging Ornament II](/uploads/2018/12/PB250158.jpg) +Hanging Ornament II + +![Hanging Ornament III](/uploads/2018/12/PB250099.jpg) +Hanging Ornament III + +![Window Cat](/uploads/2018/12/PB250229.jpg) +Window Cat + +![Holiday Duck!](/uploads/2018/12/PB250139.jpg) +Holiday Duck! + diff --git a/content/post/2018/12/trf-2018-photos-people.md b/content/post/2018/12/trf-2018-photos-people.md index 7056fd86..7eff5305 100644 --- a/content/post/2018/12/trf-2018-photos-people.md +++ b/content/post/2018/12/trf-2018-photos-people.md @@ -1,16 +1,24 @@ +++ date = "2018-12-05T12:15:36-07:00" -title = "'TRF 2018 Photos : People'" +title = "TRF 2018 Photos : People" slug = "trf-2018-photos-:-people" image = "/uploads/2018/12/PB250082.jpg" +categories = ["photos"] +series = ["TRF 2018"] +++ This is the first of a few posts on the photos from the second weekend we went to TRF. This time around, I brought my main camera and took more photos.  Lots more. -This is a few of the people pictures that I think turned out well.  There were some others I took, but I was not happy with the results.  Photographing people is not something I normally do, so it is an area I do need to explore and work on.
+This is a few of the people pictures that I think turned out well.  There were some others I took, but I was not happy with the results.  Photographing people is not something I normally do, so it is an area I do need to explore and work on. -
Through the Window
Hawker Looking
All Hail Cthulhu!
+![Through the Window](/uploads/2018/12/PB250082.jpg) +Through the Window + +![Hawker Looking](/uploads/2018/12/PB250104.jpg) +Hawker Looking + +![All Hail Cthulhu!](/uploads/2018/12/PB250233.jpg) +All Hail Cthulhu! -  diff --git a/content/post/2018/12/trf-2018-photos-water-lilies.md b/content/post/2018/12/trf-2018-photos-water-lilies.md index c3bcd06c..b57f6f32 100644 --- a/content/post/2018/12/trf-2018-photos-water-lilies.md +++ b/content/post/2018/12/trf-2018-photos-water-lilies.md @@ -1,18 +1,20 @@ +++ date = "2018-12-08T12:15:50-07:00" -title = "'TRF 2018 Photos : Water Lilies'" +title = "TRF 2018 Photos : Water Lilies" slug = "trf-2018-photos-:-water-lilies" image = "/uploads/2018/12/PB250259-1.jpg" +categories = ["photos"] +series = ["TRF 2018"] +++ Part two of my TRF Photos series. Today, Water Lilies from the Water Liley Garden. - +![/uploads/2018/12/PB250259-1.jpg](/uploads/2018/12/PB250259-1.jpg) - +![/uploads/2018/12/PB250253-1.jpg](/uploads/2018/12/PB250253-1.jpg) - +![/uploads/2018/12/PB250247-1.jpg](/uploads/2018/12/PB250247-1.jpg) - +![/uploads/2018/12/PB250243-1.jpg](/uploads/2018/12/PB250243-1.jpg) - +![/uploads/2018/12/PB250237-1.jpg](/uploads/2018/12/PB250237-1.jpg) diff --git a/themes/nederburg/layouts/_default/taxonomy.html b/themes/nederburg/layouts/_default/taxonomy.html index fa88ca2c..e69de29b 100644 --- a/themes/nederburg/layouts/_default/taxonomy.html +++ b/themes/nederburg/layouts/_default/taxonomy.html @@ -1 +0,0 @@ -Not today, bye! diff --git a/themes/nederburg/layouts/partials/series.html b/themes/nederburg/layouts/partials/series.html new file mode 100644 index 00000000..4f51fe58 --- /dev/null +++ b/themes/nederburg/layouts/partials/series.html @@ -0,0 +1,70 @@ +
+

+ Series: {{ .Title }} + {{ if .Site.Params.social.rss }} + + + rss + + {{ end }} +

+
+ +

Posts

+
+ {{ range $index, $element := (where .Data.Pages "Section" "post").ByDate.Reverse }} + {{ if and (isset .Params "image") .Params.image }} + {{ if eq (mod $index 2) 0 }} +
+ {{ else }} +
+ {{ end }} + {{ else }} + +
+ + {{ end }} + + {{ if and (isset .Params "image") .Params.image }} +
+ + {{ end }} + +
+
+ {{ .Date.Format "02 January 2006" }} / + + {{ if and (isset .Site.Params "author") .Site.Params.author }} + + + {{ if and (isset .Site.Params "authorlink") .Site.Params.authorLink }} + + {{ else }} + {{ .Site.Params.author | default "" }} + {{ end }} + + {{ end }} + + {{ range .Params.categories }} + / + + {{ . }} + + {{ end }} +
+
+

+ {{ .Title }} +

+
+
+ +
+
+
+ {{ end }} +
diff --git a/themes/nederburg/layouts/taxonomy/category.terms.html b/themes/nederburg/layouts/taxonomy/category.terms.html new file mode 100644 index 00000000..5727d268 --- /dev/null +++ b/themes/nederburg/layouts/taxonomy/category.terms.html @@ -0,0 +1,48 @@ + + + {{ partial "head.html" . }} + +
+ Skip to content + + +
+
+ {{ if .Site.Params.categoriesByCount }} + {{ $.Scratch.Set "categories" .Data.Terms.ByCount }} + {{ else }} + {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }} + {{ end }} +
    +
    +

    {{ i18n .Data.Plural }}

    +
    + {{ $data := .Data }} + {{ range $key, $value := $.Scratch.Get "categories" }} +
  • + +
    • + {{ end }} +
+
+ {{ $.Scratch.Set "showCategories" false }} +
+ {{ partial "scripts" . }} + + diff --git a/themes/nederburg/layouts/taxonomy/series.html b/themes/nederburg/layouts/taxonomy/series.html new file mode 100644 index 00000000..bedf23df --- /dev/null +++ b/themes/nederburg/layouts/taxonomy/series.html @@ -0,0 +1,26 @@ + + + {{ partial "head.html" . }} + + +
+ Skip to content + + +
+ + {{ partial "series.html" . }} +
+ + {{ partial "footer.html" . }} +
+ {{ partial "scripts.html" . }} + diff --git a/themes/nederburg/layouts/taxonomy/series.terms.html b/themes/nederburg/layouts/taxonomy/series.terms.html new file mode 100644 index 00000000..564ade69 --- /dev/null +++ b/themes/nederburg/layouts/taxonomy/series.terms.html @@ -0,0 +1,48 @@ + + + {{ partial "head.html" . }} + +
+ Skip to content + + +
+
+ {{ if .Site.Params.seriesByCount }} + {{ $.Scratch.Set "series" .Data.Terms.ByCount }} + {{ else }} + {{ $.Scratch.Set "series" .Data.Terms.Alphabetical }} + {{ end }} +
    +
    +

    {{ i18n .Data.Plural }}

    +
    + {{ $data := .Data }} + {{ range $key, $value := $.Scratch.Get "series" }} +
  • + +
    • + {{ end }} +
+
+ {{ $.Scratch.Set "showCategories" false }} +
+ {{ partial "scripts" . }} + + diff --git a/themes/nederburg/layouts/taxonomy/tag.terms.html b/themes/nederburg/layouts/taxonomy/tag.terms.html new file mode 100644 index 00000000..370cc1c5 --- /dev/null +++ b/themes/nederburg/layouts/taxonomy/tag.terms.html @@ -0,0 +1,48 @@ + + + {{ partial "head.html" . }} + +
+ Skip to content + + +
+
+ {{ if .Site.Params.tagsByCount }} + {{ $.Scratch.Set "tags" .Data.Terms.ByCount }} + {{ else }} + {{ $.Scratch.Set "tags" .Data.Terms.Alphabetical }} + {{ end }} +
    +
    +

    {{ i18n .Data.Plural }}

    +
    + {{ $data := .Data }} + {{ range $key, $value := $.Scratch.Get "tags" }} +
  • + +
    • + {{ end }} +
+
+ {{ $.Scratch.Set "showCategories" false }} +
+ {{ partial "scripts" . }} + +