From 71e742bbc5ccd3ffb455d514ab788718005d7a6b Mon Sep 17 00:00:00 2001 From: Ress Date: Fri, 17 Apr 2020 23:48:34 +0900 Subject: Put same code in "baseof.html". --- layouts/_default/archives.html | 22 +++++++++++++++ layouts/_default/baseof.html | 18 +++++++++++- layouts/_default/list.html | 60 +++++++++++++++------------------------- layouts/_default/single.html | 62 ++++++++++++++++-------------------------- layouts/_default/tag.html | 27 ++++++++++++++++++ layouts/archives/list.html | 38 -------------------------- layouts/tags/list.html | 43 ----------------------------- 7 files changed, 111 insertions(+), 159 deletions(-) create mode 100644 layouts/_default/archives.html create mode 100644 layouts/_default/tag.html delete mode 100644 layouts/archives/list.html delete mode 100644 layouts/tags/list.html diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html new file mode 100644 index 0000000..62114b2 --- /dev/null +++ b/layouts/_default/archives.html @@ -0,0 +1,22 @@ +{{ define "main" }} +
+ 文章总数：{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} +
+ +{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }} +{{ range $paginator.Pages }} +
+

+ {{ .Title }} +

+
+ {{ partial "post-meta.html" . }} +
+
+{{ end }} +{{ if gt $paginator.TotalPages 1 }} + +{{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 13f61d2..9f72153 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,7 +5,23 @@ {{ partial "header.html" . }} - {{ block "main" . }}{{ end }} +
+
+ +
+ {{ block "main" . }}{{ end }} +
+ + +
+ +
+ +
+
+
{{ partial "footer.html" . }} {{ partial "scripts.html" . }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index ef083bc..e459763 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,41 +1,25 @@ {{ define "main" }} -
-
- -
- - {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} - {{ range $paginator.Pages }} -
-

- {{ .Title }} -

-
- {{ partial "post-meta.html" . }} -
-
- {{ .Summary }} -
-
- > READ MORE ... -
-
- {{ end }} - {{ if gt $paginator.TotalPages 1 }} - - {{ end }} -
- - -
- -
- -
+ +{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} +{{ range $paginator.Pages }} +
+

+ {{ .Title }} +

+
+ {{ partial "post-meta.html" . }}
-
+
+ {{ .Summary }} +
+
+ > READ MORE ... +
+ +{{ end }} +{{ if gt $paginator.TotalPages 1 }} + +{{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e7b9278..04d016c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,42 +1,26 @@ {{ define "main" }} -
-
- -
-
-

- {{ .Title }} -

-
- {{ partial "post-meta.html" . }} -
-
- {{ .Content }} -
-
- {{ if ne .Params.noLicense true }} -
-
-

{{ i18n "postCopyrightFront" }}{{ .Site.Params.license }}{{ i18n "postCopyrightEnd" }}

-
-
- {{ end }} - {{ if .Site.Params.utterancesComment }} - {{ partial "comment-utterances.html" . }} - {{ end }} - {{ if .Site.Params.disqusComment }} - {{ partial "comment-disqus.html" . }} - {{ end }} -
- - -
- -
- -
+
+
+ {{ .Content }} +
+ +{{ if ne .Params.noLicense true }} +
+
+

{{ i18n "postCopyrightFront" }}{{ .Site.Params.license }}{{ i18n "postCopyrightEnd" }}

+
+
+{{ end }} +{{ if .Site.Params.utterancesComment }} +{{ partial "comment-utterances.html" . }} +{{ end }} +{{ if .Site.Params.disqusComment }} +{{ partial "comment-disqus.html" . }} +{{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html new file mode 100644 index 0000000..5aef22f --- /dev/null +++ b/layouts/_default/tag.html @@ -0,0 +1,27 @@ +{{ define "main" }} +
+ 拥有标签 {{ .Title }} 的文章： +
+ +{{ range .Paginator.Pages }} +
+

+ {{ .Title }} +

+
+ {{ partial "post-meta.html" . }} +
+
+ {{ .Summary }} +
+
+ > READ MORE ... +
+
+{{ end }} +{{ if gt .Paginator.TotalPages 1 }} + +{{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/archives/list.html b/layouts/archives/list.html deleted file mode 100644 index 3fcd2f7..0000000 --- a/layouts/archives/list.html +++ /dev/null @@ -1,38 +0,0 @@ -{{ define "main" }} -
-
- -
-
- 文章总数：{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} -
- - {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }} - {{ range $paginator.Pages }} -
-

- {{ .Title }} -

-
- {{ partial "post-meta.html" . }} -
-
- {{ end }} - {{ if gt $paginator.TotalPages 1 }} - - {{ end }} -
- - -
- -
- -
-
-
-{{ end }} \ No newline at end of file diff --git a/layouts/tags/list.html b/layouts/tags/list.html deleted file mode 100644 index f5c2823..0000000 --- a/layouts/tags/list.html +++ /dev/null @@ -1,43 +0,0 @@ -{{ define "main" }} -
-
- -
-
- 拥有标签 {{ .Title }} 的文章： -
- - {{ range .Paginator.Pages }} -
-

- {{ .Title }} -

-
- {{ partial "post-meta.html" . }} -
-
- {{ .Summary }} -
-
- > READ MORE ... -
-
- {{ end }} - {{ if gt .Paginator.TotalPages 1 }} - - {{ end }} -
- - -
- -
- -
-
-
-{{ end }} \ No newline at end of file -- cgit v1.2.3