commit 94d7804535e38c737658dca06fda209cc8c81daf parent 0a707292bde7f658868ccc3790fbd1648429de67 Author: breadcat <peter@minskio.co.uk> Date: Sun, 28 Jun 2020 13:00:32 +0100 Merge page and single layouts Using if statements, no less Diffstat:
107 files changed, 7 insertions(+), 110 deletions(-)
diff --git a/content/about/_index.md b/content/about/_index.md @@ -1,6 +1,6 @@ --- title: About -layout: page +layout: single --- Hi, my name's Peter. diff --git a/content/dreams/2019-03-09.md b/content/dreams/2019-03-09.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 1 dream: dated date: 2019-03-09 diff --git a/content/dreams/2019-03-10.md b/content/dreams/2019-03-10.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 2 dream: dated date: 2019-03-10 diff --git a/content/dreams/2019-03-12.md b/content/dreams/2019-03-12.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 3 dream: dated date: 2019-03-12 diff --git a/content/dreams/2019-03-19.md b/content/dreams/2019-03-19.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 4 dream: dated date: 2019-03-19 diff --git a/content/dreams/2019-03-26.md b/content/dreams/2019-03-26.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 5 dream: dated date: 2019-03-26 diff --git a/content/dreams/2019-06-10.md b/content/dreams/2019-06-10.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 6 dream: dated date: 2019-06-10 diff --git a/content/dreams/2019-06-14.md b/content/dreams/2019-06-14.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 7 dream: dated date: 2019-06-14 diff --git a/content/dreams/2019-07-19.md b/content/dreams/2019-07-19.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 8 dream: dated date: 2019-07-19 diff --git a/content/dreams/2019-10-21.md b/content/dreams/2019-10-21.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 9 dream: dated date: 2019-10-21 diff --git a/content/dreams/2020-01-20.md b/content/dreams/2020-01-20.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 10 dream: dated date: 2020-01-20 diff --git a/content/dreams/2020-01-28.md b/content/dreams/2020-01-28.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 11 dream: dated date: 2020-01-28 diff --git a/content/dreams/2020-01-31.md b/content/dreams/2020-01-31.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 12 dream: dated date: 2020-01-31 diff --git a/content/dreams/2020-03-22.md b/content/dreams/2020-03-22.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 13 dream: dated date: 2020-03-22 diff --git a/content/dreams/2020-05-02.md b/content/dreams/2020-05-02.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 14 dream: dated date: 2020-05-02 diff --git a/content/dreams/2020-05-10.md b/content/dreams/2020-05-10.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 15 dream: dated date: 2020-05-10 diff --git a/content/dreams/2020-05-12.md b/content/dreams/2020-05-12.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 16 dream: dated date: 2020-05-12 diff --git a/content/dreams/2020-05-16.md b/content/dreams/2020-05-16.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 17 dream: dated date: 2020-05-16 diff --git a/content/dreams/2020-06-02.md b/content/dreams/2020-06-02.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 18 dream: dated date: 2020-06-02 diff --git a/content/dreams/2020-06-13.md b/content/dreams/2020-06-13.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 19 dream: dated date: 2020-06-13 diff --git a/content/dreams/2020-06-14.md b/content/dreams/2020-06-14.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 20 dream: dated date: 2020-06-14 diff --git a/content/dreams/2020-06-18.md b/content/dreams/2020-06-18.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Dream 21 dream: dated date: 2020-06-18 diff --git a/content/dreams/archive-001.md b/content/dreams/archive-001.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 1 dream: undated --- diff --git a/content/dreams/archive-002.md b/content/dreams/archive-002.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 2 dream: undated --- diff --git a/content/dreams/archive-003.md b/content/dreams/archive-003.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 3 dream: undated --- diff --git a/content/dreams/archive-004.md b/content/dreams/archive-004.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 4 dream: undated --- diff --git a/content/dreams/archive-005.md b/content/dreams/archive-005.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 5 dream: undated --- diff --git a/content/dreams/archive-006.md b/content/dreams/archive-006.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 6 dream: undated --- diff --git a/content/dreams/archive-007.md b/content/dreams/archive-007.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 7 dream: undated --- diff --git a/content/dreams/archive-008.md b/content/dreams/archive-008.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 8 dream: undated --- diff --git a/content/dreams/archive-009.md b/content/dreams/archive-009.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 9 dream: undated --- diff --git a/content/dreams/archive-010.md b/content/dreams/archive-010.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 10 dream: undated --- diff --git a/content/dreams/archive-011.md b/content/dreams/archive-011.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 11 dream: undated --- diff --git a/content/dreams/archive-012.md b/content/dreams/archive-012.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 12 dream: undated --- diff --git a/content/dreams/archive-013.md b/content/dreams/archive-013.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 13 dream: undated --- diff --git a/content/dreams/archive-014.md b/content/dreams/archive-014.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 14 dream: undated --- diff --git a/content/dreams/archive-015.md b/content/dreams/archive-015.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 15 dream: undated --- diff --git a/content/dreams/archive-016.md b/content/dreams/archive-016.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 16 dream: undated --- diff --git a/content/dreams/archive-017.md b/content/dreams/archive-017.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 17 dream: undated --- diff --git a/content/dreams/archive-018.md b/content/dreams/archive-018.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 18 dream: undated --- diff --git a/content/dreams/archive-019.md b/content/dreams/archive-019.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 19 dream: undated --- diff --git a/content/dreams/archive-020.md b/content/dreams/archive-020.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 20 dream: undated --- diff --git a/content/dreams/archive-021.md b/content/dreams/archive-021.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 21 dream: undated --- diff --git a/content/dreams/archive-022.md b/content/dreams/archive-022.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 22 dream: undated --- diff --git a/content/dreams/archive-023.md b/content/dreams/archive-023.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 23 dream: undated --- diff --git a/content/dreams/archive-024.md b/content/dreams/archive-024.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 24 dream: undated --- diff --git a/content/dreams/archive-025.md b/content/dreams/archive-025.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 25 dream: undated --- diff --git a/content/dreams/archive-026.md b/content/dreams/archive-026.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 26 dream: undated --- diff --git a/content/dreams/archive-027.md b/content/dreams/archive-027.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 27 dream: undated --- diff --git a/content/dreams/archive-028.md b/content/dreams/archive-028.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 28 dream: undated --- diff --git a/content/dreams/archive-029.md b/content/dreams/archive-029.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 29 dream: undated --- diff --git a/content/dreams/archive-030.md b/content/dreams/archive-030.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 30 dream: undated --- diff --git a/content/dreams/archive-031.md b/content/dreams/archive-031.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 31 dream: undated --- diff --git a/content/dreams/archive-032.md b/content/dreams/archive-032.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 32 dream: undated --- diff --git a/content/dreams/archive-033.md b/content/dreams/archive-033.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 33 dream: undated --- diff --git a/content/dreams/archive-034.md b/content/dreams/archive-034.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 34 dream: undated --- diff --git a/content/dreams/archive-035.md b/content/dreams/archive-035.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 35 dream: undated --- diff --git a/content/dreams/archive-036.md b/content/dreams/archive-036.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 36 dream: undated --- diff --git a/content/dreams/archive-037.md b/content/dreams/archive-037.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 37 dream: undated --- diff --git a/content/dreams/archive-038.md b/content/dreams/archive-038.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 38 dream: undated --- diff --git a/content/dreams/archive-039.md b/content/dreams/archive-039.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 39 dream: undated --- diff --git a/content/dreams/archive-040.md b/content/dreams/archive-040.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 40 dream: undated --- diff --git a/content/dreams/archive-041.md b/content/dreams/archive-041.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 41 dream: undated --- diff --git a/content/dreams/archive-042.md b/content/dreams/archive-042.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 42 dream: undated --- diff --git a/content/dreams/archive-043.md b/content/dreams/archive-043.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 43 dream: undated --- diff --git a/content/dreams/archive-044.md b/content/dreams/archive-044.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 44 dream: undated --- diff --git a/content/dreams/archive-045.md b/content/dreams/archive-045.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 45 dream: undated --- diff --git a/content/dreams/archive-046.md b/content/dreams/archive-046.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 46 dream: undated --- diff --git a/content/dreams/archive-047.md b/content/dreams/archive-047.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 47 dream: undated --- diff --git a/content/dreams/archive-048.md b/content/dreams/archive-048.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 48 dream: undated --- diff --git a/content/dreams/archive-049.md b/content/dreams/archive-049.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 49 dream: undated --- diff --git a/content/dreams/archive-050.md b/content/dreams/archive-050.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 50 dream: undated --- diff --git a/content/dreams/archive-051.md b/content/dreams/archive-051.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 51 dream: undated --- diff --git a/content/dreams/archive-052.md b/content/dreams/archive-052.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 52 dream: undated --- diff --git a/content/dreams/archive-053.md b/content/dreams/archive-053.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 53 dream: undated --- diff --git a/content/dreams/archive-054.md b/content/dreams/archive-054.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 54 dream: undated --- diff --git a/content/dreams/archive-055.md b/content/dreams/archive-055.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 55 dream: undated --- diff --git a/content/dreams/archive-056.md b/content/dreams/archive-056.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 56 dream: undated --- diff --git a/content/dreams/archive-057.md b/content/dreams/archive-057.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 57 dream: undated --- diff --git a/content/dreams/archive-058.md b/content/dreams/archive-058.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 58 dream: undated --- diff --git a/content/dreams/archive-059.md b/content/dreams/archive-059.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 59 dream: undated --- diff --git a/content/dreams/archive-060.md b/content/dreams/archive-060.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 60 dream: undated --- diff --git a/content/dreams/archive-061.md b/content/dreams/archive-061.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 61 dream: undated --- diff --git a/content/dreams/archive-062.md b/content/dreams/archive-062.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 62 dream: undated --- diff --git a/content/dreams/archive-063.md b/content/dreams/archive-063.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 63 dream: undated --- diff --git a/content/dreams/archive-064.md b/content/dreams/archive-064.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 64 dream: undated --- diff --git a/content/dreams/archive-065.md b/content/dreams/archive-065.md @@ -1,5 +1,4 @@ --- -layout: page title: Untitled Archive Dream 65 dream: undated --- diff --git a/content/hardware/_index.md b/content/hardware/_index.md @@ -1,6 +1,6 @@ --- title: Hardware -layout: page +layout: single --- What powers the site and its associated clients diff --git a/content/quotes/_index.md b/content/quotes/_index.md @@ -1,6 +1,6 @@ --- title: Quotes -layout: page +layout: single --- Quotes I've found in and around the Internet, collected because they make me smile. Check the page source if you want to see some commented sources. diff --git a/content/reading-list/_index.md b/content/reading-list/_index.md @@ -1,6 +1,6 @@ --- title: Reading List -layout: page +layout: single --- I generally strive for a book per week, but this is by no means a steadfast goal. diff --git a/content/recipes/cheese-crisps.md b/content/recipes/cheese-crisps.md @@ -1,5 +1,4 @@ --- -layout: page title: Cheese Crisps recipe: snack --- diff --git a/content/recipes/cheesy-mushroom-soup.md b/content/recipes/cheesy-mushroom-soup.md @@ -1,5 +1,4 @@ --- -layout: page title: Cheesy Mushroom Soup recipe: meal --- diff --git a/content/recipes/chocolate-chip-cookies.md b/content/recipes/chocolate-chip-cookies.md @@ -1,5 +1,4 @@ --- -layout: page title: Chocolate Chip Cookies recipe: dessert --- diff --git a/content/recipes/chocolate-fudge-brownies.md b/content/recipes/chocolate-fudge-brownies.md @@ -1,5 +1,4 @@ --- -layout: page title: Chocolate Fudge Brownies recipe: dessert --- diff --git a/content/recipes/chocolate-mousse.md b/content/recipes/chocolate-mousse.md @@ -1,5 +1,4 @@ --- -layout: page title: Chocolate Mousse recipe: dessert --- diff --git a/content/recipes/coconut-flour-breadcakes.md b/content/recipes/coconut-flour-breadcakes.md @@ -1,5 +1,4 @@ --- -layout: page title: Coconut Flour Breadcakes recipe: bread --- diff --git a/content/recipes/coconut-flour-roti.md b/content/recipes/coconut-flour-roti.md @@ -1,5 +1,4 @@ --- -layout: page title: Coconut Flour Roti recipe: bread --- diff --git a/content/recipes/dauphinoise-courgette.md b/content/recipes/dauphinoise-courgette.md @@ -1,5 +1,4 @@ --- -layout: page title: Dauphinoise Courgette recipe: meal --- diff --git a/content/recipes/doner-kebab.md b/content/recipes/doner-kebab.md @@ -1,5 +1,4 @@ --- -layout: page title: Doner Kebab recipe: meal --- diff --git a/content/recipes/fathead-dough.md b/content/recipes/fathead-dough.md @@ -1,5 +1,4 @@ --- -layout: page title: Fathead Dough recipe: bread --- diff --git a/content/recipes/linseed-crisps.md b/content/recipes/linseed-crisps.md @@ -1,5 +1,4 @@ --- -layout: page title: Linseed Crisps recipe: snack --- diff --git a/content/recipes/mug-bread.md b/content/recipes/mug-bread.md @@ -1,5 +1,4 @@ --- -layout: page title: Mug Bread recipe: bread --- diff --git a/content/recipes/nuts-and-chocolate-fat-bombs.md b/content/recipes/nuts-and-chocolate-fat-bombs.md @@ -1,5 +1,4 @@ --- -layout: page title: Nuts and Chocolate Fat Bombs recipe: dessert --- diff --git a/content/recipes/spaghetti-carbonara.md b/content/recipes/spaghetti-carbonara.md @@ -1,5 +1,4 @@ --- -layout: page title: Spaghetti Carbonara recipe: meal --- diff --git a/content/status/_index.md b/content/status/_index.md @@ -1,6 +1,6 @@ --- title: Status -layout: page +layout: single --- *Generated on 2020-06-19 at 01:05* diff --git a/themes/Brine/layouts/_default/page.html b/themes/Brine/layouts/_default/page.html @@ -1,3 +0,0 @@ -{{ define "main" }} <h1>{{ .Title }}</h1> - <div>Reading time: {{ .ReadingTime }} min</div> - {{ .Content }}{{ end }} diff --git a/themes/Brine/layouts/_default/single.html b/themes/Brine/layouts/_default/single.html @@ -1,5 +1,5 @@ -{{ define "main" }} <h1>{{ .Title }}</h1> - <div>Published: {{ .PublishDate.Format "Jan 2, 2006" }}{{ if ne .Lastmod .PublishDate }}, last updated: {{ .Lastmod.Format "Jan 2, 2006" }}{{ end }}</div> +{{ define "main" }} <h1>{{ .Title }}</h1>{{ if .PublishDate }} + <div>Published: {{ .PublishDate.Format "Jan 2, 2006" }}{{ if ne .Lastmod .PublishDate }}, last updated: {{ .Lastmod.Format "Jan 2, 2006" }}{{ end }}</div>{{ end }} <div>Reading time: {{ .ReadingTime }} min</div>{{- with .Params.tags -}} <div>Tags: {{ range . -}}{{- with $.Site.GetPage (printf "/%s/%s" "tags" . ) -}}<a href="{{ .Permalink }}">{{ .Title }}</a> {{- end -}}{{- end -}}</div>{{- end -}} {{ .Content }}{{ end }}