Don't re-print the name of series when listing pages

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>

layouts/_default/list.html

@@ -4,7 +4,7 @@
 
 <ul class="post-list">
     {{ range .Pages.ByDate.Reverse }}
-    {{ partial "post.html" . }}
+    {{ partial "post.html" (dict "page" .) }}
     {{ end }}
 </ul>
 {{ end }}

layouts/blog/single.html

@@ -33,10 +33,10 @@
 {{ $pages := (site.Taxonomies.series.Get .Data.Term).Pages.ByDate.Reverse }}
 <nav id="SeriesNavigation" class="container">
 {{ with $pages.Prev page }}
-{{ partial "serieslink.html" (dict "direction" "previous" "link" .RelPermalink "term" $term "page" .) }}
+{{ partial "serieslink.html" (dict "direction" "previous" "link" .RelPermalink "page" .) }}
 {{ end }}
 {{ with $pages.Next page }}
-{{ partial "serieslink.html" (dict "direction" "next" "link" .RelPermalink "term" $term "page" .) }}
+{{ partial "serieslink.html" (dict "direction" "next" "link" .RelPermalink "page" .) }}
 {{ end }}
 </nav>
 {{ end }}

layouts/favorites/single.html

@@ -4,7 +4,7 @@
 
 <ul class="post-list">
     {{ range (where (where .Site.Pages.ByDate.Reverse "Section" "blog") ".Kind" "!=" "section") }}
-    {{ if .Params.favorite }}{{ partial "post.html" . }}{{ end }}
+    {{ if .Params.favorite }}{{ partial "post.html" (dict "page" .) }}{{ end }}
     {{ end }}
 </ul>
 {{ end }}

layouts/index.html

@@ -4,7 +4,7 @@
 {{ i18n "recentPosts" }}:
 <ul class="post-list">
     {{ range first 10 (where (where .Site.Pages.ByDate.Reverse "Section" "blog") ".Kind" "!=" "section") }}
-    {{ partial "post.html" . }}
+    {{ partial "post.html" (dict "page" .) }}
     {{ end }}
 </ul>
 

layouts/partials/nameinseries.html

@@ -0,0 +1,8 @@
+{{- $term := index (.page.GetTerms "series") 0 -}}
+{{- $divider := $term.Params.divider -}}
+{{- if (and $divider (strings.Contains .page.Title $divider)) -}}
+{{- $rest := after 1 (split .page.Title $divider) -}}
+{{- .scratch.Set "name" (delimit $rest $divider) -}}
+{{- else -}}
+{{- .scratch.Set "name" .page.Title -}}
+{{- end -}}

layouts/partials/post.html

@@ -1,12 +1,18 @@
 <li>
-    <a href="{{ .Permalink }}" class="post-title">{{ if .Params.favorite }}{{ partial "icon.html" "star" }}{{ end }} {{ .Title }}</a>
+    {{- $scratch := newScratch -}}
-    {{ if (not (eq .WordCount 0)) }}
+    {{- if .seriesName -}}
-    <p class="post-wordcount">{{ i18n "nWords" .WordCount }}, {{ i18n "nMinutesToRead" .ReadingTime }}.</p>
+    {{- partial "nameinseries" (dict "page" .page "scratch" $scratch) -}}
+    {{- else -}}
+    {{- $scratch.Set "name" (.page.Title) -}}
+    {{- end -}}
+    <a href="{{ .page.Permalink }}" class="post-title">{{ if .page.Params.favorite }}{{ partial "icon.html" "star" }}{{ end }} {{ $scratch.Get "name" }}</a>
+    {{ if (not (eq .page.WordCount 0)) }}
+    <p class="post-wordcount">{{ i18n "nWords" .page.WordCount }}, {{ i18n "nMinutesToRead" .page.ReadingTime }}.</p>
     {{ end }}
-    {{ if .Params.status }}
+    {{ if .page.Params.status }}
     <p class="post-status">
-    {{ partial "seriesstatus.html" .Params.status }}
+    {{ partial "seriesstatus.html" .page.Params.status }}
     </p>
     {{ end }}
-    <p class="post-preview">{{ .Summary }} {{ if .Truncated }}. . .{{ end }}</p>
+    <p class="post-preview">{{ .page.Summary }} {{ if .page.Truncated }}. . .{{ end }}</p>
 </li>

layouts/partials/serieslink.html

@@ -3,13 +3,9 @@
     {{ if eq .direction "previous" }}{{ partial "icon.html" "chevrons-left" }}{{ end }}
     <div class="title-subtitle">
       {{ title .direction }} in Series
-      {{ $divider := .term.Params.divider }}
+      {{ $scratch := newScratch -}}
-      {{ if (and $divider (strings.Contains .page.Title $divider)) }}
+      {{- partial "nameinseries.html" (dict "page" .page "scratch" $scratch) -}}
-      {{ $rest := after 1 (split .page.Title $divider) }}
+      <div class="title">{{ $scratch.Get "name" }}</div>
-      <div class="title">{{ delimit $rest $divider }}</div>
-      {{ else }}
-      <div class="title">{{ .page.Title }}</div>
-      {{ end }}
     </div>
     {{ if eq .direction "next" }}{{ partial "icon.html" "chevrons-right" }}{{ end }}
   </a>

layouts/series/list.html

@@ -11,7 +11,7 @@
 
 <ul class="post-list">
     {{ range $pages }}
-    {{ partial "post.html" . }}
+    {{ partial "post.html" (dict "page" . "seriesName" true) }}
     {{ end }}
 </ul>
 {{ end }}

layouts/series/terms.html

@@ -4,7 +4,7 @@
 
 <ul class="post-list">
     {{ range sort .Pages "Title" }}
-    {{ partial "post.html" . }}
+    {{ partial "post.html" (dict "page" .) }}
     {{ end }}
 </ul>
 {{ end }}

layouts/tags/list.html

@@ -3,7 +3,7 @@
 
 <ul class="post-list">
     {{ range .Pages.ByDate.Reverse }}
-    {{ partial "post.html" . }}
+    {{ partial "post.html" (dict "page" .) }}
     {{ end }}
 </ul>
 {{ end }}