From c8a67bd6055bc0516d04d5a0e86be8e78e909e2e Mon Sep 17 00:00:00 2001 From: firmart Date: Mon, 1 Mar 2021 12:50:41 +0100 Subject: [PATCH] Fix the issue where author is displaying as array --- layouts/archive/list.html | 30 --------------------------- layouts/partials/body/infos.html | 6 +----- layouts/partials/summary/card.html | 6 +----- layouts/partials/summary/classic.html | 6 +----- layouts/partials/summary/compact.html | 6 +----- 5 files changed, 4 insertions(+), 50 deletions(-) diff --git a/layouts/archive/list.html b/layouts/archive/list.html index ae66c69..746422c 100644 --- a/layouts/archive/list.html +++ b/layouts/archive/list.html @@ -9,7 +9,6 @@ {{ .Content }} -<<<<<<< HEAD
{{ $filteredPages := .Site.RegularPages }} @@ -20,20 +19,6 @@ {{ if gt (len $filteredPages) 0 }} {{ $paginator := .Paginate ($filteredPages.GroupByDate ($.Param "archiveGroupByDate" | default "2006")) ($.Param "archivePaginate") }} {{ range ($paginator).PageGroups }} -======= -{{ if .Pages }} -
-
- {{ $filteredPages := .Site.RegularPages }} - {{ range $.Param "notAllowedTypesInArchive" }} - {{ $filteredPages = (where $filteredPages "Type" "!=" (lower .)) }} - {{ end }} - - {{ $paginator := .Paginate ($filteredPages.GroupByDate ($.Param "archiveGroupByDate" | default "2006")) ($.Param "archivePaginate") }} - - {{ if $paginator }} - {{ range ($paginator).PageGroups }} ->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a {{ .Key }}
    {{ range .Pages }} @@ -51,7 +36,6 @@ {{ end }}
-<<<<<<< HEAD {{ end }} {{ else }} {{ i18n "no-contents" | default "There is nothing to display" }} @@ -66,17 +50,3 @@ {{ partial "script/archive-script" . }}
{{ end }} -======= - {{ end }} - {{ end }} -
-
- {{ partial "pagination/pagination" . }} -
- {{ partial "search/site-search" . }} -
- {{ partial "script/archive-script" . }} -
-{{ end }} -{{ end }} ->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a diff --git a/layouts/partials/body/infos.html b/layouts/partials/body/infos.html index 1f1c8b1..0f82f2d 100644 --- a/layouts/partials/body/infos.html +++ b/layouts/partials/body/infos.html @@ -6,11 +6,7 @@ {{ end }}  ·  {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }} {{ with .Params.Author }} -<<<<<<< HEAD -  ·  {{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }} -======= -  ·  {{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }} ->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a +  ·  {{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }} {{ end }} {{ if (and .Site.Params.enableBusuanzi .Site.Params.busuanziPagePV) }} · {{ ($.Site.Params.pagePvIcon | safeHTML) | default "👀" }}... {{ i18n "counter-page-pv" }}{{ end }} diff --git a/layouts/partials/summary/card.html b/layouts/partials/summary/card.html index 146c4c4..cd9309e 100644 --- a/layouts/partials/summary/card.html +++ b/layouts/partials/summary/card.html @@ -8,11 +8,7 @@ {{ end }} · {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }} {{ with $.Param "author" }} -<<<<<<< HEAD - · {{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }} -======= - · {{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }} ->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a + · {{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }} {{ end }} diff --git a/layouts/partials/summary/classic.html b/layouts/partials/summary/classic.html index 6958a96..9946799 100644 --- a/layouts/partials/summary/classic.html +++ b/layouts/partials/summary/classic.html @@ -25,11 +25,7 @@ {{ end }} · {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }} {{ with $.Param "author" }} -<<<<<<< HEAD - · {{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }} -======= - · {{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }} ->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a + · {{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }} {{ end }} diff --git a/layouts/partials/summary/compact.html b/layouts/partials/summary/compact.html index f0195d3..6e675f7 100644 --- a/layouts/partials/summary/compact.html +++ b/layouts/partials/summary/compact.html @@ -11,11 +11,7 @@ {{ end }} · {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }} {{ with $params.Author }} -<<<<<<< HEAD - · {{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }} -======= - · {{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }} ->>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a + · {{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }} {{ end }}