{{ . }}
{{ end }} -
- {{ include "summaryandpostmeta" . }}
- {{ $translations := (translations .Data) }}
- {{ if gt (len $translations) 0 }}
-
+ {{ postmeta .Data .Blog "post" }}
{{ string .Blog.Lang "translations" }}: {{ $delimiter := "" }}{{ range $i, $t := $translations }}{{ $delimiter }}{{ $t.RenderedTitle }}{{ $delimiter = ", " }}{{ end }}
- {{ end }}
- {{ $short := shorturl .Data }}
- {{ if $short }}{{ string .Blog.Lang "shorturl" }} {{ $short }}
{{ end }}
- {{ if ne .Data.Status "published" }}{{ string .Blog.Lang "status" }}: {{ .Data.Status }}
{{ end }}
-
{{ string .Blog.Lang "share" }}
{{ string .Blog.Lang "translate" }}
diff --git a/templates/postheadmeta.gohtml b/templates/postheadmeta.gohtml
deleted file mode 100644
index 233a88a..0000000
--- a/templates/postheadmeta.gohtml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{ define "postheadmeta" }}
- {{ with .Canonical }}
-
-
- {{ end }}
- {{ with .Data.RenderedTitle }}
-
-
- {{ end }}
- {{ with summary .Data }}
-
-
-
- {{ end }}
- {{ $ISO8601 := "2006-01-02T15:04:05-07:00" }}
- {{ with .Data.Published }}
-
- {{ end }}
- {{ with .Data.Updated }}
-
- {{ end }}
- {{ range $key, $image := photolinks .Data }}
-
-
-
- {{ end }}
-{{ end }}
\ No newline at end of file
diff --git a/templates/statichome.gohtml b/templates/statichome.gohtml
index 064152b..e097cc4 100644
--- a/templates/statichome.gohtml
+++ b/templates/statichome.gohtml
@@ -1,6 +1,6 @@
{{ define "title" }}
{{ mdtitle .Blog.Title }}
- {{ include "postheadmeta" . }}
+ {{ postheadmeta .Data .Canonical }}
{{ end }}
{{ define "main" }}
diff --git a/templates/summary.gohtml b/templates/summary.gohtml
index ddb3fe9..2b030e3 100644
--- a/templates/summary.gohtml
+++ b/templates/summary.gohtml
@@ -8,7 +8,7 @@
{{ end }}
- {{ include "summarymeta" . }}
+ {{ postmeta .Data .Blog "summary" }}
{{ if showfull .Data }}
{{ content .Data false }}
{{ else }}
diff --git a/templates/summaryandpostmeta.gohtml b/templates/summaryandpostmeta.gohtml
deleted file mode 100644
index f77b1ab..0000000
--- a/templates/summaryandpostmeta.gohtml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{ define "summaryandpostmeta" }}
- {{ $section := (index .Blog.Sections .Data.Section) }}
- {{ if .Data.Published }}{{ string .Blog.Lang "publishedon" }} {{ if $section }} in {{ mdtitle $section.Title }}{{ end }}
{{ end }}
- {{ if .Data.Updated }}{{ string .Blog.Lang "updatedon" }}
{{ end }}
- {{ if replylink .Data }}
- {{ string .Blog.Lang "replyto" }}: {{ with (replytitle .Data) }}{{ . }}{{ else }}{{ replylink .Data }}{{ end }}
- {{ end }}
- {{ if likelink .Data }}
- {{ string .Blog.Lang "likeof" }}: {{ with (liketitle .Data) }}{{ . }}{{ else }}{{ likelink .Data }}{{ end }}
- {{ end }}
- {{ $geo := geouri .Data }}
- {{ if $geo }}
-
- {{ end }}
-{{ end }}
\ No newline at end of file
diff --git a/templates/summarymeta.gohtml b/templates/summarymeta.gohtml
deleted file mode 100644
index 30f91c9..0000000
--- a/templates/summarymeta.gohtml
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ define "summarymeta" }}
-
- {{ include "summaryandpostmeta" . }}
-
-{{ end }}
\ No newline at end of file
diff --git a/ui.go b/ui.go
index f4e6d74..7478525 100644
--- a/ui.go
+++ b/ui.go
@@ -50,12 +50,27 @@ func (h *htmlBuilder) html() template.HTML {
return template.HTML(h.String())
}
-// Render the HTML to show the list of post taxonomy values (tags, series, etc.)
-func (a *goBlog) renderPostTax(p *post, b *configBlog) template.HTML {
- if b == nil || p == nil {
- return ""
+// Render the HTML for the editor preview
+func (a *goBlog) renderEditorPreview(hb *htmlBuilder, bc *configBlog, p *post) {
+ if p.RenderedTitle != "" {
+ hb.writeElementOpen("h1")
+ hb.writeEscaped(p.RenderedTitle)
+ hb.writeElementClose("h1")
+ }
+ a.renderPostMeta(hb, p, bc, "preview")
+ if p.Content != "" {
+ hb.writeElementOpen("div")
+ hb.write(string(a.postHtml(p, true)))
+ hb.writeElementClose("div")
+ }
+ a.renderPostTax(hb, p, bc)
+}
+
+// Render the HTML to show the list of post taxonomy values (tags, series, etc.)
+func (a *goBlog) renderPostTax(hb *htmlBuilder, p *post, b *configBlog) {
+ if b == nil || p == nil {
+ return
}
- var hb htmlBuilder
// Iterate over all taxonomies
for _, tax := range b.Taxonomies {
// Get all sorted taxonomy values for this post
@@ -85,27 +100,145 @@ func (a *goBlog) renderPostTax(p *post, b *configBlog) template.HTML {
hb.writeElementClose("p")
}
}
- return hb.html()
+}
+
+// Render the HTML for the post meta information.
+// typ can be "summary", "post" or "preview".
+func (a *goBlog) renderPostMeta(hb *htmlBuilder, p *post, b *configBlog, typ string) {
+ if b == nil || p == nil || typ != "summary" && typ != "post" && typ != "preview" {
+ return
+ }
+ if typ == "summary" || typ == "post" {
+ hb.writeElementOpen("div", "class", "p")
+ }
+ // Published time
+ if published := p.Published; published != "" {
+ hb.writeElementOpen("div")
+ hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "publishedon"))
+ hb.write(" ")
+ hb.writeElementOpen("time", "class", "dt-published", "datetime", dateFormat(published, "2006-01-02T15:04:05Z07:00"))
+ hb.writeEscaped(isoDateFormat(published))
+ hb.writeElementClose("time")
+ // Section
+ if p.Section != "" {
+ if section := b.Sections[p.Section]; section != nil {
+ hb.write(" in ") // TODO: Replace with a proper translation
+ hb.writeElementOpen("a", "href", b.getRelativePath(section.Name))
+ hb.writeEscaped(a.renderMdTitle(section.Title))
+ hb.writeElementClose("a")
+ }
+ }
+ hb.writeElementClose("div")
+ }
+ // Updated time
+ if updated := p.Updated; updated != "" {
+ hb.writeElementOpen("div")
+ hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "updatedon"))
+ hb.write(" ")
+ hb.writeElementOpen("time", "class", "dt-updated", "datetime", dateFormat(updated, "2006-01-02T15:04:05Z07:00"))
+ hb.writeEscaped(isoDateFormat(updated))
+ hb.writeElementClose("time")
+ hb.writeElementClose("div")
+ }
+ // IndieWeb Meta
+ // Reply ("u-in-reply-to")
+ if replyLink := a.replyLink(p); replyLink != "" {
+ hb.writeElementOpen("div")
+ hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "replyto"))
+ hb.writeEscaped(": ")
+ hb.writeElementOpen("a", "class", "u-in-reply-to", "rel", "noopener", "target", "_blank", "href", replyLink)
+ if replyTitle := a.replyTitle(p); replyTitle != "" {
+ hb.writeEscaped(replyTitle)
+ } else {
+ hb.writeEscaped(replyLink)
+ }
+ hb.writeElementClose("a")
+ hb.writeElementClose("div")
+ }
+ // Like ("u-like-of")
+ if likeLink := a.likeLink(p); likeLink != "" {
+ hb.writeElementOpen("div")
+ hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "likeof"))
+ hb.writeEscaped(": ")
+ hb.writeElementOpen("a", "class", "u-like-of", "rel", "noopener", "target", "_blank", "href", likeLink)
+ if likeTitle := a.likeTitle(p); likeTitle != "" {
+ hb.writeEscaped(likeTitle)
+ } else {
+ hb.writeEscaped(likeLink)
+ }
+ hb.writeElementClose("div")
+ }
+ // Geo
+ if geoURI := a.geoURI(p); geoURI != nil {
+ hb.writeElementOpen("div")
+ hb.writeEscaped("📍 ")
+ hb.writeElementOpen("a", "class", "p-location h-geo", "target", "_blank", "rel", "nofollow noopener noreferrer", "href", geoOSMLink(geoURI))
+ hb.writeElementOpen("span", "class", "p-name")
+ hb.writeEscaped(a.geoTitle(geoURI, b.Lang))
+ hb.writeElementClose("span")
+ hb.writeElementOpen("data", "class", "p-longitude", "value", fmt.Sprintf("%f", geoURI.Longitude))
+ hb.writeElementClose("data")
+ hb.writeElementOpen("data", "class", "p-latitude", "value", fmt.Sprintf("%f", geoURI.Latitude))
+ hb.writeElementClose("data")
+ hb.writeElementClose("a")
+ hb.writeElementClose("div")
+ }
+ // Post specific elements
+ if typ == "post" {
+ // Translations
+ if translations := a.postTranslations(p); len(translations) > 0 {
+ hb.writeElementOpen("div")
+ hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "translations"))
+ hb.writeEscaped(": ")
+ for i, translation := range translations {
+ if i > 0 {
+ hb.writeEscaped(", ")
+ }
+ hb.writeElementOpen("a", "translate", "no", "href", translation.Path)
+ hb.writeEscaped(translation.RenderedTitle)
+ hb.writeElementClose("a")
+ }
+ hb.writeElementClose("div")
+ }
+ // Short link
+ if shortLink := a.shortPostURL(p); shortLink != "" {
+ hb.writeElementOpen("div")
+ hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "shorturl"))
+ hb.writeEscaped(" ")
+ hb.writeElementOpen("a", "rel", "shortlink", "href", shortLink)
+ hb.writeEscaped(shortLink)
+ hb.writeElementClose("a")
+ hb.writeElementClose("div")
+ }
+ // Status
+ if p.Status != statusPublished {
+ hb.writeElementOpen("div")
+ hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "status"))
+ hb.writeEscaped(": ")
+ hb.writeEscaped(string(p.Status))
+ hb.writeElementClose("div")
+ }
+ }
+ if typ == "summary" || typ == "post" {
+ hb.writeElementClose("div")
+ }
}
// Render the HTML to show a warning for old posts
-func (a *goBlog) renderOldContentWarning(p *post, b *configBlog) template.HTML {
+func (a *goBlog) renderOldContentWarning(hb *htmlBuilder, p *post, b *configBlog) {
if b == nil || p == nil || !p.Old() {
- return ""
+ return
}
- var hb htmlBuilder
hb.writeElementOpen("strong", "class", "p border-top border-bottom")
hb.writeEscaped(a.ts.GetTemplateStringVariant(b.Lang, "oldcontent"))
hb.writeElementClose("strong")
- return hb.html()
}
// Render the HTML to show interactions
-func (a *goBlog) renderInteractions(b *configBlog, canonical string) template.HTML {
+func (a *goBlog) renderInteractions(hb *htmlBuilder, b *configBlog, canonical string) {
if b == nil || canonical == "" {
- return ""
+ return
}
- var hb htmlBuilder
// Start accordion
hb.writeElementOpen("details", "class", "p", "id", "interactions")
hb.writeElementOpen("summary")
@@ -165,16 +298,14 @@ func (a *goBlog) renderInteractions(b *configBlog, canonical string) template.HT
hb.writeElementClose("form")
// Finish accordion
hb.writeElementClose("details")
- return hb.html()
}
// Render HTML for author h-card
-func (a *goBlog) renderAuthor() template.HTML {
+func (a *goBlog) renderAuthor(hb *htmlBuilder) {
user := a.cfg.User
if user == nil {
- return ""
+ return
}
- var hb htmlBuilder
hb.writeElementOpen("div", "class", "p-author h-card hide")
if user.Picture != "" {
hb.writeElementOpen("data", "class", "u-photo", "value", user.Picture)
@@ -186,15 +317,44 @@ func (a *goBlog) renderAuthor() template.HTML {
hb.writeElementClose("a")
}
hb.writeElementClose("div")
- return hb.html()
+}
+
+// Render HTML that includes the head meta tags for a post
+func (a *goBlog) renderPostHeadMeta(hb *htmlBuilder, p *post, canonical string) {
+ if p == nil {
+ return
+ }
+ if canonical != "" {
+ hb.writeElementOpen("meta", "property", "og:url", "content", canonical)
+ hb.writeElementOpen("meta", "property", "twitter:url", "content", canonical)
+ }
+ if p.RenderedTitle != "" {
+ hb.writeElementOpen("meta", "property", "og:title", "content", p.RenderedTitle)
+ hb.writeElementOpen("meta", "property", "twitter:title", "content", p.RenderedTitle)
+ }
+ if summary := a.postSummary(p); summary != "" {
+ hb.writeElementOpen("meta", "name", "description", "content", summary)
+ hb.writeElementOpen("meta", "property", "og:description", "content", summary)
+ hb.writeElementOpen("meta", "property", "twitter:description", "content", summary)
+ }
+ if p.Published != "" {
+ hb.writeElementOpen("meta", "itemprop", "datePublished", "content", dateFormat(p.Published, "2006-01-02T15:04:05-07:00"))
+ }
+ if p.Updated != "" {
+ hb.writeElementOpen("meta", "itemprop", "dateModified", "content", dateFormat(p.Updated, "2006-01-02T15:04:05-07:00"))
+ }
+ for _, img := range a.photoLinks(p) {
+ hb.writeElementOpen("meta", "itemprop", "image", "content", img)
+ hb.writeElementOpen("meta", "property", "og:image", "content", img)
+ hb.writeElementOpen("meta", "property", "twitter:image", "content", img)
+ }
}
// Render HTML for TOR notice in the footer
-func (a *goBlog) renderTorNotice(b *configBlog, torUsed bool, torAddress string) template.HTML {
+func (a *goBlog) renderTorNotice(hb *htmlBuilder, b *configBlog, torUsed bool, torAddress string) {
if !a.cfg.Server.Tor || b == nil || !torUsed && torAddress == "" {
- return ""
+ return
}
- var hb htmlBuilder
if torUsed {
hb.writeElementOpen("p", "id", "tor")
hb.writeEscaped("🔐 ")
@@ -212,5 +372,4 @@ func (a *goBlog) renderTorNotice(b *configBlog, torUsed bool, torAddress string)
hb.writeElementClose("a")
hb.writeElementClose("p")
}
- return hb.html()
}
diff --git a/ui_test.go b/ui_test.go
index b7d8993..f615ea6 100644
--- a/ui_test.go
+++ b/ui_test.go
@@ -25,7 +25,9 @@ func Test_renderPostTax(t *testing.T) {
},
}
- res := app.renderPostTax(p, app.cfg.Blogs["default"])
+ var hb htmlBuilder
+ app.renderPostTax(&hb, p, app.cfg.Blogs["default"])
+ res := hb.html()
_, err := goquery.NewDocumentFromReader(strings.NewReader(string(res)))
require.NoError(t, err)
@@ -44,7 +46,9 @@ func Test_renderOldContentWarning(t *testing.T) {
Published: "2018-01-01",
}
- res := app.renderOldContentWarning(p, app.cfg.Blogs["default"])
+ var hb htmlBuilder
+ app.renderOldContentWarning(&hb, p, app.cfg.Blogs["default"])
+ res := hb.html()
_, err := goquery.NewDocumentFromReader(strings.NewReader(string(res)))
require.NoError(t, err)
@@ -103,7 +107,9 @@ func Test_renderInteractions(t *testing.T) {
err = app.db.approveWebmentionId(2)
require.NoError(t, err)
- res := app.renderInteractions(app.cfg.Blogs["default"], "https://example.com/testpost1")
+ var hb htmlBuilder
+ app.renderInteractions(&hb, app.cfg.Blogs["default"], "https://example.com/testpost1")
+ res := hb.html()
_, err = goquery.NewDocumentFromReader(strings.NewReader(string(res)))
require.NoError(t, err)
@@ -123,7 +129,9 @@ func Test_renderAuthor(t *testing.T) {
_ = app.initDatabase(false)
app.initComponents(false)
- res := app.renderAuthor()
+ var hb htmlBuilder
+ app.renderAuthor(&hb)
+ res := hb.html()
_, err := goquery.NewDocumentFromReader(strings.NewReader(string(res)))
require.NoError(t, err)
@@ -140,13 +148,17 @@ func Test_renderTorNotice(t *testing.T) {
app.cfg.Server.Tor = true
- res := app.renderTorNotice(app.cfg.Blogs["default"], true, "http://abc.onion:80/test")
+ var hb htmlBuilder
+ app.renderTorNotice(&hb, app.cfg.Blogs["default"], true, "http://abc.onion:80/test")
+ res := hb.html()
_, err := goquery.NewDocumentFromReader(strings.NewReader(string(res)))
require.NoError(t, err)
assert.Equal(t, template.HTML("🔐 Connected via Tor.
"), res) - res = app.renderTorNotice(app.cfg.Blogs["default"], false, "http://abc.onion:80/test") + hb.Reset() + app.renderTorNotice(&hb, app.cfg.Blogs["default"], false, "http://abc.onion:80/test") + res = hb.html() _, err = goquery.NewDocumentFromReader(strings.NewReader(string(res))) require.NoError(t, err)