diff options
| -rw-r--r-- | layouts/_default/archives.html | 22 | ||||
| -rw-r--r-- | layouts/_default/baseof.html | 16 | ||||
| -rw-r--r-- | layouts/_default/list.html | 58 | ||||
| -rw-r--r-- | layouts/_default/single.html | 60 | ||||
| -rw-r--r-- | layouts/_default/tag.html | 27 | ||||
| -rw-r--r-- | layouts/archives/list.html | 36 | ||||
| -rw-r--r-- | layouts/tags/list.html | 41 |
7 files changed, 109 insertions, 151 deletions
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" }} +<div id="page-tag"> + <span>文章总数：{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span> +</div> +<!-- archives range in posts --> +{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }} +{{ range $paginator.Pages }} +<div id="post-archive"> + <h2 id="post-title-archive"> + <a href="{{ .Permalink }}">{{ .Title }}</a> + </h2> + <div id="post-meta-archive"> + {{ partial "post-meta.html" . }} + </div> +</div> +{{ end }} +{{ if gt $paginator.TotalPages 1 }} +<div id="pagination"> + {{ template "_internal/pagination.html" . }} +</div> +{{ end }} +{{ end }}
\ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 13f61d2..a1eb732 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,7 +5,21 @@ <body class="d-flex flex-column h-100"> {{ partial "header.html" . }} - {{ block "main" . }}{{ end }} + <main> + <div class="container-lg clearfix"> + <!-- list --> + <div class="col-md-9 col-12 float-left" id="content"> + {{ block "main" . }}{{ end }} + </div> + <!-- sidebar --> + <div class="col-md-3 col-12 float-left" id="sidebar"> + {{ partial "sidebar.html" . }} + </div> + <div id="container-progress"> + <div id="progress"></div> + </div> + </div> + </main> {{ partial "footer.html" . }} {{ partial "scripts.html" . }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index aabe09b..e459763 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,39 +1,25 @@ {{ define "main" }} -<main> - <div class="container-lg clearfix"> - <!-- list --> - <div class="col-md-9 col-12 float-left" id="content"> - <!-- homepage range in posts --> - {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} - {{ range $paginator.Pages }} - <div id="post"> - <h2 id="post-title"> - <a href="{{ .Permalink }}">{{ .Title }}</a> - </h2> - <div id="post-meta"> - {{ partial "post-meta.html" . }} - </div> - <div class="markdown-body" id="post-summary"> - {{ .Summary }} - </div> - <div id="post-exlink"> - <a href="{{ .Permalink }}#">> READ MORE ...</a> - </div> - </div> - {{ end }} - {{ if gt $paginator.TotalPages 1 }} - <div id="pagination"> - {{ template "_internal/pagination.html" . }} - </div> - {{ end }} - </div> - <!-- sidebar --> - <div class="col-md-3 col-12 float-left" id="sidebar"> - {{ partial "sidebar.html" . }} - </div> - <div id="container-progress"> - <div id="progress"></div> - </div> +<!-- homepage range in posts --> +{{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} +{{ range $paginator.Pages }} +<div id="post"> + <h2 id="post-title"> + <a href="{{ .Permalink }}">{{ .Title }}</a> + </h2> + <div id="post-meta"> + {{ partial "post-meta.html" . }} </div> -</main> + <div class="markdown-body" id="post-summary"> + {{ .Summary }} + </div> + <div id="post-exlink"> + <a href="{{ .Permalink }}#">> READ MORE ...</a> + </div> +</div> +{{ end }} +{{ if gt $paginator.TotalPages 1 }} +<div id="pagination"> + {{ template "_internal/pagination.html" . }} +</div> +{{ end }} {{ end }}
\ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index aca0bf6..04d016c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,40 +1,26 @@ {{ define "main" }} -<main> - <div class="container-lg clearfix"> - <!-- list --> - <div class="col-md-9 col-12 float-left" id="content"> - <article> - <h4 id="post-title"> - <a href="{{ .Permalink }}">{{ .Title }}</a> - </h4> - <div id="post-meta"> - {{ partial "post-meta.html" . }} - </div> - <div class="markdown-body" id="post-content"> - {{ .Content }} - </div> - </article> - {{ if ne .Params.noLicense true }} - <div class="markdown-body" id="license"> - <blockquote> - <p>{{ i18n "postCopyrightFront" }}<a rel="license" href="{{ .Site.Params.licenseLink }}" target="_blank">{{ .Site.Params.license }}</a>{{ i18n "postCopyrightEnd" }}</p> - </blockquote> - </div> - {{ end }} - {{ if .Site.Params.utterancesComment }} - {{ partial "comment-utterances.html" . }} - {{ end }} - {{ if .Site.Params.disqusComment }} - {{ partial "comment-disqus.html" . }} - {{ end }} - </div> - <!-- sidebar --> - <div class="col-md-3 col-12 float-left" id="sidebar"> - {{ partial "sidebar.html" . }} - </div> - <div id="container-progress"> - <div id="progress"></div> - </div> +<article> + <h4 id="post-title"> + <a href="{{ .Permalink }}">{{ .Title }}</a> + </h4> + <div id="post-meta"> + {{ partial "post-meta.html" . }} </div> -</main> + <div class="markdown-body" id="post-content"> + {{ .Content }} + </div> +</article> +{{ if ne .Params.noLicense true }} +<div class="markdown-body" id="license"> + <blockquote> + <p>{{ i18n "postCopyrightFront" }}<a rel="license" href="{{ .Site.Params.licenseLink }}" target="_blank">{{ .Site.Params.license }}</a>{{ i18n "postCopyrightEnd" }}</p> + </blockquote> +</div> +{{ 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" }} +<div id="page-tag"> + <span>拥有标签 {{ .Title }} 的文章：</span> +</div> +<!-- tags page range in posts --> +{{ range .Paginator.Pages }} +<div id="post"> + <h2 id="post-title"> + <a href="{{ .Permalink }}">{{ .Title }}</a> + </h2> + <div id="post-meta"> + {{ partial "post-meta.html" . }} + </div> + <div id="post-summary"> + {{ .Summary }} + </div> + <div id="post-exlink"> + <a href="{{ .Permalink }}#">> READ MORE ...</a> + </div> +</div> +{{ end }} +{{ if gt .Paginator.TotalPages 1 }} +<div id="pagination"> + {{ template "_internal/pagination.html" . }} +</div> +{{ 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 a6b3a39..0000000 --- a/layouts/archives/list.html +++ /dev/null @@ -1,36 +0,0 @@ -{{ define "main" }} -<main> - <div class="container-lg clearfix"> - <!-- list --> - <div class="col-md-9 col-12 float-left" id="content"> - <div id="page-tag"> - <span>文章总数：{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span> - </div> - <!-- archives range in posts --> - {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }} - {{ range $paginator.Pages }} - <div id="post-archive"> - <h2 id="post-title-archive"> - <a href="{{ .Permalink }}">{{ .Title }}</a> - </h2> - <div id="post-meta-archive"> - {{ partial "post-meta.html" . }} - </div> - </div> - {{ end }} - {{ if gt $paginator.TotalPages 1 }} - <div id="pagination"> - {{ template "_internal/pagination.html" . }} - </div> - {{ end }} - </div> - <!-- sidebar --> - <div class="col-md-3 col-12 float-left" id="sidebar"> - {{ partial "sidebar.html" . }} - </div> - <div id="container-progress"> - <div id="progress"></div> - </div> - </div> -</main> -{{ end }}
\ No newline at end of file diff --git a/layouts/tags/list.html b/layouts/tags/list.html deleted file mode 100644 index 7e8e6b4..0000000 --- a/layouts/tags/list.html +++ /dev/null @@ -1,41 +0,0 @@ -{{ define "main" }} -<main> - <div class="container-lg clearfix"> - <!-- list --> - <div class="col-md-9 col-12 float-left" id="content"> - <div id="page-tag"> - <span>拥有标签 {{ .Title }} 的文章：</span> - </div> - <!-- tags page range in posts --> - {{ range .Paginator.Pages }} - <div id="post"> - <h2 id="post-title"> - <a href="{{ .Permalink }}">{{ .Title }}</a> - </h2> - <div id="post-meta"> - {{ partial "post-meta.html" . }} - </div> - <div id="post-summary"> - {{ .Summary }} - </div> - <div id="post-exlink"> - <a href="{{ .Permalink }}#">> READ MORE ...</a> - </div> - </div> - {{ end }} - {{ if gt .Paginator.TotalPages 1 }} - <div id="pagination"> - {{ template "_internal/pagination.html" . }} - </div> - {{ end }} - </div> - <!-- sidebar --> - <div class="col-md-3 col-12 float-left" id="sidebar"> - {{ partial "sidebar.html" . }} - </div> - <div id="container-progress"> - <div id="progress"></div> - </div> - </div> -</main> -{{ end }}
\ No newline at end of file |