From dfb6e1f80754c1c8f2d4d332c5292319f008a67b Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Wed, 27 May 2020 22:53:13 +0800 Subject: v2 original port --- layouts/_default/_markup/render-image.html | 2 +- layouts/_default/archives.html | 32 +++++++++++++++--------------- layouts/_default/baseof.html | 30 ++++++++++++---------------- layouts/_default/list.html | 30 ++++++++++++++-------------- layouts/_default/single.html | 10 +++++----- layouts/_default/tag.html | 30 ++++++++++++++-------------- 6 files changed, 65 insertions(+), 69 deletions(-) (limited to 'layouts/_default') diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index f9493b1..b9020c7 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -1 +1 @@ -{{ .Text }} \ No newline at end of file +{{ .Text }} \ No newline at end of file diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index cb4b911..b3a7c13 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -6,11 +6,11 @@ {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }} {{ range $paginator.Pages }} -
-

+
+

{{ .Title }} -

-
+

+
{{ partial "post-meta.html" . }}
@@ -22,16 +22,16 @@ {{ $lowerLimit := (add $offsetLinks 1) }} {{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }} {{ 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 8d4a8db..a61499c 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,34 +1,30 @@ -{{ partial "head.html" . }} - + + {{ partial "head.html" . }} + + + + {{ partial "scripts-front.html" . }} {{ partial "header.html" . }}
-
+
{{ block "main" . }}{{ end }}
- - - - {{ if .Site.Params.playerURL }} -
- {{ end }} - {{ if .Site.Params.scrollTop }} -
- -
- {{ end }} + {{ partial "sidebar.html" . }}
+ {{ partial "components.html" . }}
{{ partial "footer.html" . }} - {{ partial "scripts.html" . }} + {{ if or .Params.math .Site.Params.math }} + {{ partial "math.html" . }} + {{ end }} + {{ partial "scripts-end.html" . }} \ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bcefcc2..0e52ab4 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -3,13 +3,13 @@ {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} {{ range $paginator.Pages }}
-

+

{{ .Title }}

-
+
{{ partial "post-meta.html" . }}
-
+
{{ .Summary }}
@@ -21,16 +21,16 @@ {{ $lowerLimit := (add $offsetLinks 1) }} {{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }} {{ if gt $paginator.TotalPages 1 }} -
{{ end }} {{ range $paginator.Pagers }} {{ $.Scratch.Set "pageNumFlag" false }} @@ -52,22 +52,22 @@ {{ $.Scratch.Set "pageNumFlag" true }} {{ end }} {{ if eq ($.Scratch.Get "pageNumFlag") true }} -
  • +
    {{ .PageNumber }} -
    • +
    {{ end }} {{ end }} {{ if $paginator.HasNext }} -
  • +
    -
    • + {{ end }} {{ if ne $paginator.PageNumber $paginator.TotalPages }} -
  • +
    -
    • + {{ end }} - + {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e2b0fc1..72ec0a8 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,10 @@ {{ define "main" }}
    -

    +

    {{ .Title }} -

    -
    + +
    {{ partial "post-meta.html" . }}
    {{ with .Params.playerURL }} @@ -19,12 +19,12 @@ {{ if ne .Params.noLicense true }}
    -

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

    +

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

    {{ end }} {{ if ne .Params.noComments true }} {{ partial "comment-utterances.html" . }} -{{ partial "comment-disqus.html" . }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index 97d6ead..7bcabb8 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -7,13 +7,13 @@ {{ $paginator := .Paginator }} {{ range $paginator.Pages }}
    -

    +

    {{ .Title }}

    -
    +
    {{ partial "post-meta.html" . }}
    -
    +
    {{ .Summary }}
    @@ -25,16 +25,16 @@ {{ $lowerLimit := (add $offsetLinks 1) }} {{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }} {{ if gt $paginator.TotalPages 1 }} -
      + {{ end }} {{ if $paginator.HasPrev }} -
    • +
      -
      • +
    {{ end }} {{ range $paginator.Pagers }} {{ $.Scratch.Set "pageNumFlag" false }} @@ -56,22 +56,22 @@ {{ $.Scratch.Set "pageNumFlag" true }} {{ end }} {{ if eq ($.Scratch.Get "pageNumFlag") true }} -
  • +
    {{ .PageNumber }} -
    • +
    {{ end }} {{ end }} {{ if $paginator.HasNext }} -
  • +
    -
    • +
    {{ end }} {{ if ne $paginator.PageNumber $paginator.TotalPages }} -
  • +
    -
    • + {{ end }} - + {{ end }} {{ end }} \ No newline at end of file -- cgit v1.2.3 From 594655b050145b7c3beab06166678940e613a79a Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Fri, 29 May 2020 16:55:27 +0800 Subject: Disqus support --- layouts/_default/single.html | 1 + 1 file changed, 1 insertion(+) (limited to 'layouts/_default') diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 72ec0a8..9795378 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -26,5 +26,6 @@ {{ end }} {{ if ne .Params.noComments true }} {{ partial "comment-utterances.html" . }} +{{ partial "comment-disqus.html" . }} {{ end }} {{ end }} \ No newline at end of file -- cgit v1.2.3 From ac62cbd84fc67401f4014b6e9d8ed6c6b175503e Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Sat, 30 May 2020 14:02:20 +0800 Subject: Update fa --- layouts/_default/archives.html | 8 ++++---- layouts/_default/list.html | 8 ++++---- layouts/_default/tag.html | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'layouts/_default') diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index b3a7c13..14c3789 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -25,12 +25,12 @@ diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 0e52ab4..b4d5afe 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -24,12 +24,12 @@ diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index 7bcabb8..b77b01d 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -28,12 +28,12 @@ -- cgit v1.2.3 From 02c3891865c7741b8f772aea75cc01564d2f0ff4 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Mon, 1 Jun 2020 15:44:04 +0800 Subject: Remove jQuery --- layouts/_default/baseof.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layouts/_default') diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a61499c..4a2a490 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,7 +5,7 @@ {{ partial "head.html" . }} - + {{ partial "scripts-front.html" . }} {{ partial "header.html" . }} -- cgit v1.2.3 From 3df71601ae866aff9c2ae060ed1ac7407807fcc4 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Wed, 3 Jun 2020 13:58:49 +0800 Subject: New comment area & opt out of font awesome --- layouts/_default/archives.html | 8 ++++---- layouts/_default/list.html | 8 ++++---- layouts/_default/single.html | 9 ++++++--- layouts/_default/tag.html | 8 ++++---- 4 files changed, 18 insertions(+), 15 deletions(-) (limited to 'layouts/_default') diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 14c3789..42216b4 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -25,12 +25,12 @@ diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b4d5afe..5118a49 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -24,12 +24,12 @@ diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9795378..721671e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -24,8 +24,11 @@ {{ end }} -{{ if ne .Params.noComments true }} -{{ partial "comment-utterances.html" . }} +{{ if .Site.Params.disqusJSApi }} +{{ partial "comment-disqusjs.html" . }} +{{ else if .Site.Params.disqusShortname }} {{ partial "comment-disqus.html" . }} -{{ end }} +{{ else if .Site.Params.utterancesRepo }} +{{ partial "comment-utterances.html" . }} +{{ else }}{{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index b77b01d..fa5af3d 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -28,12 +28,12 @@ -- cgit v1.2.3 From d185ecccaabcaf4a9cced394d5b72f246bc2e5e7 Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Thu, 4 Jun 2020 15:56:03 +0800 Subject: Allow disable license globally --- layouts/_default/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layouts/_default') diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 721671e..db5e2f5 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -16,7 +16,7 @@
    -{{ if ne .Params.noLicense true }} +{{ if and (.Site.Params.showLicense) (ne .Params.noLicense true) }}

    {{ i18n "postCopyrightFront" }}