static/js: Add relative dates

5 files changed, 20 insertions, 22 deletions

diff --git a/themes/default/layouts/partials/card-meta.html b/themes/default/layouts/partials/card-meta.html
index 83e8052..f7da69a 100644
--- a/themes/default/layouts/partials/card-meta.html
+++ b/themes/default/layouts/partials/card-meta.html
@@ -27,7 +27,7 @@
 
   {{- partial "meta-handle.html" . -}}
 
-  {{- partial "meta-draft.html" . -}}
+  {{- partial "meta-date-time.html" . -}}
 
   {{- partial "meta-read-time.html" . -}}
 
@@ -35,11 +35,11 @@
 
   {{- partial "meta-unlisted.html" . -}}
 
-  {{- partial "meta-date-time.html" . -}}
-
   {{- partial "meta-expiry-date.html" . -}}
 
   {{- partial "meta-link.html" . -}}
 
   {{- partial "meta-source.html" . -}}
+
+  {{- partial "meta-draft.html" . -}}
 </section>
diff --git a/themes/default/layouts/partials/meta-date-time.html b/themes/default/layouts/partials/meta-date-time.html
index 60e6d1c..f1e49d0 100644
--- a/themes/default/layouts/partials/meta-date-time.html
+++ b/themes/default/layouts/partials/meta-date-time.html
@@ -12,10 +12,10 @@
       title="{{ .Date | time.Format "Posted: Monday, January 2, 2006 at 15:04:05 MST" }}
 {{ if .Lastmod.After .Date }}{{ .Lastmod | time.Format "Edited: Monday, January 2, 2006 at 15:04:05 MST" }}{{ end }}">
       {{ (.Date.Local | time.Format "3:04 PM Jan 2 2006") -}}
-      {{ if .Lastmod.After .Date }}
-        (edited)
-      {{- end -}}
     </time>
+    {{ if .Lastmod.After .Date }}
+      <span>(edited)</span>
+    {{- end -}}
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
   </a>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/meta-expiry-date.html b/themes/default/layouts/partials/meta-expiry-date.html
index a4ddeea..0521e60 100644
--- a/themes/default/layouts/partials/meta-expiry-date.html
+++ b/themes/default/layouts/partials/meta-expiry-date.html
@@ -3,10 +3,10 @@
   {{- $duration := lang.FormatNumberCustom 0 (math.Round (mul (div $diff.Hours 24) -1)) -}}
 
   <micro-metadata-expiry>
+    {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/trash-2.svg")) -}}
     <time
       datetime= "{{- .ExpiryDate | time.Format "2006-01-02T15:04:05Z" -}}"
       title="Self destructs within {{ $duration }} days ({{ .ExpiryDate | time.Format "Monday, January 2 2006 at 15:04:05 MST" }})">
-      {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/trash-2.svg")) -}}
       {{- .ExpiryDate | time.Format "Jan 2 2006" -}}
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
     </time>
diff --git a/themes/default/layouts/partials/meta-read-time.html b/themes/default/layouts/partials/meta-read-time.html
index 2a5e395..bc32f41 100644
--- a/themes/default/layouts/partials/meta-read-time.html
+++ b/themes/default/layouts/partials/meta-read-time.html
@@ -1,17 +1,12 @@
-<micro-metadata-readtime>
-  {{- $seconds := mul (div .WordCount 180.0) 60.0 -}}
-  {{- $seconds = printf "%.0f" $seconds -}}
-
-  {{- if eq $seconds "0" -}}
-    {{- $seconds = "1" -}}
-  {{- end -}}
+{{- $seconds := mul (div .WordCount 180.0) 60.0 -}}
+{{- $seconds = printf "%.0f" $seconds -}}
+{{- if eq $seconds "0" -}}
+  {{- $seconds = "1" -}}
+{{- end -}}
 
+<micro-metadata-readtime>
   {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/clock.svg")) -}}
-
-  <read-time title="Takes {{ $seconds }} second{{- if not (eq $seconds "1") -}}s{{- end }} to read">
-    {{ $seconds }} sec
-{{- /* This comment removes trailing newlines and white spaces. */ -}}
-  </read-time>
+  <read-time title="Takes {{ $seconds }} second{{- if not (eq $seconds "1") -}}s{{- end }} to read">{{ $seconds }} sec</read-time>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
 </micro-metadata-readtime>
 {{- /* This comment removes trailing newlines and white spaces. */ -}}
diff --git a/themes/default/layouts/partials/meta-source.html b/themes/default/layouts/partials/meta-source.html
index ca6450c..4a1dbc6 100644
--- a/themes/default/layouts/partials/meta-source.html
+++ b/themes/default/layouts/partials/meta-source.html
@@ -1,9 +1,9 @@
 {{- if not .ExpiryDate -}}
+{{- $author := index .Site.Data ((or .Params.author .Site.Author.default.user) | default "default") -}}
+{{- $source := print $author.user "/messages/" .File.LogicalName -}}
+
   <micro-metadata-source>
-    {{- $author := index .Site.Data ((or .Params.author .Site.Author.default.user) | default "default") -}}
-    {{- $source := print $author.user "/messages/" .File.LogicalName -}}
     {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/code.svg")) -}}
-
     <cite>
       {{- with .Params.feed.raw -}}
       <a title="{{ $.Site.BaseURL }}/{{ . }}" href="{{ $.Site.BaseURL }}/{{ . }}">
@@ -13,7 +13,10 @@
         title="{{ .Site.BaseURL }}/{{ partial "function-paths.html" "markdown" }}/{{ $source }}">
       {{- end -}}
         raw
+{{- /* This comment removes trailing newlines and white spaces. */ -}}
       </a>
+{{- /* This comment removes trailing newlines and white spaces. */ -}}
     </cite>
+{{- /* This comment removes trailing newlines and white spaces. */ -}}
   </micro-metadata-source>
 {{- end -}}