From 52c7ad29a60cc4ee6c51217d11bb4877ef0cf88a Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 3 Feb 2020 18:38:10 +0800 Subject: [PATCH] chore(style): update code style and add an i18n word --- exampleSite/config.toml | 8 ++ exampleSite/zh/config.toml | 8 ++ i18n/en.toml | 5 + i18n/zh.toml | 5 + layouts/404.html | 8 +- layouts/_default/_markup/render-image.html | 14 +-- layouts/_default/baseof.html | 11 +- layouts/_default/section.html | 3 +- layouts/_default/single.html | 3 + layouts/_default/summary.html | 22 ++-- layouts/index.html | 7 +- layouts/partials/comments.html | 76 +++++++----- layouts/partials/footer.html | 17 ++- layouts/partials/head.html | 5 +- layouts/partials/header.html | 8 +- layouts/partials/hook/content.html | 1 + layouts/partials/image.html | 1 + layouts/partials/post/share.html | 61 ++++++---- layouts/partials/scripts.html | 129 +++++++++++---------- layouts/partials/seo.html | 5 +- layouts/posts/single.html | 20 ++-- layouts/taxonomy/list.html | 2 + layouts/taxonomy/terms.html | 6 +- 23 files changed, 270 insertions(+), 155 deletions(-) diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 9fb59689..aee4015c 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -38,6 +38,14 @@ dateFormatToUse = "2006-01-02" tabWidth = 4 # Goldmark is from Hugo 0.60 the default library used for Markdown [markup.goldmark] + [markup.goldmark.extensions] + definitionList = true + footnote = true + linkify = true + strikethrough = true + table = true + taskList = true + typographer = true [markup.goldmark.renderer] # whether to use HTML tags directly in the document unsafe = true diff --git a/exampleSite/zh/config.toml b/exampleSite/zh/config.toml index d6283c4b..a9b35d86 100644 --- a/exampleSite/zh/config.toml +++ b/exampleSite/zh/config.toml @@ -38,6 +38,14 @@ dateFormatToUse = "2006-01-02" tabWidth = 4 # Goldmark 是 Hugo 0.60 以来的默认 Markdown 解析库 [markup.goldmark] + [markup.goldmark.extensions] + definitionList = true + footnote = true + linkify = true + strikethrough = true + table = true + taskList = true + typographer = true [markup.goldmark.renderer] # 是否在文档中直接使用 HTML 标签 unsafe = true diff --git a/i18n/en.toml b/i18n/en.toml index 113b5ad9..6d957055 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -46,6 +46,11 @@ other = "Powered by %s" other = "Theme - " # === partials/footer.html === +# === partials/post/share.html === +[share] +other = "Share on" +# === partials/post/share.html === + # === posts/single.html === [toc] other = "Contents" diff --git a/i18n/zh.toml b/i18n/zh.toml index d4d54097..6b2db781 100644 --- a/i18n/zh.toml +++ b/i18n/zh.toml @@ -46,6 +46,11 @@ other = "由 %s 强力驱动" other = "主题 - " # === partials/footer.html === +# === partials/post/share.html === +[share] +other = "分享到" +# === partials/post/share.html === + # === posts/single.html === [toc] other = "目录" diff --git a/layouts/404.html b/layouts/404.html index 23a7ef8c..ed901efb 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -4,19 +4,19 @@ {{- define "content" -}}
-

+

{{- T "pageNotFoundText" -}}  ↩︎

{{- end -}} \ No newline at end of file diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index c143d1d6..402f4fef 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -1,11 +1,11 @@
+ {{- /* Lazyload */ -}} {{- $loading := resources.Get "svg/loading.svg" | minify -}} {{ .Text }} -
- {{- if .Title -}} - {{- .Title -}} - {{- else -}} - {{- .Text -}} - {{- end -}} -
+ {{- $caption := .Title | default .Text -}} + {{- with $caption -}} +
+ {{- . -}} +
+ {{- end -}}
\ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a174f960..249ab81e 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,6 +1,8 @@ +{{- /* LoveIt theme version detection */ -}} {{- if ne .Site.Params.version "0.1.X" -}} {{- errorf "\n\nThere are two possible situations that led to this error:\n 1. You haven't copied the config.toml yet. See https://github.com/dillonzq/LoveIt#installation \n 2. You have an incompatible update. See https://github.com//dillonzq/LoveIt/blob/master/CHANGELOG.md \n\n有两种可能的情况会导致这个错误发生:\n 1. 你还没有复制 config.toml 参考 https://github.com/dillonzq/LoveIt#installation \n 2. 你进行了一次不兼容的更新 参考 https://github.com//dillonzq/LoveIt/blob/master/CHANGELOG.md \n" -}} {{- end -}} + @@ -12,10 +14,13 @@ {{- partial "head.html" . -}} + {{- /* Check theme isDark before body rendering */ -}} + + {{- /* Body wrapper */ -}}
{{- partial "header.html" . -}}
@@ -24,10 +29,14 @@
{{- partial "footer.html" . -}} - {{- partial "scripts.html" . -}} + + {{- /* Dynamic to top button */ -}}   + + {{- /* Load scripts */ -}} + {{- partial "scripts.html" . -}} \ No newline at end of file diff --git a/layouts/_default/section.html b/layouts/_default/section.html index a6f7aacb..499fd23a 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -3,12 +3,13 @@ {{- end -}} {{- define "content" -}} - {{- $data := .Data -}}
+ {{- /* Title */ -}}

{{- T "all" | humanize}}{{ T .Section | default .Section | humanize -}}

+ {{- /* Paginate */ -}} {{- range (.Paginate (.Pages.GroupByDate "2006")).PageGroups -}}

{{ .Key }}

{{- range .Pages -}} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 314e4db7..51d61ecb 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,9 +2,12 @@ {{- define "content" -}}
+ {{- /* Title */ -}}

{{- .Title -}}

+ + {{- /* Content */ -}}
{{- partial "hook/content.html" .Content | safeHTML -}}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 0f1d4bbd..e7beb20a 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -1,26 +1,28 @@
- {{- $publish_date := .PublishDate.Format (.Site.Params.dateFormatToUse | default "2006-01-02") -}} - {{- $author := .Params.author | default .Site.Author.name -}} - {{- $author_link := .Params.author_link | default .Site.Author.link | default .Site.BaseURL -}} - - + {{- /* Featured image */ -}} {{- with .Params.featured_image -}}
{{- $image := $.Params.featured_image_preview | default . -}} {{- partial "image" $image -}}
{{- end -}} - + {{- /* Title */ -}}

{{ .Title }}

+ {{- /* Meta */ -}}
+ {{- $author := .Params.author | default .Site.Author.name -}} + {{- $author_link := .Params.author_link | default .Site.Author.link | default .Site.BaseURL -}} - {{ T "publish" }}   + + {{- $publish_date := .PublishDate.Format (.Site.Params.dateFormatToUse | default "2006-01-02") -}} + {{ T "publish" }}   + {{- with .Params.categories -}} {{- T "included" -}}  @@ -34,6 +36,8 @@ {{- end -}}
+ + {{- /* Content */ -}}
{{- if .Params.show_description -}}

@@ -43,6 +47,8 @@ {{- partial "hook/content.html" .Summary | safeHTML -}} {{- end -}}

+ + {{- /* Footer */ -}}
{{ T "readMore" }} {{- with .Params.tags -}} diff --git a/layouts/index.html b/layouts/index.html index 20bef9da..47825ded 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,8 +1,11 @@ {{- define "content" -}} + {{- /* Home mode [post] */ -}} {{- if eq .Site.Params.home_mode "post" -}}
+ {{- /* Profile */ -}} {{- partial "home/profile.html" . -}} + {{- /* Paginate */ -}} {{- $paginator := where .Site.RegularPages "Type" "posts" -}} {{- $paginator = where $paginator "Params.show_in_homepage" "!=" false -}} {{- with .Site.Params.home_paginate -}} @@ -13,10 +16,12 @@ {{- range $paginator.Pages -}} {{- .Render "summary" -}} {{- end -}} - {{- partial "paginator.html" . -}}
+ + {{- /* Home mode [other] */ -}} {{- else -}} + {{- /* Profile */ -}} {{- partial "home/profile.html" . -}} {{- end -}} {{- end -}} \ No newline at end of file diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index edf9ad1d..76c3254b 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -1,14 +1,13 @@ {{- if eq (getenv "HUGO_ENV") "production" | and .IsPage | and (ne .Params.comment false) -}} - + {{- /* Disqus Comment System */ -}} {{- if .Site.Params.disqus.shortname -}}
- comments powered by Disqus {{- end -}} - + {{- /* Gitalk Comment System */ -}} {{- if .Site.Params.gitalk.owner -}}
{{- if .Site.Params.cdn.gitalk_css -}} @@ -35,22 +33,28 @@ {{- end -}} - + {{- end -}} - + {{- /* Valine Comment System */ -}} {{- if .Site.Params.valine.enable -}}
{{- if .Site.Params.cdn.valine_js -}} @@ -60,23 +64,30 @@ {{- end -}} + {{- end -}} - + {{- /* Facebook Comment System */ -}} {{- if .Site.Params.facebook.enable -}}
" $res.RelPermalink -}} {{- end -}} - + +{{- /* lazysizes https://github.com/aFarkas/lazysizes */ -}} {{- $lazysizes := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.lazysizes_js -}} {{- $lazysizes = .Site.Params.cdn.lazysizes_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/lazysizes/lazysizes.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/lazysizes/lazysizes.min.js" -}} {{- $lazysizes = printf "" $res.RelPermalink -}} {{- end -}} - + +{{- /* Smooth Scroll https://github.com/cferdinandi/smooth-scroll */ -}} {{- $smooth_scroll := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.smooth_scroll_js -}} {{- $smooth_scroll = .Site.Params.cdn.smooth_scroll_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/smooth-scroll/smooth-scroll.polyfills.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/smooth-scroll/smooth-scroll.polyfills.min.js" -}} {{- $smooth_scroll = printf "" $res.RelPermalink -}} {{- end -}} {{- $smooth_scroll = delimit (slice $smooth_scroll "") "" -}} - + +{{- /* KaTeX https://github.com/KaTeX/KaTeX */ -}} {{- $katex_css := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_css -}} {{- $katex_css = .Site.Params.cdn.katex_css -}} {{- else -}} - {{- $res := resources.Get "css/lib/katex/katex.min.css" | resources.Minify -}} + {{- $res := resources.Get "css/lib/katex/katex.min.css" -}} {{- $katex_css = printf "" $res.RelPermalink -}} {{- end -}} {{- $katex_js := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_js -}} {{- $katex_js = .Site.Params.cdn.katex_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/katex/katex.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/katex/katex.min.js" -}} {{- $katex_js = printf "" $res.RelPermalink -}} {{- end -}} {{- $katex_auto_render_js := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_auto_render_js -}} {{- $katex_auto_render_js = .Site.Params.cdn.katex_auto_render_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/katex/auto-render.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/katex/auto-render.min.js" -}} {{- $katex_auto_render_js = printf "" $res.RelPermalink -}} {{- end -}} {{- $katex := delimit (slice $katex_css $katex_js $katex_auto_render_js) "" -}} - + +{{- /* mermaid https://github.com/knsv/mermaid */ -}} {{- $mermaid := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.mermaid_js -}} {{- $mermaid = .Site.Params.cdn.mermaid_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/mermaid/mermaid.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/mermaid/mermaid.min.js" -}} {{- $mermaid = printf "" $res.RelPermalink -}} {{- end -}} {{- $mermaidInit := "" -}} {{- $mermaid = delimit (slice $mermaid $mermaidInit) "" -}} - -{{- $echarts_js := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_js -}} - {{- $echarts_js = .Site.Params.cdn.echarts_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/echarts/echarts.min.js" | resources.Minify -}} - {{- $echarts_js = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $echarts_macarons_js := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_macarons_js -}} - {{- $echarts_macarons_js = .Site.Params.cdn.echarts_macarons_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/echarts/macarons.js" | resources.Minify -}} - {{- $echarts_macarons_js = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $echarts := delimit (slice $echarts_js $echarts_macarons_js) "" -}} - + +{{- /* TypeIt https://github.com/alexmacarthur/typeit */ -}} {{- $typeit := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.typeit_js -}} {{- $typeit = .Site.Params.cdn.typeit_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/typeit/typeit.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/typeit/typeit.min.js" -}} {{- $typeit = printf "" $res.RelPermalink -}} {{- end -}} - + +{{- /* jQuery.countdown https://github.com/hilios/jQuery.countdown */ -}} {{- $countdown := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.jquery_countdown_js -}} {{- $countdown = .Site.Params.cdn.jquery_countdown_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/jquery-countdown/jquery.countdown.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/jquery-countdown/jquery.countdown.min.js" -}} {{- $countdown = printf "" $res.RelPermalink -}} {{- end -}} - + +{{- /* APlayer https://github.com/MoePlayer/APlayer */ -}} {{- $aplayer_css := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_css -}} {{- $aplayer_css = .Site.Params.cdn.aplayer_css -}} {{- else -}} - {{- $res := resources.Get "css/lib/aplayer/APlayer.min.css" | resources.Minify -}} + {{- $res := resources.Get "css/lib/aplayer/APlayer.min.css" -}} {{- $aplayer_css = printf "" $res.RelPermalink -}} {{- end -}} {{- $aplayer_js := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_js -}} {{- $aplayer_js = .Site.Params.cdn.aplayer_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/aplayer/APlayer.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/aplayer/APlayer.min.js" -}} {{- $aplayer_js = printf "" $res.RelPermalink -}} {{- end -}} {{- $aplayer := delimit (slice $aplayer_css $aplayer_js) "" -}} - + +{{- /* MetingJS https://github.com/metowolf/MetingJS */ -}} {{- $meting := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.meting_js -}} {{- $meting = .Site.Params.cdn.meting_js -}} {{- else -}} - {{- $res := resources.Get "js/lib/meting/Meting.min.js" | resources.Minify -}} + {{- $res := resources.Get "js/lib/meting/Meting.min.js" -}} {{- $meting = printf "" $res.RelPermalink -}} {{- end -}} +{{- /* ECharts https://github.com/apache/incubator-echarts */ -}} +{{- $echarts_js := "" -}} +{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_js -}} +{{- $echarts_js = .Site.Params.cdn.echarts_js -}} +{{- else -}} +{{- $res := resources.Get "js/lib/echarts/echarts.min.js" -}} +{{- $echarts_js = printf "" $res.RelPermalink -}} +{{- end -}} +{{- $echarts_macarons_js := "" -}} +{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_macarons_js -}} +{{- $echarts_macarons_js = .Site.Params.cdn.echarts_macarons_js -}} +{{- else -}} +{{- $res := resources.Get "js/lib/echarts/macarons.js" | minify -}} +{{- $echarts_macarons_js = printf "" $res.RelPermalink -}} +{{- end -}} +{{- $echarts := delimit (slice $echarts_js $echarts_macarons_js) "" -}} + {{- $jquery | safeHTML -}} {{- $lazysizes | safeHTML -}} {{- $smooth_scroll | safeHTML -}} {{- if .IsPage -}} - {{/* dev feature */}} - {{- if .Params.dev -}} - {{- with .Scratch.Get "echartsMap" -}} - {{- $echarts | safeHTML -}} - - {{- end -}} - {{- end -}} - {{/* dev feature */}} - {{- with .Scratch.Get "mermaidMap" -}} {{- $mermaid | safeHTML -}} {{- end -}} @@ -153,26 +146,40 @@ {{- with .Scratch.Get "countdownMap" -}} {{- $countdown | safeHTML -}} {{- end -}} + + {{- /* dev feature */ -}} + {{- if .Params.dev -}} + {{- with .Scratch.Get "echartsMap" -}} + {{- $echarts | safeHTML -}} + + {{- end -}} + {{- end -}} {{- end -}} -{{- $typeitMap := .Scratch.Get "typeitMap" -}} -{{- if $typeitMap -}} +{{- with .Scratch.Get "typeitMap" -}} {{- $typeit | safeHTML -}} {{- $typeitArr := slice -}} - {{- range $key, $val := $typeitMap -}} + {{- range $key, $val := . -}} {{- $typeitArr = $typeitArr | append (slice $val) -}} {{- end -}} {{- end -}} -{{- $res := resources.Get "/js/blog.js" | resources.Minify -}} +{{- $res := resources.Get "/js/blog.js" | minify -}} -{{- if not .Site.IsServer -}} +{{- if eq (getenv "HUGO_ENV") "production" | and .Site.GoogleAnalytics -}} {{- template "_internal/google_analytics_async.html" . -}} {{- end -}} \ No newline at end of file diff --git a/layouts/partials/seo.html b/layouts/partials/seo.html index 3890fb8c..3d816b60 100644 --- a/layouts/partials/seo.html +++ b/layouts/partials/seo.html @@ -1,3 +1,4 @@ +{{- /* Home SEO */ -}} {{- if .IsHome -}} -{{ else if .IsPage -}} + +{{- /* Page SEO */ -}} +{{- else if .IsPage -}}