diff --git a/assets/css/style.css b/assets/css/style.css index 059a4fb..08e4fc1 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -404,6 +404,11 @@ footer a:link, footer a:visited, footer a:hover, footer a:active { text-align: left; } +.footer-nav { + column-count: 2; + column-gap: 2rem; +} + /* END FOOTER */ /* diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 2cfae89..185844e 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -3,6 +3,6 @@ {{ partial "head.html" . }} {{ block "main" . }}{{ end }} + {{ partial "footer.html" . }} - {{ partial "footer.html" . }} diff --git a/layouts/_default/item.json.json b/layouts/_default/item.json.json index 7fe1224..d7b05a4 100644 --- a/layouts/_default/item.json.json +++ b/layouts/_default/item.json.json @@ -3,7 +3,7 @@ "url": "{{ .Permalink }}", "title": {{ .Title | jsonify }}, "authors": [ - {{with $.Site.Author.name }} + {{with $.Site.Params.Author }} { "name": "{{ . }}" } {{ end }} ], diff --git a/layouts/_default/list.as2.ajson b/layouts/_default/list.as2.ajson index eb0a55a..e0661f4 100644 --- a/layouts/_default/list.as2.ajson +++ b/layouts/_default/list.as2.ajson @@ -3,14 +3,14 @@ { "@context": "https://www.w3.org/ns/activitystreams", "actor": { - {{with $.Site.Author.name }}"name": "{{ . }}",{{ end }} + {{with $.Site.Params.Author }}"name": "{{ . }}",{{ end }} "url": "{{ .Site.BaseURL }}" }, "id": "{{ $page.Permalink }}", "object": { "attributedTo": [ { - {{with $.Site.Author.name }}"name": "{{ . }}",{{ end }} + {{with $.Site.Params.Author }}"name": "{{ . }}",{{ end }} "type": "Person", "url": "{{ .Site.BaseURL }}" } diff --git a/layouts/_default/list.atom.atom b/layouts/_default/list.atom.atom index 0b5d808..9c51ff2 100644 --- a/layouts/_default/list.atom.atom +++ b/layouts/_default/list.atom.atom @@ -18,7 +18,7 @@ Hugo {{ .Site.BaseURL }} - {{ with .Site.Author.name }}{{.}}{{end}} + {{ with .Site.Params.Author }}{{.}}{{end}} {{ now.Format "2006-01-02T15:04:05-07:00" | safeHTML }} {{ with .OutputFormats.Get "Atom" }} @@ -29,7 +29,7 @@ http://activitystrea.ms/schema/1.0/person {{ .Site.BaseURL }} - {{ with .Site.Author.name }}{{.}}{{end}} + {{ with .Site.Params.Author }}{{.}}{{end}} http://activitystrea.ms/schema/1.0/article {{ .Title }} diff --git a/layouts/_default/list.json.json b/layouts/_default/list.json.json index 6f59b8e..dcb9f35 100644 --- a/layouts/_default/list.json.json +++ b/layouts/_default/list.json.json @@ -7,7 +7,7 @@ "icon": "{{ .Site.BaseURL }}img/{{ .Site.Params.avatar }}", "language": "en-US", "authors": [ - {{with $.Site.Author.name }} + {{with $.Site.Params.Author }} { "name": "{{ . }}" } {{ end }} ], diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 76cbad5..51340a1 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -21,9 +21,9 @@ {{ .Description }} Hugo -- gohugo.io{{ with .Site.LanguageCode }} - {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} + {{.}}{{end}}{{ with .Site.Params.email }} + {{.}}{{ with $.Site.Params.Author }} ({{.}}){{end}}{{end}}{{ with .Site.Params.email }} + {{.}}{{ with $.Site.Params.Author }} ({{.}}){{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" }} @@ -34,7 +34,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.email }}{{.}}{{ with $.Site.Params.Author }} ({{.}}){{end}}{{end}} {{ .Permalink }} {{ printf `` .Summary | safeHTML }} {{ printf `` .Content | safeHTML }} diff --git a/layouts/blog/list.html b/layouts/blog/list.html index 2897b9b..c6d24c2 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -10,7 +10,7 @@ {{ range last 1 $posts }} {{ $tags := .Site.Taxonomies.tags }}
- Hello! This page contains {{ $postCount | lang.NumFmt 0 }} posts + Hello! This page contains {{ $postCount | lang.FormatNumber 0 }} posts written in the past {{ div (sub now.Unix .Date.Unix) 31536000 }} years spanning {{ len $tags }} topics within the dropdown above. diff --git a/layouts/blog/single.amp.html b/layouts/blog/single.amp.html index 26c5bf7..7974644 100644 --- a/layouts/blog/single.amp.html +++ b/layouts/blog/single.amp.html @@ -36,9 +36,7 @@ "@context": "https://schema.org", "@type": "NewsArticle", "headline": "{{ .Title }}", - "image": [ - "{{ .Site.BaseURL }}img/{{ .Site.Params.avatar }}" - ], + "image": [], "datePublished": "{{ .Date.Format "2006-01-02" }}", "author": [{ "@type": "Person", diff --git a/layouts/blog/single.html b/layouts/blog/single.html index 20d1d78..8952e28 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -25,13 +25,21 @@
-
- Reply via Email - Buy me a Coffee +
+ +
+

Have any questions or want to chat: Reply via Email

+

Enjoyed this post?

+ + {{ partial "highfive.html" . }} + {{ partial "webmentions.html" . }}
- {{ partial "sharepost.html" . }} - {{ partial "webmentions.html" . }} + + diff --git a/layouts/partials/sharepost.html b/layouts/partials/sharepost.html index 253c9e2..4fd29ac 100644 --- a/layouts/partials/sharepost.html +++ b/layouts/partials/sharepost.html @@ -1,5 +1,4 @@ -
Was this useful? Feel free to share: +Share: Hacker News Reddit Twitter -
diff --git a/layouts/partials/webmentions.html b/layouts/partials/webmentions.html index f081b68..21349dd 100644 --- a/layouts/partials/webmentions.html +++ b/layouts/partials/webmentions.html @@ -7,7 +7,6 @@ - {{ $webmentionjs := resources.Get "js/webmention.min.js" }} {{ $aliasesCombined := delimit (apply .Aliases "absURL" ".") "|" }} diff --git a/layouts/shortcodes/displayOnlineToot.html b/layouts/shortcodes/displayOnlineToot.html index 345918b..bb4b8dd 100644 --- a/layouts/shortcodes/displayOnlineToot.html +++ b/layouts/shortcodes/displayOnlineToot.html @@ -1,7 +1,17 @@ {{ $url := urls.Parse (.Get 0) }} {{ $status_id := index (last 1 (split $url.Path "/")) 0 }} {{ $api_url := printf "%s://%s/api/v1/statuses/%s" $url.Scheme $url.Host $status_id }} -{{ $dataJ := getJSON $api_url }} +{{ $dataJ := dict }} +{{ $url := $api_url }} +{{ with try (resources.GetRemote $url) }} + {{ with .Err }} + {{ errorf "Unable to get remote resource %s: %s" $url . }} + {{ else with .Value }} + {{ $dataJ = . | transform.Unmarshal }} + {{ else }} + {{ errorf "Unable to get remote resource %s" $url }} + {{ end }} +{{ end }} {{ .Scratch.Set "toot" $dataJ }} {{ partial "external/toot.html" . }} diff --git a/layouts/shortcodes/displayToot.html b/layouts/shortcodes/displayToot.html index dac1b79..91ea84a 100644 --- a/layouts/shortcodes/displayToot.html +++ b/layouts/shortcodes/displayToot.html @@ -1,6 +1,15 @@ {{ $toot_reference := .Get 0 }} -{{ $url := printf "static/data/toots/%s.json" $toot_reference }} -{{ $dataJ := getJSON $url }} - +{{ $url := printf "data/toots/%s.json" $toot_reference }} +{{ $dataJ := dict }} +{{ with try (resources.Get $url) }} + {{ with .Err }} + {{ errorf "Unable to get resource %s: %s" $url . }} + {{ else with .Value }} + {{ $dataJ = . | transform.Unmarshal }} + {{ else }} + {{ errorf "Unable to get resource %s" $url }} + {{ end }} +{{ end }} +w {{ .Scratch.Set "toot" $dataJ }} {{ partial "external/toot.html" . }} diff --git a/layouts/shortcodes/pgpform.html b/layouts/shortcodes/pgpform.html index 0b12d37..213ba04 100644 --- a/layouts/shortcodes/pgpform.html +++ b/layouts/shortcodes/pgpform.html @@ -6,26 +6,34 @@ Encrypted Result: 

 
+
+
+

+Verification Result:
+

+
diff --git a/layouts/tags/list.html b/layouts/tags/list.html
index c6c6ed0..95853fb 100644
--- a/layouts/tags/list.html
+++ b/layouts/tags/list.html
@@ -2,12 +2,12 @@
   {{ partial "header.html" . }}
   

   

-    Here you'll find {{ len .Pages | lang.NumFmt 0 }} posts
+    Here you'll find {{ len .Pages | lang.FormatNumber 0 }} posts
     about {{ .Title }} .
   

   
   

-    {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "January, 2006"}}
+    {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "2006"}}
     {{ range $index, $value := .Pages.GroupByDate $listPageDateFormat }}
     {{ if (ne $index 0) }}
     

diff --git a/layouts/toots/list.html b/layouts/toots/list.html
deleted file mode 100644
index 15f54cc..0000000
--- a/layouts/toots/list.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{{ define "main"}}
-  {{ partial "header.html" . }}
-  

-    
-    {{ partial "search.html" . }}
-    {{ .Content }}
-    {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "January, 2006"}}
-    {{ range $index, $value := .Pages.GroupByDate $listPageDateFormat }}
-    {{ range .Pages }}
-      {{ $dataJ := dict "account" .Params.account
-                        "account.display_name" .Params.account.display_name
-                        "created_at" .Date
-                        "content" .Content
-                        "media_attachments" .Params.media_attachments
-                        "Permalink" .Permalink
-                        "tags" .Params.tags
-                        "url" .Params.syndication
-                        "replies_count" .Params.replies_count
-                        "reblogs_count" .Params.reblogs_count
-                        "favourites_count" .Params.favourites_count
-      }}
-
-      {{ .Scratch.Set "toot" $dataJ }}
-      {{ partial "external/toot.html" . }}
-    {{ end }}
-    {{ end }}
-  

-{{ end }}
diff --git a/layouts/toots/single.html b/layouts/toots/single.html
deleted file mode 100644
index d8ea4e9..0000000
--- a/layouts/toots/single.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{ define "main"}}
-{{ .Scratch.Set "customTitleHeaderSet" true }}
-{{ .Scratch.Set "customTitleHeader" "Toots" }}
-{{ .Scratch.Set "customTitleHeaderLink" "/toots" }}
-{{ partial "header.html" . }}
-

-  {{ $dataJ := dict "account" .Params.account
-          "account.display_name" .Params.account.display_name
-          "created_at" .Date
-          "content" .Content
-          "media_attachments" .Params.media_attachments
-          "Permalink" .Permalink
-          "tags" .Params.tags
-          "url" .Params.syndication
-          "replies_count" .Params.replies_count
-          "reblogs_count" .Params.reblogs_count
-          "favourites_count" .Params.favourites_count
-  }}
-
-  {{ .Scratch.Set "toot" $dataJ }}
-  {{ partial "external/toot.html" . }}
-

-{{ end }}