From 052bdf056c5370657f2b970cdf6fb34b6b16ade5 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 22 Jul 2020 12:26:41 +0100 Subject: [PATCH] added feeds page and fixed feeds --- config.toml | 16 +++++--- content/all.md | 5 +++ content/feeds.md | 4 ++ layouts/_default/rss.xml | 29 +++++++++++++- layouts/all/single.html | 54 ++++++++++++++++++++++++++ layouts/feeds/single.html | 16 ++++++++ themes/nipponalba/static/css/style.css | 4 +- 7 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 content/all.md create mode 100644 content/feeds.md create mode 100644 layouts/all/single.html create mode 100644 layouts/feeds/single.html diff --git a/config.toml b/config.toml index 790d8bc3..20b8f5ba 100644 --- a/config.toml +++ b/config.toml @@ -1,17 +1,17 @@ baseURL = "https://jk.nipponalba.scot" languageCode = "en-gb" title = "JK's homepage" -theme=["hugo-atom-feed","nipponalba"] +theme=["nipponalba"] summarylength=30 enableEmoji=true defaultContentLanguage="en" [outputs] - home = ["html", "rss", "atom"] # default = ["HTML", "RSS"] - section = ["html", "rss", "atom"] # default = ["HTML", "RSS"] - term = ["html", "rss", "atom"] # default = ["HTML", "RSS"] - taxonomy = ["html", "rss", "atom"] # default = ["HTML", "RSS"] + home = ["html", "rss"] # default = ["HTML", "RSS"] + section = ["html", "rss"] # default = ["HTML", "RSS"] + term = ["html", "rss"] # default = ["HTML", "RSS"] + taxonomy = ["html", "rss"] # default = ["HTML", "RSS"] [markup] [markup.goldmark] @@ -119,6 +119,12 @@ name = "Bookmarks" weight = 600 url = "/bookmarks/" +[[languages.en.menu.main]] +name = "Feeds" +weight = 700 +url = "/feeds/" +identifier = "feeds" + [languages.jp] weight = 10 languageName = "日本語" diff --git a/content/all.md b/content/all.md new file mode 100644 index 00000000..66879644 --- /dev/null +++ b/content/all.md @@ -0,0 +1,5 @@ +--- +title: "All feeds" +type: all +section: all +--- diff --git a/content/feeds.md b/content/feeds.md new file mode 100644 index 00000000..d44d4830 --- /dev/null +++ b/content/feeds.md @@ -0,0 +1,4 @@ +--- +title: "Feeds" +type: feeds +--- diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 54c7b5cd..39d1cc14 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -12,7 +12,8 @@ {{ with .OutputFormats.Get "RSS" }} {{ printf "" .Permalink .MediaType | safeHTML }} {{ end }} - {{ range .Pages }} + {{ if eq (trim .Permalink "index.xml") (string .Site.BaseURL)}} + {{ range where .Site.Pages "Kind" "page" }} {{ .Title }} {{ .Permalink }} @@ -25,7 +26,7 @@ {{ .Content | plainify }} ({{ .Permalink }}) - {{ range .Params.Photo }} + {{ range .Params.Photo }} {{ if not ( in . "http" ) }} {{ else }} @@ -35,5 +36,29 @@ {{ end }} + {{else}} + {{ range .Pages}} + + {{ .Title }} + {{ .Permalink }} + {{ if eq .Params.posttype "in-reply-to" }}{{ index .Params "in-reply-to" }}{{ end }} + {{ if eq .Params.posttype "like-of" }}{{ index .Params "like-of" }}{{ end }} + {{ if eq .Params.posttype "repost-of" }}{{ index .Params "repost-of" }}{{ end }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ .Permalink }} + + {{ .Content | plainify }} + ({{ .Permalink }}) + {{ range .Params.Photo }} + {{ if not ( in . "http" ) }} + + {{ else }} + + {{ end }} + {{ end }} + + + {{ end }}{{ end }} diff --git a/layouts/all/single.html b/layouts/all/single.html new file mode 100644 index 00000000..3d9dad3e --- /dev/null +++ b/layouts/all/single.html @@ -0,0 +1,54 @@ +{{ define "main" }} +
+ + {{ range where .Site.Pages "Kind" "page"}} + {{ if not (eq .Type "response")}}
+ {{ with .Page.Params.Image }}
{{ partial "image.html" . }}
{{ end }} +
+ {{if eq .Type "article"}}

{{ .Title }}

{{ .Description }}{{ end }} + {{ if eq .Type "article" }}
+ {{ with .Page.Params.Blog }}Blog: {{ partial "taxonomy/blog.html" . }}{{ end }}
+ {{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}{{ .ReadingTime }}-minute read
+ {{ with .Page.Params.tag }}Tags: {{ partial "taxonomy/tags.html" . }}{{ end }} +
{{ end }} +
+ {{ .Content }} + {{ if eq .Type "photo"}} +
+ {{$link := .Permalink}} + {{$summary := .Content}} + {{ range .Page.Params.Photo }} + {{ if isset . "value" }} + {{ .alt }} + {{ else }} + Alt not yet added, will fix! + {{end}}{{end}} +
+ {{end}} +

+ {{ if not (eq .Type "article") }}
+ {{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}
+
{{ end }} +
+
+ {{ else }} +
+

{{ .Site.Params.Firstname }} + {{ if eq .Params.posttype "in-reply-to" }} replied to {{ index .Params "in-reply-to" }}{{ end }} + {{ if eq .Params.posttype "like-of" }} liked {{ index .Params "like-of" }}{{ end }} + {{ if eq .Params.posttype "repost-of" }} shared {{ index .Params "repost-of" }}{{ end }}

+ {{ if .Content }}
{{ .Content }}
{{end}} + {{ if not (eq .Type "article") }}
+ {{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}
+
{{ end }} +
+
+ {{end}} + {{ end }} + +
+ + +{{ end }} diff --git a/layouts/feeds/single.html b/layouts/feeds/single.html new file mode 100644 index 00000000..d7fe23a6 --- /dev/null +++ b/layouts/feeds/single.html @@ -0,0 +1,16 @@ +{{ define "main" }} +
+

All feeds

+

This is a list of all of the feeds on this site for both microformats 2 (MF2) and RSS for following using your reader of choice.

+

All feeds - everything!RSS | MF2

+

All articles - long form blog postsRSS | MF2

+

Brewshido articlesRSS | MF2

+

Bushido Dreams articlesRSS | MF2

+

Whitabootery articlesRSS | MF2

+

Kilted Scot articles (currently dormant)RSS | MF2

+

Sovereign Scot articles (currently dormant)RSS | MF2

+

Notes - short form notesRSS | MF2

+

PhotosRSS | MF2

+

Responses - likes, replies, shares, mentions.RSS | MF2

+
+{{ end }} diff --git a/themes/nipponalba/static/css/style.css b/themes/nipponalba/static/css/style.css index 7c69ff39..a3f8ed4b 100644 --- a/themes/nipponalba/static/css/style.css +++ b/themes/nipponalba/static/css/style.css @@ -152,12 +152,12 @@ nav li i{ margin:0; padding-left:10px; } -nav > li:nth-child(7) { +nav > li:nth-child(8) { margin-left: auto; padding-right:5px; display:none; } -nav > li:nth-child(8) { +nav > li:nth-child(9) { padding-right:0; margin-left: auto; }