From 41ef0bdcde0534402d430185052f4c553144487c Mon Sep 17 00:00:00 2001 From: amzrk2 Date: Wed, 6 May 2020 20:30:07 +0800 Subject: General template fix --- layouts/_default/archives.html | 11 ++--- layouts/_default/baseof.html | 1 + layouts/_default/list.html | 12 +++--- layouts/_default/single.html | 3 ++ layouts/_default/tag.html | 13 +++--- layouts/partials/head.html | 18 ++++---- layouts/partials/header.html | 3 +- layouts/partials/post-exlink.html | 4 +- layouts/partials/post-meta.html | 24 ++++------- layouts/partials/scripts.html | 87 ++++++++++++++++++--------------------- layouts/partials/sidebar.html | 5 +++ 11 files changed, 85 insertions(+), 96 deletions(-) (limited to 'layouts') diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index e3ee3e5..348e6ac 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -1,8 +1,9 @@ {{ define "main" }} -
+ +
{{ i18n "archivesTotalPages" }}{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
- + {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }} {{ range $paginator.Pages }}
@@ -14,7 +15,8 @@
{{ end }} - + + {{ $offsetLinks := 2 }} {{ $maxLinks := (add (mul $offsetLinks 2) 1) }} {{ $lowerLimit := (add $offsetLinks 1) }} @@ -31,7 +33,6 @@ {{ end }} - {{ range $paginator.Pagers }} {{ $.Scratch.Set "pageNumFlag" false }} {{ if gt $paginator.TotalPages $maxLinks }} @@ -57,7 +58,6 @@ {{ end }} {{ end }} - {{ if $paginator.HasNext }}
  • @@ -70,5 +70,6 @@ {{ end }} {{ end }} + {{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 6df6ad6..71ba5a5 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -15,6 +15,7 @@ + {{ if .Site.Params.playerURL }}
    {{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e2a0eb7..7f387f6 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,5 +1,5 @@ {{ define "main" }} - + {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} {{ range $paginator.Pages }}
    @@ -17,7 +17,8 @@
    {{ end }} - + + {{ $offsetLinks := 2 }} {{ $maxLinks := (add (mul $offsetLinks 2) 1) }} {{ $lowerLimit := (add $offsetLinks 1) }} @@ -26,15 +27,14 @@ {{ end }} + {{ end }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6056021..7ee7d25 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,5 +1,6 @@ {{ define "main" }}
    +

    {{ .Title }}

    @@ -9,10 +10,12 @@ {{ with .Params.playerURL }}
    {{ end }} +
    {{ .Content }}
    + {{ if ne .Params.noLicense true }}
    diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index 6a0d4d2..b2860b2 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -1,8 +1,9 @@ {{ define "main" }} -
    + +
    {{ i18n "tagsCurrentTag" . }}
    - + {{ $paginator := .Paginator }} {{ range $paginator.Pages }}
    @@ -16,11 +17,12 @@ {{ .Summary }}
    -  READ MORE  + {{ partial "post-exlink.html" . }}
    {{ end }} - + + {{ $offsetLinks := 2 }} {{ $maxLinks := (add (mul $offsetLinks 2) 1) }} {{ $lowerLimit := (add $offsetLinks 1) }} @@ -37,7 +39,6 @@
    • {{ end }} - {{ range $paginator.Pagers }} {{ $.Scratch.Set "pageNumFlag" false }} {{ if gt $paginator.TotalPages $maxLinks }} @@ -63,7 +64,6 @@ {{ end }} {{ end }} - {{ if $paginator.HasNext }}
  • @@ -76,5 +76,6 @@ {{ end }} {{ end }} + {{ end }} \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 2b12e1d..a458be1 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,3 +1,4 @@ + @@ -6,8 +7,10 @@ {{ hugo.Generator }} + {{ partial "favicon.html" . }} + {{ if and (.IsHome) (.Site.Params.subTitle) }} {{ .Site.Title }} - {{ .Site.Params.subTitle }} {{ else if .IsHome }} @@ -20,18 +23,17 @@ {{ if .Params.tags }} {{ end }} - {{ template "_internal/opengraph.html" . }} {{ template "_internal/twitter_cards.html" . }} {{ template "_internal/google_analytics_async.html" . }} - + {{ $options := (dict "targetPath" "css/main.min.css" "outputStyle" "compressed") }} {{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options }} + {{ if .Site.Params.useCDN }} - @@ -39,13 +41,13 @@ {{ end }} + {{ else }} - {{ $jquery := resources.Get "js/jquery.min.js" }} {{ $lazysizes := resources.Get "js/lazysizes.min.js" }} -{{ $fontawesome := resources.Get "css/all.min.css" }} +{{ $fontawesome := resources.Get "css/fontawsome.min.css" }} {{ if or (.Site.Params.playerURL) (.Params.playerURL) }} {{ $aplayerCSS := resources.Get "css/APlayer.min.css" }} @@ -60,10 +62,4 @@ -{{ end }} - - -{{ if .Site.Params.webpChecker }} -{{ $webp := resources.Get "js/modernizr-webp.min.js" }} - {{ end }} \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html index ca01fa6..e4fcaae 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,9 +1,8 @@
    -
    {{ .Site.Title }} - {{ .Site.Params.subTitle }} + {{ with .Site.Params.subTitle }}{{ . }}{{ end }}
    \ No newline at end of file diff --git a/layouts/partials/post-exlink.html b/layouts/partials/post-exlink.html index 5691ede..da81614 100644 --- a/layouts/partials/post-exlink.html +++ b/layouts/partials/post-exlink.html @@ -1,3 +1 @@ - -  READ MORE  - \ No newline at end of file + READ MORE  \ No newline at end of file diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html index 4864808..f208210 100644 --- a/layouts/partials/post-meta.html +++ b/layouts/partials/post-meta.html @@ -1,15 +1,9 @@ - - | - - - {{ .WordCount }}{{ i18n "postMetaWordCount" }} | - - - {{ if .Params.tags }} - {{ range .Params.tags }} - {{ . }} - {{ end }} - {{ else }} - {{ i18n "postMetaNoTag" }} - {{ end }} - \ No newline at end of file + | +{{ .WordCount }}{{ i18n "postMetaWordCount" }} | +{{ if .Params.tags }} +{{ range .Params.tags }} +{{ . }} +{{ end }} +{{ else }} +{{ i18n "postMetaNoTag" }} +{{ end }} \ No newline at end of file diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html index 85346f2..894d5c3 100644 --- a/layouts/partials/scripts.html +++ b/layouts/partials/scripts.html @@ -1,5 +1,5 @@ + {{ if and (.IsPage) (.Site.Params.utterancesRepo) }} - {{ end }} + + +{{ if in .Site.Params.mainSections .Type }} + +{{ end }} +{{ if .Site.Params.scrollTop }} + + +{{ end }} + + {{ with .Params.playerURL }} {{ end }} + {{ with .Site.Params.playerURL }} -{{ end }} -{{ if in .Site.Params.mainSections .Type }} - - -{{ end }} -{{ if .Site.Params.scrollTop }} - - -{{ end }} -{{ if .Site.Params.webpChecker }} - - {{ end }} \ No newline at end of file diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index a39eb3f..1f6ce45 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,9 +1,11 @@ + {{ if in .Site.Params.mainSections .Type }}
    {{ i18n "sidebarToc" }}
    {{.TableOfContents}}
    {{ end }} +
    {{ i18n "sidebarPages" }}
      @@ -15,6 +17,7 @@ {{ end }}
    +
    {{ i18n "sidebarTags" }}
    @@ -25,6 +28,7 @@ {{ end }}
    + + {{ with .Site.Params.bgmImageChart }}
    {{ i18n "sidebarBangumiChart" }}
    -- cgit v1.2.3