themes/default/layouts/partials/function-content: Collect content

Ensure that content is congruent across all output types.
Set default state for when content is empty.

5 files changed, 23 insertions, 8 deletions

diff --git a/assets/css/default.css b/assets/css/default.css
index c71291c..16887d3 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -763,7 +763,7 @@ micro-metadata-anchored {
   color: #111;
   color: var(--foreground);
   display: flex;
-  margin-bottom: 0.5rem;
+  margin-bottom: 0.25rem;
   margin-top: -0.5rem;
   width: 100%;
 }
diff --git a/themes/default/layouts/_default/rss.xml b/themes/default/layouts/_default/rss.xml
index a09f9bf..17334bf 100644
--- a/themes/default/layouts/_default/rss.xml
+++ b/themes/default/layouts/_default/rss.xml
@@ -32,7 +32,7 @@
         <link>{{ .Permalink }}</link>
         <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
         <guid>{{ .Permalink }}</guid>
-        <description>{{ .Content | html }}</description>
+        <description>{{ partial "function-content.html" .Content | html }}</description>
       </item>
       {{ end }}
     {{ end }}
diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html
index 44619f3..dcbb501 100644
--- a/themes/default/layouts/_default/summary.html
+++ b/themes/default/layouts/_default/summary.html
@@ -18,12 +18,7 @@
             </details>
             <micro-unsafe-content>
           {{ end }}
-            {{-
-              .Content |
-               replaceRE "<p>\n<figure>" "<figure>" |
-               replaceRE "</figure></p>" "</figure>" |
-               safeHTML
-            -}}
+            {{- partial "function-content.html" .Content | safeHTML -}}
           {{ if .Params.unsafe }}
             </micro-unsafe-content>
             </micro-unsafe>
diff --git a/themes/default/layouts/partials/function-content.html b/themes/default/layouts/partials/function-content.html
new file mode 100644
index 0000000..be33ba0
--- /dev/null
+++ b/themes/default/layouts/partials/function-content.html
@@ -0,0 +1,14 @@
+{{- $content := . -}}
+
+{{-
+  $content = $content |
+    replaceRE "<p><figure>"   "<figure>"  |
+    replaceRE "<p>\n<figure>" "<figure>"  |
+    replaceRE "</figure></p>" "</figure>" |
+-}}
+
+{{- if eq (len $content) 0 -}}
+ {{- $content = partial "function-strings.html" "messageNoContent" -}}
+{{- end -}}
+
+{{- return $content -}}
diff --git a/themes/default/layouts/partials/function-strings.html b/themes/default/layouts/partials/function-strings.html
new file mode 100644
index 0000000..37de01a
--- /dev/null
+++ b/themes/default/layouts/partials/function-strings.html
@@ -0,0 +1,6 @@
+{{- $string := . -}}
+
+{{- if eq $string "messageExpired" -}}   {{- $string = "This message has expired." -}}         {{- end -}}
+{{- if eq $string "messageNoContent" -}} {{- $string = "This message contains no content." -}} {{- end -}}
+
+{{- return $string -}}