Fix the issue where author is displaying as array
This commit is contained in:
firmart
parent
89f088814b
commit
c8a67bd605
|
|
@ -9,7 +9,6 @@
|
|||
{{ .Content }}
|
||||
</div>
|
||||
</header>
|
||||
<<<<<<< HEAD
|
||||
<main class="main archive">
|
||||
<div class="archive__container">
|
||||
{{ $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 }}
|
||||
<main class="main archive">
|
||||
<div class="archive__container">
|
||||
{{ $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
|
||||
<span class="archive__key" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">{{ .Key }}</span>
|
||||
<ul class="archive__ul" data-dir="{{ $.Param "languagedir" | default "ltr" }}">
|
||||
{{ range .Pages }}
|
||||
|
|
@ -51,7 +36,6 @@
|
|||
</li>
|
||||
{{ end }}
|
||||
</ul>
|
||||
<<<<<<< HEAD
|
||||
{{ end }}
|
||||
{{ else }}
|
||||
{{ i18n "no-contents" | default "There is nothing to display" }}
|
||||
|
|
@ -66,17 +50,3 @@
|
|||
{{ partial "script/archive-script" . }}
|
||||
</main>
|
||||
{{ end }}
|
||||
=======
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</div>
|
||||
<div class="grow"></div>
|
||||
{{ partial "pagination/pagination" . }}
|
||||
<div class="hide">
|
||||
{{ partial "search/site-search" . }}
|
||||
</div>
|
||||
{{ partial "script/archive-script" . }}
|
||||
</main>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
|
||||
|
|
|
|||
|
|
@ -6,11 +6,7 @@
|
|||
{{ end }}
|
||||
· <span class="single__info" title="{{ i18n "tooltip-reading-time" }}"> {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }} </span>
|
||||
{{ with .Params.Author }}
|
||||
<<<<<<< HEAD
|
||||
· <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }}</span>
|
||||
=======
|
||||
· <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
|
||||
· <span class="single__info" title="{{ i18n "single-writtenBy" }}">{{if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
{{ end }}
|
||||
<span class="single__info">
|
||||
{{ if (and .Site.Params.enableBusuanzi .Site.Params.busuanziPagePV) }} · {{ ($.Site.Params.pagePvIcon | safeHTML) | default "👀" }}<span id="busuanzi_value_page_pv">...</span> {{ i18n "counter-page-pv" }}{{ end }}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,7 @@
|
|||
{{ end }}
|
||||
<span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> · {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }}</span>
|
||||
{{ with $.Param "author" }}
|
||||
<<<<<<< HEAD
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }}</span>
|
||||
=======
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "AuthorEmoji" }}{{ $.Param "AuthorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
{{ end }}
|
||||
</h6>
|
||||
</header>
|
||||
|
|
|
|||
|
|
@ -25,11 +25,7 @@
|
|||
{{ end }}
|
||||
<span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> · {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }} </span>
|
||||
{{ with $.Param "author" }}
|
||||
<<<<<<< HEAD
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }}</span>
|
||||
=======
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $.Param "authorEmoji" }}{{ $.Param "authorEmoji" }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
{{ end }}
|
||||
</h6>
|
||||
</header>
|
||||
|
|
|
|||
|
|
@ -11,11 +11,7 @@
|
|||
{{ end }}
|
||||
<span title="{{ i18n "tooltip-reading-time" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}"> · {{ ($.Site.Params.readingTimeIcon | safeHTML) | default "☕" }} {{ .ReadingTime }} {{ i18n "reading-time" }}</span>
|
||||
{{ with $params.Author }}
|
||||
<<<<<<< HEAD
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ . }}</span>
|
||||
=======
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}✍️{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
>>>>>>> 7fcf1bc41734ab53012ec651fbd8ba9b28fd542a
|
||||
· <span title="{{ i18n "single-writtenBy" }}" dir="{{ if ne ($.Param "languagedir") "rtl" }}ltr{{ else }}rtl{{ end }}">{{ if $params.AuthorEmoji }}{{ $params.AuthorEmoji }}{{ else }}{{ ($.Site.Params.authorIcon | safeHTML) | default "✍️" }}{{ end }} {{ partial "head/author.html" . }}</span>
|
||||
{{ end }}
|
||||
</h6>
|
||||
</header>
|
||||
|
|
|
|||
Loading…
Reference in New Issue