refactor: use relLangURL to build relative links

For better i18n support

Fixes archive page path
Remove tag cloud term exclusion

closes https://github.com/CaiJimmy/hugo-theme-stack/issues/8
This commit is contained in:
Jimmy Cai 2020-09-13 10:14:17 +02:00
parent 822eba9513
commit 2451b194dc
No known key found for this signature in database
GPG Key ID: 3EA408E527F37B18
4 changed files with 7 additions and 8 deletions

View File

@ -7,10 +7,10 @@
{{ if and $image.exists $image.resource }} {{ if and $image.exists $image.resource }}
{{- $imageRaw := $image.resource | resources.Fingerprint "md5" -}} {{- $imageRaw := $image.resource | resources.Fingerprint "md5" -}}
{{- $20x := $imageRaw.Fill "20x20 smart" -}} {{- $20x := $imageRaw.Fill "20x20 smart" -}}
<a href="/categories/{{ . | urlize }}" class="color-tag" <a href="{{ printf `categories/%s` (. | urlize) | relLangURL }}" class="color-tag"
data-image="{{ $20x.RelPermalink }}" data-key="{{ $context.Slug }}" data-hash="{{ $imageRaw.Data.Integrity }}">{{ . | humanize }}</a> data-image="{{ $20x.RelPermalink }}" data-key="{{ $context.Slug }}" data-hash="{{ $imageRaw.Data.Integrity }}">{{ . | humanize }}</a>
{{ else }} {{ else }}
<a href="/categories/{{ . | urlize }}">{{ . | humanize }}</a> <a href="{{ printf `categories/%s` (. | urlize) | relLangURL }}">{{ . | humanize }}</a>
{{ end }} {{ end }}
{{ end }} {{ end }}
</header> </header>

View File

@ -2,7 +2,7 @@
{{ with $tags := .Params.Tags }} {{ with $tags := .Params.Tags }}
<section class="article-tags"> <section class="article-tags">
{{ range $tags }} {{ range $tags }}
<a href="/tags/{{ . | urlize }}">{{ . | humanize }}</a> <a href="{{ printf `tags/%s` (. | urlize) | relLangURL }}">{{ . | humanize }}</a>
{{ end }} {{ end }}
</section> </section>
{{ end }} {{ end }}

View File

@ -12,7 +12,7 @@
{{ range first .Site.Params.widgets.archive.limit ($archive) }} {{ range first .Site.Params.widgets.archive.limit ($archive) }}
{{ $id := lower (replace .Key " " "-") }} {{ $id := lower (replace .Key " " "-") }}
<div class="archive-year"> <div class="archive-year">
<a href="{{ $.Site.BaseURL }}{{ $.Site.Params.widgets.archive.path }}#{{ $id }}"> <a href="{{ $.Site.Params.widgets.archive.path | relLangURL }}#{{ $id }}">
<span class="year">{{ .Key }}</span> <span class="year">{{ .Key }}</span>
<span class="count">{{ len .Pages }}</span> <span class="count">{{ len .Pages }}</span>
</a> </a>
@ -21,7 +21,7 @@
{{ if gt (len $archive) .Site.Params.widgets.archive.limit }} {{ if gt (len $archive) .Site.Params.widgets.archive.limit }}
<div class="archive-year"> <div class="archive-year">
<a href="{{ $.Site.BaseURL }}/archive"> <a href="{{ $.Site.Params.widgets.archive.path | relLangURL }}">
<span class="year">{{ T "widgetArchiveMore" }}</span> <span class="year">{{ T "widgetArchiveMore" }}</span>
</a> </a>
</div> </div>

View File

@ -1,5 +1,4 @@
{{ $tags := .Site.Taxonomies.tags.ByCount }} {{ $tags := .Site.Taxonomies.tags.ByCount }}
{{ $v2 := where $tags "Term" "not in" (slice "hugo" "tag" "rss") }}
<section class="widget tagCloud"> <section class="widget tagCloud">
<div class="widget-icon"> <div class="widget-icon">
@ -8,8 +7,8 @@
<h1 class="widget-title">{{ T "widgetTagCloudTitle" }}</h1> <h1 class="widget-title">{{ T "widgetTagCloudTitle" }}</h1>
<div class="tagCloud-tags"> <div class="tagCloud-tags">
{{ range first .Site.Params.widgets.tagCloud.limit $v2 }} {{ range first .Site.Params.widgets.tagCloud.limit $tags }}
<a href="{{ $.Site.BaseURL }}tags/{{ .Term | urlize }}/" class="font_size_{{ .Count }}"> <a href="{{ printf `tags/%s` (.Term | urlize) | relLangURL }}" class="font_size_{{ .Count }}">
{{ .Term | humanize }} {{ .Term | humanize }}
</a> </a>
{{ end }} {{ end }}