diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/default/layouts/_default/index.json | 2 | ||||
-rw-r--r-- | themes/default/layouts/_default/rss.xml | 2 | ||||
-rw-r--r-- | themes/default/layouts/_default/single.plain.txt | 2 | ||||
-rw-r--r-- | themes/default/layouts/_default/summary.html | 6 | ||||
-rw-r--r-- | themes/default/layouts/partials/function-content.html | 13 | ||||
-rw-r--r-- | themes/default/layouts/partials/function-strings.html | 6 | ||||
-rw-r--r-- | themes/default/layouts/partials/meta-expiry-date.html | 8 | ||||
-rw-r--r-- | themes/default/layouts/shortcodes/version.html | 2 |
8 files changed, 25 insertions, 16 deletions
diff --git a/themes/default/layouts/_default/index.json b/themes/default/layouts/_default/index.json index 1e672fd..86be455 100644 --- a/themes/default/layouts/_default/index.json +++ b/themes/default/layouts/_default/index.json @@ -32,7 +32,7 @@ {{- end -}} ], "content_text": {{ $data.Plain | jsonify }}, - "content_html": {{ partial "function-content.html" $data.Content | jsonify }} + "content_html": {{ partial "function-content.html" $data | jsonify }} } {{- end -}} {{ end }} diff --git a/themes/default/layouts/_default/rss.xml b/themes/default/layouts/_default/rss.xml index beda119..3eee035 100644 --- a/themes/default/layouts/_default/rss.xml +++ b/themes/default/layouts/_default/rss.xml @@ -75,7 +75,7 @@ <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate> <guid>{{ .Permalink }}</guid> <description> - {{- partial "function-content.html" .Content | html -}} + {{- partial "function-content.html" . | html -}} {{- print "<br>" | html -}} {{- partial "rss-tags.html" . | html -}} </description> diff --git a/themes/default/layouts/_default/single.plain.txt b/themes/default/layouts/_default/single.plain.txt index d110b5e..6b97968 100644 --- a/themes/default/layouts/_default/single.plain.txt +++ b/themes/default/layouts/_default/single.plain.txt @@ -1 +1 @@ -{{- .Content | plainify | htmlUnescape -}} +{{- partial "function-content.html" . | plainify | htmlUnescape -}} diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html index e1e6f73..356d0d9 100644 --- a/themes/default/layouts/_default/summary.html +++ b/themes/default/layouts/_default/summary.html @@ -1,5 +1,7 @@ -{{- $limit := gt .WordCount 75 -}} -{{- $content := partial "function-content.html" .Content | safeHTML -}} +{{- $wordLimit := gt .WordCount 75 -}} +{{- $content := partial "function-content.html" . | safeHTML -}} +{{- $expired := and .ExpiryDate (ge now.Unix .ExpiryDate.Unix) -}} +{{- $limit := and $wordLimit (not $expired) -}} {{- if $limit -}} <input hidden type="checkbox" id="expand-{{ partial "card-id.html" . }}" /> diff --git a/themes/default/layouts/partials/function-content.html b/themes/default/layouts/partials/function-content.html index be33ba0..de68946 100644 --- a/themes/default/layouts/partials/function-content.html +++ b/themes/default/layouts/partials/function-content.html @@ -1,4 +1,7 @@ -{{- $content := . -}} +{{- $context := . -}} +{{- $content := $context.Content -}} +{{- $expired := and .ExpiryDate (ge now.Unix .ExpiryDate.Unix) -}} +{{- $empty := eq (len $content) 0 -}} {{- $content = $content | @@ -7,8 +10,12 @@ replaceRE "</figure></p>" "</figure>" | -}} -{{- if eq (len $content) 0 -}} - {{- $content = partial "function-strings.html" "messageNoContent" -}} +{{- if $empty -}} + {{- $content = "This message contains no content." -}} +{{- end -}} + +{{- if $expired -}} + {{- $content = "This message has expired." -}} {{- end -}} {{- return $content -}} diff --git a/themes/default/layouts/partials/function-strings.html b/themes/default/layouts/partials/function-strings.html deleted file mode 100644 index 37de01a..0000000 --- a/themes/default/layouts/partials/function-strings.html +++ /dev/null @@ -1,6 +0,0 @@ -{{- $string := . -}} - -{{- if eq $string "messageExpired" -}} {{- $string = "This message has expired." -}} {{- end -}} -{{- if eq $string "messageNoContent" -}} {{- $string = "This message contains no content." -}} {{- end -}} - -{{- return $string -}} diff --git a/themes/default/layouts/partials/meta-expiry-date.html b/themes/default/layouts/partials/meta-expiry-date.html index e2c4838..62f01da 100644 --- a/themes/default/layouts/partials/meta-expiry-date.html +++ b/themes/default/layouts/partials/meta-expiry-date.html @@ -1,9 +1,15 @@ {{- if .ExpiryDate -}} + {{- $expired := and .ExpiryDate (ge now.Unix .ExpiryDate.Unix) -}} {{- $diff := now.Sub .ExpiryDate -}} {{- $duration := lang.FormatNumberCustom 0 (math.Round (mul (div $diff.Hours 24) -1)) -}} + {{- $date := .ExpiryDate | time.Format "Monday, January 2 2006 at 15:04:05 MST" -}} + {{- $title := print "Self destructs within" " " $duration " " "days" " " "(" $date ")" -}} + {{- if $expired -}} + {{- $title = print "Self destructed" " " $date -}} + {{- end -}} <micro-metadata-expiry - title="Self destructs within {{ $duration }} days ({{ .ExpiryDate | time.Format "Monday, January 2 2006 at 15:04:05 MST" }})"> + title="{{ $title }}"> {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/trash-2.svg")) -}} <time datetime= "{{- .ExpiryDate | time.Format "2006-01-02T15:04:05Z" -}}"> {{- .ExpiryDate | time.Format "Jan 2 2006" -}} diff --git a/themes/default/layouts/shortcodes/version.html b/themes/default/layouts/shortcodes/version.html index 3c3f173..10e29c5 100644 --- a/themes/default/layouts/shortcodes/version.html +++ b/themes/default/layouts/shortcodes/version.html @@ -1,4 +1,4 @@ -{{- $version := "0.11.4" -}} +{{- $version := "0.11.5" -}} {{- $number := default false (.Get "number" | default (.Get 0)) -}} {{- $clone := default false (.Get "clone" | default (.Get 1)) -}} |