From 944001d1d6a05bdb1c109a33dba1ba74347e55d7 Mon Sep 17 00:00:00 2001 From: core Date: Thu, 28 Jan 2021 19:35:15 +0000 Subject: [PATCH 1/4] fix announcements --- themes/hugo-bootstrap/layouts/partials/announcements.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/hugo-bootstrap/layouts/partials/announcements.html b/themes/hugo-bootstrap/layouts/partials/announcements.html index 0c71214..06966b4 100644 --- a/themes/hugo-bootstrap/layouts/partials/announcements.html +++ b/themes/hugo-bootstrap/layouts/partials/announcements.html @@ -1,9 +1,9 @@ -{{ $events := where .Pages "Section" "events" }} +{{ $events := where .Site.RegularPages "Section" "events" }} {{ $future_events := $events | intersect (where $events "Date" ">=" now) }} -{{ $next_event := first 1 $future_events.ByDate }} +{{ $next_event := $future_events | first 1 }} {{ $posts := where .Pages "Section" "post" }} From ec7ff2499998c8bc8d93d9a7ac0ba435e475c064 Mon Sep 17 00:00:00 2001 From: core Date: Thu, 28 Jan 2021 19:47:11 +0000 Subject: [PATCH 2/4] fix RSS error Error was: WARN 2021/01/28 19:42:35 Page's .RSSLink is deprecated and will be removed in a future release. Use the Output Format's link, e.g. something like: {{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}. Fixed with advice from https://discourse.gohugo.io/t/clear-instructions-on-how-to-upgrade-to-the-outputformats-rss/25530/4 --- themes/hugo-bootstrap/layouts/_default/baseof.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/themes/hugo-bootstrap/layouts/_default/baseof.html b/themes/hugo-bootstrap/layouts/_default/baseof.html index 55eaf8f..91755e4 100644 --- a/themes/hugo-bootstrap/layouts/_default/baseof.html +++ b/themes/hugo-bootstrap/layouts/_default/baseof.html @@ -17,8 +17,10 @@ - {{ if .RSSLink }} - + {{ $foo := .Site.Title }} + {{ with .OutputFormats.Get "RSS" }} + + {{ end }} {{ partial "head-custom.html" . }} From 35d53f1f14e9929dcd0b2a477e71f803f021378b Mon Sep 17 00:00:00 2001 From: core Date: Thu, 28 Jan 2021 20:05:00 +0000 Subject: [PATCH 3/4] Remove some references to .URL for future deprecation Following the warning WARN 2021/01/28 20:01:55 Page's .URL is deprecated and will be removed in a future release. Use .Permalink or .RelPermalink. If what you want is the front matter URL value, use .Params.url. --- layouts/partials/footer.html | 2 +- themes/hugo-bootstrap/layouts/_default/baseof.html | 6 +++--- themes/hugo-bootstrap/layouts/partials/footer.html | 4 ++-- themes/hugo-bootstrap/layouts/partials/head-meta.html | 2 +- themes/hugo-bootstrap/layouts/partials/header.html | 3 ++- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index e4e9f87..29c4603 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -52,7 +52,7 @@
  • Mastodon
  • Forum
  • Chat
    • -
  • Onion Website
    • +
  • Onion Website
    • diff --git a/themes/hugo-bootstrap/layouts/_default/baseof.html b/themes/hugo-bootstrap/layouts/_default/baseof.html index 91755e4..dc79352 100644 --- a/themes/hugo-bootstrap/layouts/_default/baseof.html +++ b/themes/hugo-bootstrap/layouts/_default/baseof.html @@ -17,10 +17,10 @@ - {{ $foo := .Site.Title }} + {{ $site_title := .Site.Title }} {{ with .OutputFormats.Get "RSS" }} - - + + {{ end }} {{ partial "head-custom.html" . }} diff --git a/themes/hugo-bootstrap/layouts/partials/footer.html b/themes/hugo-bootstrap/layouts/partials/footer.html index 1ba7b6f..2be90dc 100644 --- a/themes/hugo-bootstrap/layouts/partials/footer.html +++ b/themes/hugo-bootstrap/layouts/partials/footer.html @@ -7,8 +7,8 @@
    {{ i18n "footer-text" }}

    Website Source Code | Report bug / Suggestion | - Tor Onion Service v2 | - Tor Onion Service v3 | + Tor Onion Service v2 | + Tor Onion Service v3 | Follow us on Mastodon | Relatório Financeiro 2019

    diff --git a/themes/hugo-bootstrap/layouts/partials/head-meta.html b/themes/hugo-bootstrap/layouts/partials/head-meta.html index a5c7b55..b966032 100644 --- a/themes/hugo-bootstrap/layouts/partials/head-meta.html +++ b/themes/hugo-bootstrap/layouts/partials/head-meta.html @@ -2,7 +2,7 @@ {{if isset .Site.Params "onionv3"}} - + {{ end }} {{ template "_internal/opengraph.html" . }} diff --git a/themes/hugo-bootstrap/layouts/partials/header.html b/themes/hugo-bootstrap/layouts/partials/header.html index 4cffeda..59040f3 100644 --- a/themes/hugo-bootstrap/layouts/partials/header.html +++ b/themes/hugo-bootstrap/layouts/partials/header.html @@ -13,6 +13,7 @@ {{ range .Site.Menus.main }} {{ if eq (.URL ) "/community/become-a-member" }}
     
    + {{ .Name }} {{ else }}
  • @@ -35,7 +36,7 @@
     
      - {{ $url := .URL | relLangURL }} + {{ $url := .RelPermalink | relLangURL }} {{ range .Site.Menus.main }}
    • {{ if eq (hasPrefix .URL "mailto:") true }} From 90339edc4a4b18ae40b4febf44a1c04aca8d1289 Mon Sep 17 00:00:00 2001 From: core Date: Thu, 28 Jan 2021 20:07:30 +0000 Subject: [PATCH 4/4] fix blog posts (same as 944001d) --- themes/hugo-bootstrap/layouts/partials/announcements.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/hugo-bootstrap/layouts/partials/announcements.html b/themes/hugo-bootstrap/layouts/partials/announcements.html index 06966b4..b844148 100644 --- a/themes/hugo-bootstrap/layouts/partials/announcements.html +++ b/themes/hugo-bootstrap/layouts/partials/announcements.html @@ -6,7 +6,7 @@ {{ $next_event := $future_events | first 1 }} -{{ $posts := where .Pages "Section" "post" }} +{{ $posts := where .Site.RegularPages "Section" "post" }} {{ $last_post := last 1 $posts.ByDate }}