themes/default/layouts/partials/function-page-modified: Add missing labelsHEADmaster

Use more convenient names and embed as source of truth

12 files changed, 42 insertions, 27 deletions

diff --git a/config/_default/config.json b/config/_default/config.json
index 1982cec..da099cd 100644
--- a/config/_default/config.json
+++ b/config/_default/config.json
@@ -185,22 +185,22 @@
         ],
         "labels": {
           "page": [
-            "baseof.html"
+            "index.html"
           ],
           "home": [
-            "baseof.html"
+            "index.html"
           ],
           "section": [
-            "baseof.html",
+            "index.html",
             "gallery.html",
             "webfeeds.html",
             "weblinks.html"
           ],
           "taxonomy": [
-            "baseof.html"
+            "index.html"
           ],
           "term": [
-            "baseof.html"
+            "index.html"
           ]
         }
       }
diff --git a/config/_default/config.toml b/config/_default/config.toml
index 48dab26..db7bad5 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -109,11 +109,11 @@ enableRobotsTXT = true
       types = ["page", "term", "tags"]
       authors = ["canory", "default", "nobody"]
       [params.segments.render.labels]
-        page = ["baseof.html"]
-        home = ["baseof.html"]
-        section = ["baseof.html", "gallery.html", "webfeeds.html", "weblinks.html"]
-        taxonomy = ["baseof.html"]
-        term = ["baseof.html"]
+        page = ["index.html"]
+        home = ["index.html"]
+        section = ["index.html", "gallery.html", "webfeeds.html", "weblinks.html"]
+        taxonomy = ["index.html"]
+        term = ["index.html"]
 
 [related]
   includeNewer = false
diff --git a/config/_default/config.yaml b/config/_default/config.yaml
index 990511e..39f2337 100644
--- a/config/_default/config.yaml
+++ b/config/_default/config.yaml
@@ -105,11 +105,11 @@ params:
       types: [page, term, tags]
       authors: [canory, default, nobody]
       labels:
-        page: [baseof.html]
-        home: [baseof.html]
-        section: [baseof.html, gallery.html, webfeeds.html, weblinks.html]
-        taxonomy: [baseof.html]
-        term: [baseof.html]
+        page: [index.html]
+        home: [index.html]
+        section: [index.html, gallery.html, webfeeds.html, weblinks.html]
+        taxonomy: [index.html]
+        term: [index.html]
 
 related:
   includeNewer: false
diff --git a/themes/default/layouts/_default/_markup/render-image.html b/themes/default/layouts/_default/_markup/render-image.html
index e44a5d3..a4aff88 100644
--- a/themes/default/layouts/_default/_markup/render-image.html
+++ b/themes/default/layouts/_default/_markup/render-image.html
@@ -1,10 +1,14 @@
+{{- $pageContext := . -}}
+{{- $format := "embed.html" -}}
+
 {{- $modified := partial "function-page-modified.html"
   (dict
-    "Context" .
+    "Context" $pageContext
+    "Label"   $format
+    "Format"  $format
   )
 -}}
 
-{{- $format := "embed.html" -}}
 {{- $page := print "public/" (strings.TrimPrefix .Page.Site.BaseURL .Page.Permalink) $format -}}
 
 {{- with $embed := resources.Get $page -}}
diff --git a/themes/default/layouts/_default/baseof.html b/themes/default/layouts/_default/baseof.html
index abd2bd0..1772529 100644
--- a/themes/default/layouts/_default/baseof.html
+++ b/themes/default/layouts/_default/baseof.html
@@ -1,7 +1,7 @@
 {{- $modified := partial "function-page-modified.html"
   (dict
     "Context" .
-    "Label" "baseof.html"
+    "Label" "index.html"
   )
 -}}
 
diff --git a/themes/default/layouts/_default/baseof.json b/themes/default/layouts/_default/baseof.json
index 6a9b2d9..0996896 100644
--- a/themes/default/layouts/_default/baseof.json
+++ b/themes/default/layouts/_default/baseof.json
@@ -1,6 +1,7 @@
 {{- $modified := partial "function-page-modified.html"
   (dict
     "Context" .
+    "Label" "index.json"
   )
 -}}
 
diff --git a/themes/default/layouts/_default/baseof.txt b/themes/default/layouts/_default/baseof.txt
index 63e47d5..1afcb09 100644
--- a/themes/default/layouts/_default/baseof.txt
+++ b/themes/default/layouts/_default/baseof.txt
@@ -2,6 +2,7 @@
   (dict
     "Context" .
      "Format" "index.txt"
+     "Label"  "index.txt"
   )
 -}}
 
diff --git a/themes/default/layouts/_default/baseof.xml b/themes/default/layouts/_default/baseof.xml
index f0a70c5..38af7d1 100644
--- a/themes/default/layouts/_default/baseof.xml
+++ b/themes/default/layouts/_default/baseof.xml
@@ -1,6 +1,7 @@
 {{- $modified := partial "function-page-modified.html"
   (dict
     "Context" .
+    "Label" "rss.xml"
   )
 -}}
 
diff --git a/themes/default/layouts/_default/single.embed.html b/themes/default/layouts/_default/single.embed.html
index 469b856..a56dca4 100644
--- a/themes/default/layouts/_default/single.embed.html
+++ b/themes/default/layouts/_default/single.embed.html
@@ -4,6 +4,7 @@
 {{- $modified := partial "function-page-modified.html"
   (dict
     "Context" $pageContext
+    "Label"   $format
     "Format"  $format
   )
 -}}
diff --git a/themes/default/layouts/_default/single.plain.txt b/themes/default/layouts/_default/single.plain.txt
index 94efa49..51e002a 100644
--- a/themes/default/layouts/_default/single.plain.txt
+++ b/themes/default/layouts/_default/single.plain.txt
@@ -3,6 +3,7 @@
     (dict
       "Context" .
       "Format"  "index.txt"
+      "Label"   "index.txt"
     )
   -}}
   {{- if $modified -}}
diff --git a/themes/default/layouts/partials/function-page-modified.html b/themes/default/layouts/partials/function-page-modified.html
index 1c50291..de6138b 100644
--- a/themes/default/layouts/partials/function-page-modified.html
+++ b/themes/default/layouts/partials/function-page-modified.html
@@ -40,6 +40,8 @@
 
 {{- if or
   (not (isset $segments.render "labels"))
+  (and (in $segments.render.kinds "page")     (in $segments.render.labels.page     "embed.html")  (in "page"     $pageContext.Page.Kind) (in (slice "embed.html") $label))
+  (and (in $segments.render.kinds "page")     (in $segments.render.labels.page     "index.txt")   (in "page"     $pageContext.Page.Kind) (in (slice "index.txt")  $label))
   (and (in $segments.render.kinds "page")     (in $segments.render.labels.page     "baseof.html") (in "page"     $pageContext.Page.Kind) (in (slice "baseof.html") $label))
   (and (in $segments.render.kinds "home")     (in $segments.render.labels.home     "baseof.html") (in "home"     $pageContext.Page.Kind) (in (slice "baseof.html") $label))
 
@@ -75,15 +77,19 @@
   {{- end -}}
 {{- end -}}
 
-{{- if (and (in $segments.render.debug true) (in $segments.render.debug false)) -}}
-    {{- warnf "%b %s %s %s %s" $modified $pageContext.Page.Kind $label $pageContext.Page.Type $page -}}
-{{- else -}}
-  {{- if (and ($modified) (in $segments.render.debug true)) -}}
-    {{- warnf "%b %s %s %s %s" $modified $pageContext.Page.Kind $label $pageContext.Page.Type $page -}}
-  {{- end -}}
-  {{- if (and (not $modified) (in $segments.render.debug false)) -}}
-    {{- warnf "%b %s %s %s %s" $modified $pageContext.Page.Kind $label $pageContext.Page.Type $page -}}
+{{- with fileExists $page -}}
+  {{- if (and (in $segments.render.debug true) (in $segments.render.debug false)) -}}
+      {{- warnf "%b %s %s %s %s" $modified $pageContext.Page.Kind $label $pageContext.Page.Type $page -}}
+  {{- else -}}
+    {{- if (and ($modified) (in $segments.render.debug true)) -}}
+      {{- warnf "%b %s %s %s %s" $modified $pageContext.Page.Kind $label $pageContext.Page.Type $page -}}
+    {{- end -}}
+    {{- if (and (not $modified) (in $segments.render.debug false)) -}}
+      {{- warnf "%b %s %s %s %s" $modified $pageContext.Page.Kind $label $pageContext.Page.Type $page -}}
+    {{- end -}}
   {{- end -}}
+{{- else -}}
+  {{- warnf "missing %s" $page -}}
 {{- end -}}
 
 {{- return $modified -}}
diff --git a/themes/default/layouts/partials/render-embed.html b/themes/default/layouts/partials/render-embed.html
index 6971584..2b48ec4 100644
--- a/themes/default/layouts/partials/render-embed.html
+++ b/themes/default/layouts/partials/render-embed.html
@@ -1,11 +1,11 @@
 {{- $pageContext := . -}}
 {{- $format := "embed.html" -}}
 
-
 {{- $modified := partial "function-page-modified.html"
   (dict
     "Context" $pageContext
     "Format"  $format
+    "Label"   $format
   )
 -}}