diff --git a/layouts/_default/list.archivehtml.html b/layouts/_default/list.archivehtml.html index 90d9b65..7384756 100644 --- a/layouts/_default/list.archivehtml.html +++ b/layouts/_default/list.archivehtml.html @@ -18,7 +18,7 @@ {{ if .Title }} {{ .Title }} {{ end }} - {{ .Summary | truncate 100 }} + {{ .Summary | plainify | htmlUnescape | truncate 100 }}

{{ end }} diff --git a/layouts/_default/list.json.json b/layouts/_default/list.json.json index a0fea3b..c3ddf00 100644 --- a/layouts/_default/list.json.json +++ b/layouts/_default/list.json.json @@ -1,7 +1,7 @@ { "version": "https://jsonfeed.org/version/1", "title": {{ if eq .Title .Site.Title }}{{ .Site.Title | jsonify }}{{ else }}{{ printf `%s on %s` .Title .Site.Title | jsonify }}{{ end }}, - "icon": "{{ .Site.Author.avatar }}", + "icon": "{{ .Site.Params.author.avatar }}", "home_page_url": "{{ .Site.BaseURL }}", "feed_url": "{{ .Site.BaseURL }}feed.json", "items": [ diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 245f835..9e0e677 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -12,7 +12,7 @@ {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ with .Site.Params.author.email }}{{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}}{{end}} {{- if .Params.guid }} {{ .Params.guid }} {{- else -}} diff --git a/layouts/index.json b/layouts/index.json index 478be43..e30c605 100644 --- a/layouts/index.json +++ b/layouts/index.json @@ -1,7 +1,7 @@ { "version": "https://jsonfeed.org/version/1", "title": {{ .Site.Title | jsonify }}, - "icon": "{{ .Site.Author.avatar }}", + "icon": "{{ .Site.Params.author.avatar }}", "home_page_url": "{{ .Site.BaseURL }}", "feed_url": "{{ .Site.BaseURL }}feed.json", "items": [ @@ -22,7 +22,7 @@ {{- $s := replace $s "\\u003e" ">" -}} {{- $s := replace $s "\\u0026" "&" }} "content_html": {{ $s }}, - {{ if .Params.custom_summary }}"summary": {{ .Summary | plainify | jsonify }},{{ end }} + {{ if .Params.custom_summary }}"summary": {{ .Summary | plainify | htmlUnescape | jsonify }},{{ end }} "date_published": "{{ .Date.Format "2006-01-02T15:04:05-07:00" }}", "url": "{{ .Permalink }}" {{- with .Params.categories -}} diff --git a/layouts/index.xml b/layouts/index.xml index 1927728..c7e0d91 100644 --- a/layouts/index.xml +++ b/layouts/index.xml @@ -13,7 +13,7 @@ {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ with .Site.Params.author.email }}{{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}}{{end}} {{- if .Params.guid }} {{ .Params.guid }} {{- else -}} diff --git a/layouts/list.archivehtml.html b/layouts/list.archivehtml.html index 90d9b65..7384756 100644 --- a/layouts/list.archivehtml.html +++ b/layouts/list.archivehtml.html @@ -18,7 +18,7 @@ {{ if .Title }} {{ .Title }} {{ end }} - {{ .Summary | truncate 100 }} + {{ .Summary | plainify | htmlUnescape | truncate 100 }}

{{ end }} diff --git a/layouts/list.archivejson.json b/layouts/list.archivejson.json index 970300d..688e481 100644 --- a/layouts/list.archivejson.json +++ b/layouts/list.archivejson.json @@ -1,7 +1,7 @@ { "version": "https://jsonfeed.org/version/1", "title": {{ .Site.Title | jsonify }}, - "icon": "{{ .Site.Author.avatar }}", + "icon": "{{ .Site.Params.author.avatar }}", "home_page_url": "{{ .Site.BaseURL }}", "feed_url": "{{ .Site.BaseURL }}photos/index.json", "items": [ @@ -11,7 +11,7 @@ { "id": "{{ .Permalink }}", "title": {{ .Title | jsonify }}, - "content_text": {{ .Summary | truncate 100 | jsonify }}, + "content_text": {{ .Summary | plainify | htmlUnescape | truncate 100 | jsonify }}, "date_published": "{{ .Date.Format "2006-01-02T15:04:05-07:00" }}", "url": "{{ .Permalink }}" } diff --git a/layouts/list.photosjson.json b/layouts/list.photosjson.json index c1a4665..247efce 100644 --- a/layouts/list.photosjson.json +++ b/layouts/list.photosjson.json @@ -1,7 +1,7 @@ { "version": "https://jsonfeed.org/version/1", "title": {{ .Site.Title | jsonify }}, - "icon": "{{ .Site.Author.avatar }}", + "icon": "{{ .Site.Params.author.avatar }}", "home_page_url": "{{ .Site.BaseURL }}", "feed_url": "{{ .Site.BaseURL }}photos/index.json", "items": [ diff --git a/layouts/list.podcastjson.json b/layouts/list.podcastjson.json index de06b07..d488e71 100644 --- a/layouts/list.podcastjson.json +++ b/layouts/list.podcastjson.json @@ -1,7 +1,7 @@ { "version": "https://jsonfeed.org/version/1", "title": {{ .Site.Title | jsonify }}, - "icon": "{{ .Site.Author.avatar }}", + "icon": "{{ .Site.Params.author.avatar }}", "home_page_url": "{{ .Site.BaseURL }}", "feed_url": "{{ .Site.BaseURL }}podcast.json", "_podcast": { diff --git a/layouts/list.podcastxml.xml b/layouts/list.podcastxml.xml index 15c3b2e..23b782f 100644 --- a/layouts/list.podcastxml.xml +++ b/layouts/list.podcastxml.xml @@ -26,7 +26,7 @@ {{ .Title | htmlEscape }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{ . | htmlEscape}}{{ with $.Site.Author.name }} ({{ . | htmlEscape}}){{end}}{{end}} + {{ with .Site.Params.author.email }}{{ . | htmlEscape}}{{ with $.Site.Params.author.name }} ({{ . | htmlEscape}}){{end}}{{end}} {{ .Permalink }} {{ range first 1 .Params.audio_with_metadata }} diff --git a/layouts/newsletter.html b/layouts/newsletter.html index 0632525..02e2c78 100644 --- a/layouts/newsletter.html +++ b/layouts/newsletter.html @@ -14,7 +14,7 @@

- Profile icon + Profile icon {{ .Site.Title }} — Unsubscribe diff --git a/layouts/partials/microblog_head.html b/layouts/partials/microblog_head.html index b3ed062..865e4f5 100644 --- a/layouts/partials/microblog_head.html +++ b/layouts/partials/microblog_head.html @@ -26,6 +26,30 @@ {{ end }} +{{ if .Site.Params.opengraph_is_enabled }} + {{ if .IsHome }} + + + + {{ else }} + + + {{ if .Params.photos }} + {{- range .Params.photos -}} + + {{- end -}} + {{ else }} + {{ with .Params.opengraph.image }} + + {{ end }} + {{ end }} + {{- end -}} + + + + +{{ end }} +