From 77893ccf469ace26f2fb32583777f6af3a281e87 Mon Sep 17 00:00:00 2001 From: Caio Lente <7017340+clente@users.noreply.github.com> Date: Tue, 17 Oct 2023 01:10:22 -0300 Subject: [PATCH 1/3] Move 'reply by email' button to the bottom of every post --- README.md | 5 ++++- exampleSite/config.toml | 2 +- i18n/en.toml | 3 +++ i18n/pt.toml | 3 +++ layouts/_default/single.html | 7 +++++++ layouts/partials/nav.html | 3 --- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0427ffc..73a7f11 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,9 @@ already implemented: can be focused by people who need a keyboard to navigate the web (see [PR #5](https://github.com/clente/hugo-bearcub/pull/5) by [@2kool4idkwhat](https://github.com/2kool4idkwhat) for more information). +- Reply by email: if you supply an email address, the theme creates a "Reply to + this post by email" button at the end of every post (see Kev Quirk's [original + implementation](https://kevquirk.com/adding-the-post-title-to-my-reply-by-email-button)). - Single-use CSS (EXPERIMENTAL): you can add some styles to a single page by writing the CSS you need in `assets/{custom_css}.css` and then including `style: "{custom_css}.css"` in the [front @@ -208,7 +211,7 @@ enableRobotsTXT = true # Social media. Delete any item you aren't using to make sure it won't show up # in your website's metadata. [social] - email = "me@example.com" # Added to the navbar so readers can reply to posts + email = "me@example.com" # Added to the footer so readers can reply to posts twitter = "example" # Twitter handle (without '@') facebook_admin = "0000000000" # Facebook Page Admin ID ``` diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 3b68b53..b6c67c8 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -79,6 +79,6 @@ enableRobotsTXT = true # Social media. Delete any item you aren't using to make sure it won't show up # in your website's metadata. [social] - email = "me@example.com" # Added to the navbar so readers can reply to posts + email = "me@example.com" # Added to the footer so readers can reply to posts twitter = "example" # Twitter handle (without '@') facebook_admin = "0000000000" # Facebook Page Admin ID diff --git a/i18n/en.toml b/i18n/en.toml index b7738dd..15a8569 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -7,5 +7,8 @@ [email-subject] other = "Reply to " +[email-reply] + other = "Reply to this post by email" + [skip-link] other = "Skip to main content" \ No newline at end of file diff --git a/i18n/pt.toml b/i18n/pt.toml index 33fc65f..ad228ab 100644 --- a/i18n/pt.toml +++ b/i18n/pt.toml @@ -7,5 +7,8 @@ [email-subject] other = "Resposta a " +[email-reply] + other = "Responda a este post por email" + [skip-link] other = "Pular para conteúdo principal" \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index cd6b095..30de616 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -17,4 +17,11 @@ #{{ .LinkTitle }}   {{ end }}

+{{ with .Site.Social.email }} +

+ + {{ i18n "email-reply" }} ↪ + +

+{{ end }} {{ end }} diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 2cc03a2..e78affe 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,9 +1,6 @@ {{ range .Site.Menus.main.ByWeight }} {{ .Name }} {{ end }} -{{ with .Site.Social.email }} -Email -{{ end }} RSS From bf804a08146afba3530671b4a99f31a9f5ae577d Mon Sep 17 00:00:00 2001 From: Caio Lente <7017340+clente@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:41:36 -0300 Subject: [PATCH 2/3] Improved RSS template --- README.md | 4 ++-- exampleSite/config.toml | 2 -- layouts/_default/rss.xml | 42 +++++++++++++++++++++++++++++++++++++++ layouts/partials/nav.html | 2 +- 4 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 layouts/_default/rss.xml diff --git a/README.md b/README.md index 73a7f11..ef4e9cd 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,8 @@ Every once in a while, as I keep using **Bear Cub**, I notice that there is some functionality missing. Currently, these are the "advanced features" that I have already implemented: +- Full-text RSS feed: an enhanced RSS feed template that includes the (properly + encoded) full content of your posts in the feed itself. - Static content: you can create empty blog entries that act as links to static files by including `link: "{url}"` in a post's [front matter](https://gohugo.io/content-management/front-matter/). You can also add @@ -165,7 +167,6 @@ enableRobotsTXT = true LanguageCode = "en-US" contentDir = "content" [languages.en.params] - blogPath = "blog" # Path to your blog section (used by RSS) madeWith = "Made with [Bear Cub](https://github.com/clente/hugo-bearcub)" [languages.pt] title = "Bear Cub" @@ -173,7 +174,6 @@ enableRobotsTXT = true LanguageCode = "pt-BR" contentDir = "content.pt" [languages.pt.params] - blogPath = "blog" # Path to your blog section (used by RSS) madeWith = "Feito com [Bear Cub](https://github.com/clente/hugo-bearcub)" [params] diff --git a/exampleSite/config.toml b/exampleSite/config.toml index b6c67c8..b9fc796 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -33,7 +33,6 @@ enableRobotsTXT = true LanguageCode = "en-US" contentDir = "content" [languages.en.params] - blogPath = "blog" # Path to your blog section (used by RSS) madeWith = "Made with [Bear Cub](https://github.com/clente/hugo-bearcub)" [languages.pt] title = "Bear Cub" @@ -41,7 +40,6 @@ enableRobotsTXT = true LanguageCode = "pt-BR" contentDir = "content.pt" [languages.pt.params] - blogPath = "blog" # Path to your blog section (used by RSS) madeWith = "Feito com [Bear Cub](https://github.com/clente/hugo-bearcub)" [params] diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml new file mode 100644 index 0000000..c55e7e4 --- /dev/null +++ b/layouts/_default/rss.xml @@ -0,0 +1,42 @@ +{{- $pctx := . -}} +{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}} +{{- $pages := slice -}} +{{- if $.IsHome -}} +{{- $pages = where $pctx.AllPages "Kind" "page" -}} +{{ else if $.IsSection }} +{{- $pages = $pctx.RegularPages -}} +{{- else -}} +{{- $pages = $pctx.Pages -}} +{{- end -}} +{{- $limit := .Site.Config.Services.RSS.Limit -}} +{{- if ge $limit 1 -}} +{{- $pages = $pages | first $limit -}} +{{- end -}} +{{- printf "" | safeHTML }} + + + {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} + {{ .Permalink }} + Recent content {{ if not .IsHome }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} + Hugo -- gohugo.io + {{ site.Language.LanguageCode }}{{ with .Site.Author.email }} + {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} + {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} + {{.}}{{end}}{{ if not .Date.IsZero }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} + {{- with .OutputFormats.Get "RSS" -}} + {{ printf "" .Permalink .MediaType | safeHTML }} + {{- end -}} + {{ range $pages }} + + {{ .Title }} + {{ .Permalink }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ with .Params.author }}{{.}}{{ end }} + {{ .Permalink }} + {{ .Summary | plainify }} + {{ `` | safeHTML }} + + {{ end }} + + \ No newline at end of file diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index e78affe..5f40267 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,7 +1,7 @@ {{ range .Site.Menus.main.ByWeight }} {{ .Name }} {{ end }} -RSS +RSS {{ $translations := dict }} From 88edea7e8ab507cb2f48d0a3cb64b6c9fad8409e Mon Sep 17 00:00:00 2001 From: Caio Lente <7017340+clente@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:49:40 -0300 Subject: [PATCH 3/3] Show post author if provided --- layouts/_default/single.html | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 30de616..371a382 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,6 +6,7 @@ + {{ with .Params.author }}· {{.}}{{ end }}

{{ end }}