Skip to content

Update hugo be compatible with v80 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
francisco-core wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update hugo be compatible with v80 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
944001d
fix announcements
Jan 28, 2021
ec7ff24
fix RSS error
Jan 28, 2021
35d53f1
Remove some references to .URL for future deprecation
Jan 28, 2021
90339ed
fix blog posts (same as 944001d)
Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h5 class="text-left add-bottom">
<li><a class="footer-link" href="{{ .Site.Params.mastodon }}" target="_blank">Mastodon</a></li>
<li><a class="footer-link" href="/community/">Forum</a></li>
<li><a class="footer-link" href="/community/">Chat</li>
<li><a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .URL | relLangURL }}">Onion Website</a></li>
<li><a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .RelPermalink | relLangURL }}">Onion Website</a></li>
</ul>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions themes/hugo-bootstrap/layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

<link href="{{ .Site.BaseURL }}css/style.css" rel="stylesheet">

{{ if .RSSLink }}
<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
{{ $site_title := .Site.Title }}
{{ with .OutputFormats.Get "RSS" }}
<link href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" title="{{ $site_title }}" />
<link href="{{ .RelPermalink }}" rel="feed" type="application/rss+xml" title="{{ $site_title }}" />
{{ end }}

{{ partial "head-custom.html" . }}
Expand Down
6 changes: 3 additions & 3 deletions themes/hugo-bootstrap/layouts/partials/announcements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!--- jumbotron Showing the next event --->

<!-- Find the next event -->
{{ $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 }}

<!-- Find the last post -->
{{ $posts := where .Pages "Section" "post" }}
{{ $posts := where .Site.RegularPages "Section" "post" }}
{{ $last_post := last 1 $posts.ByDate }}

<!-- Show event if there is one and if not show the last
Expand Down
4 changes: 2 additions & 2 deletions themes/hugo-bootstrap/layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ <h5>{{ i18n "footer-text" }}</h5>
<p>
<a class="footer-link" href="{{ .Site.Params.ghrepo }}" target="_blank" >Website Source Code</a> |
<a class="footer-link" href="{{ .Site.Params.bugtracker }}" target="_blank">Report bug / Suggestion</a> |
<a class="footer-link" href="{{ .Site.Params.onionv2 }}{{ .URL | relLangURL }}">Tor Onion Service v2</a> |
<a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .URL | relLangURL }}">Tor Onion Service v3</a> |
<a class="footer-link" href="{{ .Site.Params.onionv2 }}{{ .RelPermalink | relLangURL }}">Tor Onion Service v2</a> |
<a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .RelPermalink | relLangURL }}">Tor Onion Service v3</a> |
<a class="footer-link" href="{{ .Site.Params.mastodon }}" target="_blank">Follow us on Mastodon</a> |
<a class="footer-link" href="{{ .Site.Params.report }}" target="_blank">Relatório Financeiro 2019</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion themes/hugo-bootstrap/layouts/partials/head-meta.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
{{if isset .Site.Params "onionv3"}}
<meta http-equiv="onion-location" content="{{ .Site.Params.onionv3 }}{{ .URL }}">
<meta http-equiv="onion-location" content="{{ .Site.Params.onionv3 }}{{ .RelPermalink }}">
{{ end }}

{{ template "_internal/opengraph.html" . }}
3 changes: 2 additions & 1 deletion themes/hugo-bootstrap/layouts/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
{{ range .Site.Menus.main }}
{{ if eq (.URL ) "/community/become-a-member" }} <!-- Make blog be a button -->
<h5> </h5>

<a class="btn btn-info " href="{{ .URL | relLangURL }}">{{ .Name }}</a>
{{ else }}
<li class="nav-item {{ if eq $url (.URL | relLangURL) }}active{{end}}">
Expand All @@ -35,7 +36,7 @@ <h5> </h5>
</a>
<div class="collapse navbar-collapse justify-content-between" id="navbarNav">
<ul class="navbar-nav">
{{ $url := .URL | relLangURL }}
{{ $url := .RelPermalink | relLangURL }}
{{ range .Site.Menus.main }}
<li class="nav-item {{ if eq $url (.URL | relLangURL) }}active{{end}}">
{{ if eq (hasPrefix .URL "mailto:") true }}
Expand Down