From bcfd902a30d49d30723424ba40b7dd2096f5c8b3 Mon Sep 17 00:00:00 2001 From: nanxiaobei Date: Tue, 10 Mar 2020 01:50:02 +0800 Subject: [PATCH] simplify code --- layouts/_default/list.html | 20 ++++++++------------ layouts/partials/header.html | 9 +-------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 27a3185..30acea5 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,25 +1,21 @@ {{- partial "header.html" . }} -{{- $scope := . }} -{{- if .IsHome }} -{{- $scope = .Site }} -{{- else }} - -{{- end }} +{{- $scope := .Site }} +{{- if .Title }} +{{ $scope = . }} +{{ end }} {{- $paginator := .Paginate (where $scope.RegularPages ".Params.type" "!=" "page") }} {{- range $index, $page := $paginator.Pages }} -{{- $entryClass := "post-entry" }} +{{- $class := "post-entry" }} {{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }} -{{- $entryClass = "first-entry" }} +{{- $class = "first-entry" }} {{- else if .Data.Term }} -{{- $entryClass = "post-entry tag-entry" }} +{{- $class = "post-entry tag-entry" }} {{- end }} -
+

{{ .Title }}

diff --git a/layouts/partials/header.html b/layouts/partials/header.html index b2a821b..5766565 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -5,14 +5,7 @@ - - {{- if not .IsHome }} - {{- if eq .Kind "page" }}{{ .Title }}{{ else if .Data.Term }}{{ .Data.Term }}{{ else }}Tags{{ end }} - {{- print " - " }} - {{- end }} - - {{- .Site.Title -}} - + {{ if .Title }}{{ .Title }} - {{ end }}{{ .Site.Title }} {{- if eq .Kind "page" }}