From cafec4b44ccbab5a6b0f88916dd20ee4d2782a9a Mon Sep 17 00:00:00 2001
From: Jan-Lukas Else <mail@jlelse.de>
Date: Wed, 20 Nov 2019 08:53:32 +0100
Subject: [PATCH] Add option to display full content in summary, merge links
 into default layouts, display post series

---
 layouts/_default/single.html    |  3 +++
 layouts/_default/summary.html   | 15 +++++++++++++++
 layouts/links/single.html       | 22 ----------------------
 layouts/links/summary.html      | 18 ------------------
 layouts/partials/post_tags.html | 11 +++++++----
 5 files changed, 25 insertions(+), 44 deletions(-)
 delete mode 100644 layouts/links/single.html
 delete mode 100644 layouts/links/summary.html

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index c9ae908..ec76ee1 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -14,6 +14,9 @@
 			<p><audio controls	preload="metadata" style="width: 100%;"><source src="{{ . }}"/></audio></p>
 			{{ end }}
 			{{ .Content }}
+			{{ with .Params.externalUrl }}
+			<p>{{ . | markdownify }}</p>
+			{{ end }}
 		</div>
 		{{ partial "post_tags.html" . }}
 	</article>
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 36c9efd..48f9607 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,18 +1,33 @@
 <article class="list-item h-entry">
 	<div class="list-header">
 		{{ if .Title }}
+		{{ if .Params.externalURL }}
+		<a href="{{ .Params.externalURL }}">
+			<h2 class="list-title p-name">{{ .Title }}</h2>
+		</a>
+		{{ else }}
 		<a href="{{ .RelPermalink }}">
 			<h2 class="list-title p-name">{{ .Title }}</h2>
 		</a>
 		{{ end }}
+		{{ end }}
 		{{ with partial "post_meta.html" . }}
 		<div class="list-meta">{{ . }}</div>
 		{{ end }}
 	</div>
+	{{ if .Params.showFull }}
+	<div class="list-excerpt e-content">
+		{{ .Content }}
+	</div>
+	<div class="list-footer">
+		<a class="read-more u-url" href="{{ .RelPermalink }}">{{ T "permalink" }}</a>
+	</div>
+	{{ else }}
 	<div class="list-excerpt p-summary">
 		{{ .Summary }}
 	</div>
 	<div class="list-footer">
 		<a class="u-url read-more" href="{{ .RelPermalink }}">{{ T "read_more" }}</a>
 	</div>
+	{{ end }}
 </article>
\ No newline at end of file
diff --git a/layouts/links/single.html b/layouts/links/single.html
deleted file mode 100644
index c3a7e49..0000000
--- a/layouts/links/single.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ define "main" }}
-<main class="main h-entry">
-	<article>
-		<header class="main-header">
-			{{ with .Title }}
-			<h1 class="p-name post-title">{{ . }}</h1>
-			{{ end }}
-			{{ with partial "post_meta.html" . }}
-			<div class="post-meta">{{ . }}</div>
-			{{ end }}
-		</header>
-		<div class="e-content content clearfix">
-			{{ .Content }}
-			<p>{{ .Params.externalUrl | markdownify }}</p>
-		</div>
-		{{ partial "post_tags.html" . }}
-	</article>
-	{{ partial "authorbox.html" . }}
-</main>
-{{ partial "webmentionform" . }}
-{{ partial "post_nav.html" . }}
-{{ end }}
\ No newline at end of file
diff --git a/layouts/links/summary.html b/layouts/links/summary.html
deleted file mode 100644
index ada91a9..0000000
--- a/layouts/links/summary.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<article class="list-item h-entry">
-	<div class="list-header">
-		{{ if .Title }}
-		<a href="{{ .Params.externalURL }}">
-			<h2 class="list-title p-name">{{ .Title }}</h2>
-		</a>
-		{{ end }}
-		{{ with partial "post_meta.html" . -}}
-		<div class="list-meta">{{ . }}</div>
-		{{- end }}
-	</div>
-	<div class="list-excerpt e-content">
-		{{ .Content }}
-	</div>
-	<div class="list-footer">
-		<a class="read-more u-url" href="{{ .RelPermalink }}">{{ T "permalink" }}</a>
-	</div>
-</article>
\ No newline at end of file
diff --git a/layouts/partials/post_tags.html b/layouts/partials/post_tags.html
index fc4eb50..da87d2b 100644
--- a/layouts/partials/post_tags.html
+++ b/layouts/partials/post_tags.html
@@ -1,9 +1,12 @@
-{{- if .Params.tags }}
+{{ if or .Params.tags .Params.series }}
 <div class="tags">
 	<ul class="tags-list">
-		{{- range .Params.tags }}
+		{{ range .Params.series }}
+		<li class="tag-item"><a class="tag-link" href="{{ "series/" | relLangURL }}{{ . | urlize }}/">{{ . }}</a></li>
+		{{ end }}
+		{{ range .Params.tags }}
 		<li class="tag-item"><a class="tag-link p-category" href="{{ "tags/" | relLangURL }}{{ . | urlize }}/" rel="tag">{{ . }}</a></li>
-		{{- end }}
+		{{ end }}
 	</ul>
 </div>
-{{- end }}
\ No newline at end of file
+{{ end }}
\ No newline at end of file