🔧 Re Change default section display not use archive page.

2022-07-30 17:39:57 +08:00
parent 832953372a
commit 6cbffe48b7
10 changed files with 95 additions and 56 deletions
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,3 @@
-{{- if and .Page.IsSection (eq .Section "archives") }}
-  {{- $paginator := (.Paginate (where .Page.Site.RegularPages "Section" "in" .Site.Params.mainSections)).Pages.GroupByDate "2006" }}
-  {{ partial "list.html" $paginator }}
-{{ else }}
-  {{- $paginator := .Paginator.Pages.GroupByDate "2006" }}
-  {{ partial "list.html" $paginator }}
-{{- end }}
+{{ $paginator := .Paginator.Pages.GroupByDate "2006" }}
+{{ partial "list.html" $paginator }}
+
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -1,39 +1,15 @@
 {{- define "title" }}
 {{- .Params.Title | default (T .Section) | default .Section | dict "Some" | T "AllSome" }} - {{ .Site.Title -}}
 {{- end -}}
-{{ define "main_inner_class" }}archive posts-collapse{{ end }}
-{{- define "main" }}
-<div class="post-block">
-  <div class="post-content">
-    <div class="collection-title">
-      {{- $cheers := "Um" }}
-      {{- $posts := .Scratch.Get "postsCount" }}
-      {{- if and .Page.IsSection (ne .Section "archives") }}
-        {{- $posts = .Scratch.Get .Section }}
-      {{- end }}
-      {{- if gt $posts 210 }}
-      {{- $cheers = "Excellent" }}
-      {{- else if gt $posts 130 }}
-      {{- $cheers = "Great" }}
-      {{- else if gt $posts 80 }}
-      {{- $cheers = "Good" }}
-      {{- else if gt $posts 50 }}
-      {{- $cheers = "Nice" }}
-      {{- else if gt $posts 30 }}
-      {{- $cheers = "Ok" }}
-      {{- end }}
-      <span class="collection-header">
-        {{- T (printf "PostArchiveCheers%s" $cheers) }}
-        {{- T "SymbolComma" }}
-        {{- T "ArchiveCounterTitle" $posts | safeHTML }}
-        {{- T "SymbolComma" }}
-        {{- T "PostArchiveKeepOn" }}
-      </span>
-    </div>
+{{ define "main_inner_class" }}index posts-expand{{ end }}

-    {{ .Render "list" }} 
-    
-  </div>
-</div>
-{{- partial "pagination.html" . }}
+{{- define "main" }}
+
+{{ $paginator := .Paginate (where .Site.RegularPages "Section" "==" .Section) }}
+{{- range $paginator.Pages }}
+  {{ partial "post.html"  (dict "ctx" . "IsHome" true) }}
+{{- end }}
+
+{{- partial "partials/pagination.html" . }} 
+ 
 {{- end }}
--- a/layouts/archives/list.html
+++ b/layouts/archives/list.html
@@ -0,0 +1,2 @@
+{{ $paginator := (.Paginate (where .Page.Site.RegularPages "Section" "in" .Site.Params.mainSections)).Pages.GroupByDate "2006" }}
+{{ partial "list.html" $paginator }}
--- a/layouts/archives/section.html
+++ b/layouts/archives/section.html
@@ -0,0 +1,36 @@
+{{- define "title" }}
+{{- .Params.Title | default (T .Section) | default .Section | dict "Some" | T "AllSome" }} - {{ .Site.Title -}}
+{{- end -}}
+{{ define "main_inner_class" }}archive posts-collapse{{ end }}
+{{- define "main" }}
+<div class="post-block">
+  <div class="post-content">
+    <div class="collection-title">
+      {{- $cheers := "Um" }}
+      {{- $posts := .Scratch.Get "postsCount" }}      
+      {{- if gt $posts 210 }}
+      {{- $cheers = "Excellent" }}
+      {{- else if gt $posts 130 }}
+      {{- $cheers = "Great" }}
+      {{- else if gt $posts 80 }}
+      {{- $cheers = "Good" }}
+      {{- else if gt $posts 50 }}
+      {{- $cheers = "Nice" }}
+      {{- else if gt $posts 30 }}
+      {{- $cheers = "Ok" }}
+      {{- end }}
+      <span class="collection-header">
+        {{- T (printf "PostArchiveCheers%s" $cheers) }}
+        {{- T "SymbolComma" }}
+        {{- T "ArchiveCounterTitle" $posts | safeHTML }}
+        {{- T "SymbolComma" }}
+        {{- T "PostArchiveKeepOn" }}
+      </span>
+    </div>
+
+    {{ .Render "list" }} 
+    
+  </div>
+</div>
+{{- partial "pagination.html" . }}
+{{- end }}
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,8 +1,11 @@
 {{- define "main_inner_class" }}index posts-expand{{- end }}
+
 {{- define "main" }}
+
 {{ $paginator := .Paginate (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }}
 {{- range $paginator.Pages }}
-{{ partial "post.html"  (dict "ctx" . "IsHome" true) }}
+  {{ partial "post.html"  (dict "ctx" . "IsHome" true) }}
 {{- end }}
+
 {{- partial "partials/pagination.html" . }}  
 {{- end }}
--- a/layouts/partials/init.html
+++ b/layouts/partials/init.html
@@ -1,22 +1,20 @@
 {{/* Use to defind global variables */}}

-{{ if not hugo.IsExtended }}
-{{ warnf "Hugo NexT 主题使用了 SCSS 框架，请到官方地址下载 Hugo Extended 版本：https://github.com/gohugoio/hugo/releases" }}  
-{{ errorf "Because that use SCSS framework in Hugo NexT, Please download Hugo extended version on offical site: https://github.com/gohugoio/hugo/releases" }}  
-{{ end }}
-
 {{ $version := int (index (split hugo.Version ".") 1) }}
 {{ if lt $version 89 }}
-{{ warnf "当前 Hugo 版本小于 0.89.0，请到官方地址下载 Hugo 最新版本：https://github.com/gohugoio/hugo/releases" }}  
-{{ errorf "Current Hugo version is less then 0.89.0, Please download Hugo latest version on offical site: https://github.com/gohugoio/hugo/releases" }}  
+  {{ warnf "当前 Hugo 版本小于 0.89.0，请到官方地址下载 Hugo 最新版本：https://github.com/gohugoio/hugo/releases" }}  
+  {{ errorf "Current Hugo version is less then 0.89.0, Please download Hugo latest version on offical site: https://github.com/gohugoio/hugo/releases" }}  
 {{ end }}

+{{ if not hugo.IsExtended }}
+  {{ warnf "Hugo NexT 主题使用了 SCSS 框架，请到官方地址下载 Hugo Extended 版本：https://github.com/gohugoio/hugo/releases" }}  
+  {{ errorf "Because that use SCSS framework in Hugo NexT, Please download Hugo extended version on offical site: https://github.com/gohugoio/hugo/releases" }}  
+{{ end }}
+
+
 {{ $globalVars := newScratch }}

 {{ $globalVars.Set "postsCount" (len (where .Page.Site.RegularPages "Section" "in" .Site.Params.mainSections)) }}
-{{ range .Site.Params.mainSections }}
-  {{ $globalVars.Set .  (len (where $.Page.Site.RegularPages "Section" .))}} 
-{{ end }}
 {{ $globalVars.Set "catsCount" (len .Site.Taxonomies.categories) }}
 {{ $globalVars.Set "tagsCount" (len .Site.Taxonomies.tags)  }}

--- a/layouts/partials/list.html
+++ b/layouts/partials/list.html
@@ -6,8 +6,8 @@
 <article itemscope itemtype="http://schema.org/Article">
  <header class="post-header">
    <div class="post-meta-container">
-      {{ $month := .Date.Format "01-02" }}
-      <time itemprop="dateCreated" datetime="{{ .Date.Format "2006-01-02T15:04:05-07:00" }}" content="{{ $month }}">
+      {{ $month := .Date.Format .Site.Params.monthFormat }}
+      <time itemprop="dateCreated" datetime="{{ .Date.Format .Site.Params.timeFormat }}" content="{{ $month }}">
        {{ $month }}
      </time>
    </div>