From ec722fa11f5355c4e78a4171aaba9ca2cf9c969e Mon Sep 17 00:00:00 2001
From: Jan-Lukas Else <mail@jlelse.de>
Date: Mon, 20 Apr 2020 20:12:21 +0200
Subject: [PATCH] Fix things, sort tags

---
 layouts/_default/list.html      |  2 +-
 layouts/_default/single.html    |  2 +-
 layouts/partials/post_tags.html | 14 ++++++++++----
 layouts/photos/list.html        |  2 +-
 layouts/tags/terms.html         |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e6c0e67..7c19bd6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -5,7 +5,7 @@
 		<h1 class="main-title">{{ . }}</h1>
 		{{ end }}
 		{{ if not .Params.nometa }}
-		{{ with partialCached "list_meta" . .RelPermalink }}
+		{{ with partial "list_meta" . }}
 		<div class="post-meta">{{ . }}</div>
 		{{ end }}
 		{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 8f11442..1b6e689 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,7 +7,7 @@
 			{{ end }}
 			{{ if not .Params.nometa }}
 			<div class="post-meta">
-				{{ partialCached "post_meta" . .RelPermalink }}
+				{{ partial "post_meta" . }}
 				{{ if (.Param "speak") }}
 				<div id="speakBtn" class="item" style="display: none;"></div>
 				{{ $speakScript := resources.Get "js/speak.js" | minify | fingerprint }}
diff --git a/layouts/partials/post_tags.html b/layouts/partials/post_tags.html
index da4fca2..de8cc2b 100644
--- a/layouts/partials/post_tags.html
+++ b/layouts/partials/post_tags.html
@@ -1,12 +1,18 @@
 {{ if or (.GetTerms "tags") (.GetTerms "series") }}
 <div class="tags">
+	{{ with (.GetTerms "series") }}
 	<ul class="tags-list">
-		{{ range (.GetTerms "series") }}
-		<li class="tag-item"><div class="tag-link"><a class="p-category" href="{{ .RelPermalink }}" rel="tag">{{ .Title }}</a><sup>{{ len .Pages }}</sup></div></li>
-		{{ end }}
-		{{ range (.GetTerms "tags") }}
+		{{ range sort . "Pages" "desc" }}
 		<li class="tag-item"><div class="tag-link"><a class="p-category" href="{{ .RelPermalink }}" rel="tag">{{ .Title }}</a><sup>{{ len .Pages }}</sup></div></li>
 		{{ end }}
 	</ul>
+	{{ end }}
+	{{ with (.GetTerms "tags") }}
+	<ul class="tags-list">
+		{{ range sort . "Pages" "desc" }}
+		<li class="tag-item"><div class="tag-link"><a class="p-category" href="{{ .RelPermalink }}" rel="tag">{{ .Title }}</a><sup>{{ len .Pages }}</sup></div></li>
+		{{ end }}
+	</ul>
+	{{ end }}
 </div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/photos/list.html b/layouts/photos/list.html
index f9e10ac..81146b6 100644
--- a/layouts/photos/list.html
+++ b/layouts/photos/list.html
@@ -5,7 +5,7 @@
 		<h1 class="main-title">{{ . }}</h1>
 		{{ end }}
 		{{ if not .Params.nometa }}
-		{{ with partialCached "list_meta" . .RelPermalink }}
+		{{ with partial "list_meta" . }}
 		<div class="post-meta">{{ . }}</div>
 		{{ end }}
 		{{ end }}
diff --git a/layouts/tags/terms.html b/layouts/tags/terms.html
index f87cdd9..4faee69 100644
--- a/layouts/tags/terms.html
+++ b/layouts/tags/terms.html
@@ -5,7 +5,7 @@
 		<h1 class="main-title">{{ . }}</h1>
 		{{ end }}
 		{{ if not .Params.nometa }}
-		{{ with partialCached "list_meta" . .RelPermalink }}
+		{{ with partial "list_meta" . }}
 		<div class="post-meta">{{ . }}</div>
 		{{ end }}
 		{{ end }}