Merge branch 'main' into drafts

This commit is contained in:
John Bowdre 2024-06-01 22:00:56 -05:00
commit f5f10845b4

View file

@ -11,15 +11,14 @@
<i>My collection of <a target="_blank" title="what's a slashpage?" href="https://slashpages.net">slash pages</a>.</i><hr> <i>My collection of <a target="_blank" title="what's a slashpage?" href="https://slashpages.net">slash pages</a>.</i><hr>
{{ else }} {{ else }}
<h1>{{ .Title | markdownify }}{{ if eq .Kind "term" }}&nbsp;<a target="_blank" href="{{ .Permalink }}feed.xml" aria-label="{{ .Title }} RSS" title="{{ .Title }} RSS"><i class="fa-solid fa-square-rss"></i></a>&nbsp;</h1> <h1>{{ .Title | markdownify }}{{ if eq .Kind "term" }}&nbsp;<a target="_blank" href="{{ .Permalink }}feed.xml" aria-label="{{ .Title }} RSS" title="{{ .Title }} RSS"><i class="fa-solid fa-square-rss"></i></a>&nbsp;</h1>
{{ with .Description }}<i>{{ . }}</i><hr>{{ else }}<br>{{ end }} {{ with .Description }}<i>{{ . }}</i>{{ end }}
{{ end }} {{ end }}
<hr>
{{ end }}{{ end }} {{ end }}{{ end }}
{{ .Content }} {{ .Content }}
</header> </header>
{{- if and (eq .Kind "taxonomy") (eq .Title "Tags") }}
{{- if eq .Kind "taxonomy" }} {{/* /tags/ */}}
{{- if eq .Title "Tags" }}
{{/* list of all tags */}}
<div class="tagsArchive"> <div class="tagsArchive">
{{- range $key, $value := .Site.Taxonomies }} {{- range $key, $value := .Site.Taxonomies }}
{{- $slicedTags := ($value.ByCount) }} {{- $slicedTags := ($value.ByCount) }}
@ -30,9 +29,10 @@
{{- end }} {{- end }}
{{- end }} {{- end }}
</div> </div>
{{- else }} {{- else if or (eq .Kind "taxonomy") (eq .Title "/slashes") }}
{{/* list of all categories */}} {{/* /categories/ or /slashes/ */}}
{{- range .Pages.ByDate.Reverse }} {{- $sorted := sort $pages "Title" }}
{{- range $sorted }}
{{- $postDate := .Date.Format "2006-01-02" }} {{- $postDate := .Date.Format "2006-01-02" }}
{{- $updateDate := .Lastmod.Format "2006-01-02" }} {{- $updateDate := .Lastmod.Format "2006-01-02" }}
<article class="post"> <article class="post">
@ -48,28 +48,7 @@
<hr> <hr>
</article> </article>
{{ end }} {{ end }}
{{- end }}
{{- else }} {{- else }}
{{- if eq .Title "/slashes" }}
{{/* slash page archive */}}
{{- $sortedSlashes := sort $pages "Title" }}
{{- range $sortedSlashes }}
{{- $postDate := .Date.Format "2006-01-02" }}
{{- $updateDate := .Lastmod.Format "2006-01-02" }}
<article class="post">
<header class="post__header">
<h1><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h1>
<p class="post__meta">
<span class="date">["{{ with $updateDate }}{{ . }}{{ else }}{{ $postDate }}{{ end }}"]</span>
</p>
</header>
<section class="post__summary">
{{ .Description }}
</section>
<hr>
</article>
{{- end }}
{{- else }}
{{/* regular posts archive */}} {{/* regular posts archive */}}
{{- range (.Paginate $pages).Pages }} {{- range (.Paginate $pages).Pages }}
{{- $postDate := .Date.Format "2006-01-02" }} {{- $postDate := .Date.Format "2006-01-02" }}
@ -88,5 +67,4 @@
</article> </article>
{{- end }} {{- end }}
{{- template "_internal/pagination.html" . }} {{- template "_internal/pagination.html" . }}
{{- end }}
{{- end }} {{- end }}