diff --git a/archetypes/default.md b/archetypes/default.md index 518c212..de95136 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -1,21 +1,47 @@ --- -title: '{{ replace .Name "-" " " | title }}' -description: 'Short description of the article.' -keywords: 'Key words' -isCJKLanguage: true +title: "{{ replace .Name "-" " " | title }}" +description: "{{ .Name }}" +keywords: "{{replace .Name "-" ","}}" -author: 'Author of the article' -lastmod: '{{ .Date }}' -publishDate: '{{ .Date }}' -weight: 1 +date: {{ .Date }} +lastmod: {{ .Date }} categories: - tags: - - - - + - + - -toc: false -draft: true -url: '{{ lower .Name }}.html' +# 原文作者 +# Post's origin author name +#author: +# 原文链接 +# Post's origin link URL +#link: +# 图片链接，用在open graph和twitter卡片上 +# Image source link that will use in open graph and twitter card +#imgs: +# 在首页展开内容 +# Expand content on the home page +#expand: true +# 外部链接地址，访问时直接跳转 +# It's means that will redirecting to external links +#extlink: +# 在当前页面开启或关闭评论功能 +# Switch to enabled or disabled comment plugins in this post +#comment: +# enable: false +# 开启文章目录功能 +# Enable table of content +#toc: false +# 绝对访问路径 +# Absolute link for visit +#url: "{{ lower .Name }}.html" +# 开启文章置顶，数字越小越靠前 +# Sticky post set-top in home page and the smaller nubmer will more forward. +#weight: 1 --- + +{{ .Name }} + + diff --git a/assets/js/next-boot.js b/assets/js/next-boot.js index 6262daa..dedb54b 100644 --- a/assets/js/next-boot.js +++ b/assets/js/next-boot.js @@ -38,17 +38,17 @@ NexT.boot.refresh = function() { * Need to add config option in Front-End at 'scripts/helpers/next-config.js' file. */ CONFIG.prism && window.Prism.highlightAll(); - CONFIG.mediumzoom && window.mediumZoom('.post-body :not(a) > img, .post-body > img', { + /*CONFIG.mediumzoom && window.mediumZoom('.post-body :not(a) > img, .post-body > img', { background: 'var(--content-bg-color)' - }); + });*/ CONFIG.lazyload && window.lozad('.post-body img').observe(); CONFIG.pangu && window.pangu.spacingPage(); CONFIG.exturl && NexT.utils.registerExtURL(); NexT.utils.registerCopyCode(); NexT.utils.registerTabsTag(); - NexT.utils.registerActiveMenuItem(); - NexT.utils.registerLangSelect(); + /*NexT.utils.registerActiveMenuItem(); + NexT.utils.registerLangSelect();*/ NexT.utils.registerSidebarTOC(); NexT.utils.registerPostReward(); NexT.utils.wrapTableWithBox(); diff --git a/assets/js/utils.js b/assets/js/utils.js index 0a0665b..4b95e07 100644 --- a/assets/js/utils.js +++ b/assets/js/utils.js @@ -207,7 +207,7 @@ NexT.utils = { }, false); }, - registerActiveMenuItem: function() { + /*registerActiveMenuItem: function() { document.querySelectorAll('.menu-item a[href]').forEach(target => { const isSamePath = target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', ''); const isSubPath = !CONFIG.root.startsWith(target.pathname) && location.pathname.startsWith(target.pathname); @@ -228,7 +228,7 @@ NexT.utils = { window.location.href = target.dataset.href; }); }); - }, + },*/ registerSidebarTOC: function() { this.sections = [...document.querySelectorAll('.post-toc li a.nav-link')].map(element => { diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 1a38074..0daee31 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -8,6 +8,10 @@ baseURL: / theme: hugo-theme-next +paginate: 8 + +enableEmoji: true + # Make markdown content support HTML syntax markup: goldmark: @@ -19,10 +23,14 @@ languages: zh-cn: title: Hugo NexT languageName: 中文 + languageCode: zh-CN + hasCJKLanguage: true weight: 1 - en-us: + en: title: Hugo NexT languageName: English + languageCode: en + hasCJKLanguage: false weight: 2 params: author: Theme NexT diff --git a/exampleSite/content/posts/emoji-support.md b/exampleSite/content/posts/emoji-support.md new file mode 100644 index 0000000..bbf8a14 --- /dev/null +++ b/exampleSite/content/posts/emoji-support.md @@ -0,0 +1,202 @@ +--- +title: "支持 Emoji 表情" +description: "Hugo 和 NexT 中的 Emoji 的用法指南。" +keywords: "Hugo,NexT,Emoji" + +date: 2022-06-04T19:46:45+08:00 +lastmod: 2022-06-04T19:46:45+08:00 + +categories: + - 示例 +tags: + - 表情 + - emoji + +toc: false +url: "emoji-support.html" +--- + +Emoji 可以通过多种方式在 Hugo 项目中启用。 + +[`emojify`](https://gohugo.io/functions/emojify/) 方法可以直接在模板中调用, 或者使用[行内 Shortcodes](https://gohugo.io/templates/shortcode-templates#inline-shortcodes). + +要全局使用 emoji, 需要在你的[网站配置](https://gohugo.io/getting-started/configuration/)中设置 `enableEmoji` 为 `true`， +然后你就可以直接在文章中输入 emoji 的代码。 + + + +它们以**冒号**开头和结尾，并且包含 emoji 的 **代码**： + +```markdown +去露营啦! {:}tent: 很快就回来. + +真开心! {:}joy: +``` + +呈现的输出效果如下: + +去露营啦! :tent: 很快就回来。 + +真开心! :joy: + +以下**符号清单**是 emoji 代码的非常有用的参考。 + +## 表情与情感 + +### 笑脸表情 + +| 图标 | 代码 | 图标 | 代码 | +| :-: | - | :-: | - | +| :grinning: | `grinning` | :smiley: | `smiley` | +| :smile: | `smile` | :grin: | `grin` | +| :laughing: | `laughing`
`satisfied` | :sweat_smile: | `sweat_smile` | +| :rofl: | `rofl` | :joy: | `joy` | +| :slightly_smiling_face: | `slightly_smiling_face` | :upside_down_face: | `upside_down_face` | +| :wink: | `wink` | :blush: | `blush` | +| :innocent: | `innocent` | | | + +### 爱意表情 + +| 图标 | 代码 | 图标 | 代码 | +| :-: | - | :-: | - | +| :heart_eyes: | `heart_eyes` | :kissing_heart: | `kissing_heart` | +| :kissing: | `kissing` | :relaxed: | `relaxed` | +| :kissing_closed_eyes: | `kissing_closed_eyes` | :kissing_smiling_eyes: | `kissing_smiling_eyes` | + +### 吐舌头表情 + +| 图标 | 代码 | 图标 | 代码 | +| :-: | - | :-: | - | +| :yum: | `yum` | :stuck_out_tongue: | `stuck_out_tongue` | +| :stuck_out_tongue_winking_eye: | `stuck_out_tongue_winking_eye` | :stuck_out_tongue_closed_eyes: | `stuck_out_tongue_closed_eyes` | +| :money_mouth_face: | `money_mouth_face` | | | + + +### 国家和地区旗帜 + +| 图标 | 代码 | 图标 | 代码 | +| :-: | - | :-: | - | +| :andorra: | `andorra` | :united_arab_emirates: | `united_arab_emirates` | +| :afghanistan: | `afghanistan` | :antigua_barbuda: | `antigua_barbuda` | +| :anguilla: | `anguilla` | :albania: | `albania` | +| :armenia: | `armenia` | :angola: | `angola` | +| :antarctica: | `antarctica` | :argentina: | `argentina` | +| :american_samoa: | `american_samoa` | :austria: | `austria` | +| :australia: | `australia` | :aruba: | `aruba` | +| :aland_islands: | `aland_islands` | :azerbaijan: | `azerbaijan` | +| :bosnia_herzegovina: | `bosnia_herzegovina` | :barbados: | `barbados` | +| :bangladesh: | `bangladesh` | :belgium: | `belgium` | +| :burkina_faso: | `burkina_faso` | :bulgaria: | `bulgaria` | +| :bahrain: | `bahrain` | :burundi: | `burundi` | +| :benin: | `benin` | :st_barthelemy: | `st_barthelemy` | +| :bermuda: | `bermuda` | :brunei: | `brunei` | +| :bolivia: | `bolivia` | :caribbean_netherlands: | `caribbean_netherlands` | +| :brazil: | `brazil` | :bahamas: | `bahamas` | +| :bhutan: | `bhutan` | :botswana: | `botswana` | +| :belarus: | `belarus` | :belize: | `belize` | +| :canada: | `canada` | :cocos_islands: | `cocos_islands` | +| :congo_kinshasa: | `congo_kinshasa` | :central_african_republic: | `central_african_republic` | +| :congo_brazzaville: | `congo_brazzaville` | :switzerland: | `switzerland` | +| :cote_divoire: | `cote_divoire` | :cook_islands: | `cook_islands` | +| :chile: | `chile` | :cameroon: | `cameroon` | +| :cn: | `cn` | :colombia: | `colombia` | +| :costa_rica: | `costa_rica` | :cuba: | `cuba` | +| :cape_verde: | `cape_verde` | :curacao: | `curacao` | +| :christmas_island: | `christmas_island` | :cyprus: | `cyprus` | +| :czech_republic: | `czech_republic` | :de: | `de` | +| :djibouti: | `djibouti` | :denmark: | `denmark` | +| :dominica: | `dominica` | :dominican_republic: | `dominican_republic` | +| :algeria: | `algeria` | :ecuador: | `ecuador` | +| :estonia: | `estonia` | :egypt: | `egypt` | +| :western_sahara: | `western_sahara` | :eritrea: | `eritrea` | +| :es: | `es` | :ethiopia: | `ethiopia` | +| :eu: | `eu`
`european_union` | :finland: | `finland` | +| :fiji: | `fiji` | :falkland_islands: | `falkland_islands` | +| :micronesia: | `micronesia` | :faroe_islands: | `faroe_islands` | +| :fr: | `fr` | :gabon: | `gabon` | +| :gb: | `gb`
`uk` | :grenada: | `grenada` | +| :georgia: | `georgia` | :french_guiana: | `french_guiana` | +| :guernsey: | `guernsey` | :ghana: | `ghana` | +| :gibraltar: | `gibraltar` | :greenland: | `greenland` | +| :gambia: | `gambia` | :guinea: | `guinea` | +| :guadeloupe: | `guadeloupe` | :equatorial_guinea: | `equatorial_guinea` | +| :greece: | `greece` | :south_georgia_south_sandwich_islands: | `south_georgia_south_sandwich_islands` | +| :guatemala: | `guatemala` | :guam: | `guam` | +| :guinea_bissau: | `guinea_bissau` | :guyana: | `guyana` | +| :hong_kong: | `hong_kong` | :honduras: | `honduras` | +| :croatia: | `croatia` | :haiti: | `haiti` | +| :hungary: | `hungary` | :canary_islands: | `canary_islands` | +| :indonesia: | `indonesia` | :ireland: | `ireland` | +| :israel: | `israel` | :isle_of_man: | `isle_of_man` | +| :india: | `india` | :british_indian_ocean_territory: | `british_indian_ocean_territory` | +| :iraq: | `iraq` | :iran: | `iran` | +| :iceland: | `iceland` | :it: | `it` | +| :jersey: | `jersey` | :jamaica: | `jamaica` | +| :jordan: | `jordan` | :jp: | `jp` | +| :kenya: | `kenya` | :kyrgyzstan: | `kyrgyzstan` | +| :cambodia: | `cambodia` | :kiribati: | `kiribati` | +| :comoros: | `comoros` | :st_kitts_nevis: | `st_kitts_nevis` | +| :north_korea: | `north_korea` | :kr: | `kr` | +| :kuwait: | `kuwait` | :cayman_islands: | `cayman_islands` | +| :kazakhstan: | `kazakhstan` | :laos: | `laos` | +| :lebanon: | `lebanon` | :st_lucia: | `st_lucia` | +| :liechtenstein: | `liechtenstein` | :sri_lanka: | `sri_lanka` | +| :liberia: | `liberia` | :lesotho: | `lesotho` | +| :lithuania: | `lithuania` | :luxembourg: | `luxembourg` | +| :latvia: | `latvia` | :libya: | `libya` | +| :morocco: | `morocco` | :monaco: | `monaco` | +| :moldova: | `moldova` | :montenegro: | `montenegro` | +| :madagascar: | `madagascar` | :marshall_islands: | `marshall_islands` | +| :macedonia: | `macedonia` | :mali: | `mali` | +| :myanmar: | `myanmar` | :mongolia: | `mongolia` | +| :macau: | `macau` | :northern_mariana_islands: | `northern_mariana_islands` | +| :martinique: | `martinique` | :mauritania: | `mauritania` | +| :montserrat: | `montserrat` | :malta: | `malta` | +| :mauritius: | `mauritius` | :maldives: | `maldives` | +| :malawi: | `malawi` | :mexico: | `mexico` | +| :malaysia: | `malaysia` | :mozambique: | `mozambique` | +| :namibia: | `namibia` | :new_caledonia: | `new_caledonia` | +| :niger: | `niger` | :norfolk_island: | `norfolk_island` | +| :nigeria: | `nigeria` | :nicaragua: | `nicaragua` | +| :netherlands: | `netherlands` | :norway: | `norway` | +| :nepal: | `nepal` | :nauru: | `nauru` | +| :niue: | `niue` | :new_zealand: | `new_zealand` | +| :oman: | `oman` | :panama: | `panama` | +| :peru: | `peru` | :french_polynesia: | `french_polynesia` | +| :papua_new_guinea: | `papua_new_guinea` | :philippines: | `philippines` | +| :pakistan: | `pakistan` | :poland: | `poland` | +| :st_pierre_miquelon: | `st_pierre_miquelon` | :pitcairn_islands: | `pitcairn_islands` | +| :puerto_rico: | `puerto_rico` | :palestinian_territories: | `palestinian_territories` | +| :portugal: | `portugal` | :palau: | `palau` | +| :paraguay: | `paraguay` | :qatar: | `qatar` | +| :reunion: | `reunion` | :romania: | `romania` | +| :serbia: | `serbia` | :ru: | `ru` | +| :rwanda: | `rwanda` | :saudi_arabia: | `saudi_arabia` | +| :solomon_islands: | `solomon_islands` | :seychelles: | `seychelles` | +| :sudan: | `sudan` | :sweden: | `sweden` | +| :singapore: | `singapore` | :st_helena: | `st_helena` | +| :slovenia: | `slovenia` | :slovakia: | `slovakia` | +| :sierra_leone: | `sierra_leone` | :san_marino: | `san_marino` | +| :senegal: | `senegal` | :somalia: | `somalia` | +| :suriname: | `suriname` | :south_sudan: | `south_sudan` | +| :sao_tome_principe: | `sao_tome_principe` | :el_salvador: | `el_salvador` | +| :sint_maarten: | `sint_maarten` | :syria: | `syria` | +| :swaziland: | `swaziland` | :turks_caicos_islands: | `turks_caicos_islands` | +| :chad: | `chad` | :french_southern_territories: | `french_southern_territories` | +| :togo: | `togo` | :thailand: | `thailand` | +| :tajikistan: | `tajikistan` | :tokelau: | `tokelau` | +| :timor_leste: | `timor_leste` | :turkmenistan: | `turkmenistan` | +| :tunisia: | `tunisia` | :tonga: | `tonga` | +| :tr: | `tr` | :trinidad_tobago: | `trinidad_tobago` | +| :tuvalu: | `tuvalu` | :taiwan: | `taiwan` | +| :tanzania: | `tanzania` | :ukraine: | `ukraine` | +| :uganda: | `uganda` | :us: | `us` | +| :uruguay: | `uruguay` | :uzbekistan: | `uzbekistan` | +| :vatican_city: | `vatican_city` | :st_vincent_grenadines: | `st_vincent_grenadines` | +| :venezuela: | `venezuela` | :british_virgin_islands: | `british_virgin_islands` | +| :us_virgin_islands: | `us_virgin_islands` | :vietnam: | `vietnam` | +| :vanuatu: | `vanuatu` | :wallis_futuna: | `wallis_futuna` | +| :samoa: | `samoa` | :kosovo: | `kosovo` | +| :yemen: | `yemen` | :mayotte: | `mayotte` | +| :south_africa: | `south_africa` | :zambia: | `zambia` | +| :zimbabwe: | `zimbabwe` | | | \ No newline at end of file diff --git a/exampleSite/content/posts/external-link.md b/exampleSite/content/posts/external-link.md new file mode 100644 index 0000000..1d64e82 --- /dev/null +++ b/exampleSite/content/posts/external-link.md @@ -0,0 +1,40 @@ +--- +title: "欢迎加入 Hugo NexT 组织！" +description: "Hugo NexT 是专门为 Hugo 引擎所打造的主题，保持简单易用和强大的功能！" +keywords: "Hugo,NexT,组织" + +date: 2022-06-01T15:59:41+08:00 +lastmod: 2022-06-01T15:59:41+08:00 + +categories: + - 示例 +tags: + - Hugo + - NexT + +expand: true +extlink: https://gitee.com/hugo-next/hugo-theme-next/ +#comment: +# enable: false +#toc: false +#url: "external-link.html" +weight: 1 +--- + +欢迎来到 `Hugo NexT` 文档站点！ 它是从 [Theme NexT](https://theme-next.js.org/) 移植过来的为 [Hugo](https://gohugo.io/)打造的高品质优雅主题，保持简单易用的特性和强大的功能。 + + + +# 用户指南 + +设置 NexT 主题很容易。只需遵循文档，就可快速创建您的个人网站！ + +# 反馈 + +- 访问 Awesome NexT 列表，与其他用户分享插件和教程。 +- 加入我们的 Gitter 聊天。 +- 在几秒钟内添加或改进翻译。 +- 在 GitHub Issues 中报告一个 :bug:。 +- 在 GitHub 上申请一个新特性。 +- 为最受欢迎的功能请求投票。 + diff --git a/exampleSite/content/posts/hello-world.md b/exampleSite/content/posts/hello-world.md index 4dae177..2abc8de 100644 --- a/exampleSite/content/posts/hello-world.md +++ b/exampleSite/content/posts/hello-world.md @@ -1,10 +1,9 @@ --- title: "世界，你好！" description: "快速的描述下有关于 Hugo 建站的基本用法。" -isCJKLanguage: true lastmod: 2022-06-03T16:43:23+08:00 -publishDate: 2022-06-02T11:52:03+08:00 +date: 2022-06-02T11:52:03+08:00 categories: - 博客 @@ -12,11 +11,8 @@ tags: - Hugo - 开始 -toc: false -draft: false -expand: true url: hello-world.html -weight: 1 +weight: 2 --- > “使用 `weight` 关键字置顶文章。” diff --git a/i18n/en-us.yaml b/i18n/en.yaml similarity index 100% rename from i18n/en-us.yaml rename to i18n/en.yaml diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0a5ec90..fedc777 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,11 +1,9 @@ -{{- $lang := replaceRE "-([a-z]+)" (upper (substr .Site.Language -3)) .Site.Language -}} -{{- .Scratch.Set "lang" $lang -}} {{- $vendors := .Site.Data.resources.vendors -}} {{- $pluginVen := .Site.Params.vendors.plugins -}} {{- $pluginCDN := index $vendors $pluginVen -}} {{- .Scratch.Set "pluginCDN" $pluginCDN -}} - + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e69de29..35c4d71 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -0,0 +1,29 @@ +{{ range .Paginator.Pages.GroupByDate "2006" }} +
+ {{ .Key }} +
+{{ range .Pages }} +
+
+
+ {{ $month := .Date.Format .Site.Params.monthFormat }} + +
+
+ {{- if isset .Params "extlink" }} + + {{- .Title -}} + + + {{- else }} + + {{- end }} +
+
+
+{{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 8efef6f..631f0d3 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -27,9 +27,8 @@ {{- T "PostArchiveKeepOn" }} - {{ range (.Paginate (.Data.Pages.GroupByDate "2006") 5 ).PageGroups }} - {{- partial "post/list.html" . }} - {{ end }} + + {{ .Render "list" }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6d20ea0..78ebdec 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,5 +1,7 @@ {{- define "title" }}{{- .Title }} - {{ .Site.Title -}}{{- end }} + {{- define "main_inner_class" }}post posts-expand{{- end }} + {{- define "main" }} -{{ partial "post/index.html" (dict "ctx" . "IsHome" false) }} + {{ partial "post.html" (dict "ctx" . "IsHome" false) }} {{- end }} \ No newline at end of file diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html new file mode 100644 index 0000000..07bd27f --- /dev/null +++ b/layouts/_default/taxonomy.html @@ -0,0 +1,6 @@ +{{- define "title" -}} + {{- .Title }} - {{ T .Data.Singular | default .Data.Singular }} - {{ .Site.Title -}} +{{- end -}} +{{ define "main" }} + {{ .Data.Singular }} +{{- end }} \ No newline at end of file diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html new file mode 100644 index 0000000..d434450 --- /dev/null +++ b/layouts/_default/terms.html @@ -0,0 +1,6 @@ +{{- define "title" -}} + {{- .Params.Title | default (T .Data.Plural) | default .Data.Plural | dict "Some" | T "AllSome" }} - {{ .Site.Title -}} +{{- end -}} +{{ define "main" }} + {{ .Data.Terms }} +{{ end }} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index 11234b8..50f5ee0 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -2,7 +2,7 @@ {{- define "main" }} {{ $paginator := .Paginate (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }} {{- range $paginator.Pages }} -{{ partial "post/index.html" (dict "ctx" . "IsHome" true) }} +{{ partial "post.html" (dict "ctx" . "IsHome" true) }} {{- end }} {{- partial "partials/pagination.html" . }} {{- end }} \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index a183e1d..c09d5d6 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,13 +1,4 @@ {{- $ft := .Site.Params.footer }} -{{- if $ft.beian.enable }} -{{- with $ft.beian }} -
- {{ .icp }} - {{ .provinceAbbr }}公网安备 - {{ .provinceAbbr }}公网安备 {{ .gonganNum }} 号 -
-{{- end }} -{{- end }}
© @@ -88,4 +79,13 @@ {{ $pb := printf "Hugo & NexT.%s" .Site.Params.scheme }} {{- printf (T "FooterPowerby") $pb | safeHTML }}
+{{- end }} +{{- if $ft.beian.enable }} +{{- with $ft.beian }} +
+ {{ .icp }} + {{ .provinceAbbr }}公网安备 + {{ .provinceAbbr }}公网安备 {{ .gonganNum }} 号 +
+{{- end }} {{- end }} \ No newline at end of file diff --git a/layouts/partials/head/meta.html b/layouts/partials/head/meta.html index 01bb521..e74b0a0 100644 --- a/layouts/partials/head/meta.html +++ b/layouts/partials/head/meta.html @@ -1,7 +1,7 @@ {{- if .IsPage }} -{{- with .PublishDate }} +{{- with .Date }} {{- end }} {{- with .Lastmod }} diff --git a/layouts/partials/head/opengraph.html b/layouts/partials/head/opengraph.html index b46ee3b..199be36 100644 --- a/layouts/partials/head/opengraph.html +++ b/layouts/partials/head/opengraph.html @@ -8,10 +8,10 @@ - + {{- if .IsPage }} - + {{- end }} {{- end }} diff --git a/layouts/partials/post.html b/layouts/partials/post.html new file mode 100644 index 0000000..431c50e --- /dev/null +++ b/layouts/partials/post.html @@ -0,0 +1,10 @@ +
+
+ {{ partial "post/header.html" (dict "ctx" .ctx "IsHome" .IsHome) }} + {{ partial "post/body.html" (dict "ctx" .ctx "IsHome" .IsHome) }} + +
+
+ diff --git a/layouts/partials/post/footer_meta/copyright.html b/layouts/partials/post/footer_meta/copyright.html index f9ac549..e9ff1cb 100644 --- a/layouts/partials/post/footer_meta/copyright.html +++ b/layouts/partials/post/footer_meta/copyright.html @@ -16,9 +16,9 @@ {{- end }}
  • - {{- if isset .Params "originlink" }} + {{- if isset .Params "link" }} {{ print (T "PostCROriginLink") (T "SymbolColon") }} - {{ .Params.OriginLink }} + {{ .Params.Link }} {{- else }} {{ print (T "PostCRLink") (T "SymbolColon") }} {{ .Permalink }} diff --git a/layouts/partials/post/header.html b/layouts/partials/post/header.html index 0ef33a4..aba6b34 100644 --- a/layouts/partials/post/header.html +++ b/layouts/partials/post/header.html @@ -20,8 +20,8 @@ {{- end }} {{- if $.IsHome }} - {{- if and (isset .Params "link") (ne .Params.Link "") }} - + {{- if and (isset .Params "extlink") (ne .Params.Extlink "") }} + {{ .Title }} diff --git a/layouts/partials/post/header_meta/created_date.html b/layouts/partials/post/header_meta/created_date.html index 6a1f9fc..c92b543 100644 --- a/layouts/partials/post/header_meta/created_date.html +++ b/layouts/partials/post/header_meta/created_date.html @@ -1,13 +1,13 @@ {{- if .Site.Params.postMeta.created }} {{ $timeF := .Site.Params.timeFormat }} -{{ $createdTime := (.Date.Format $timeF) | default (.PublishDate.Format $timeF) }} +{{ $createdTime := (.Date.Format $timeF) | default (.Date.Format $timeF) }} {{- print (T "PostPublishDate") (T "SymbolColon") -}} - {{- end }} \ No newline at end of file diff --git a/layouts/partials/post/header_meta/update_date.html b/layouts/partials/post/header_meta/update_date.html index e8ea442..af82d7a 100644 --- a/layouts/partials/post/header_meta/update_date.html +++ b/layouts/partials/post/header_meta/update_date.html @@ -1,5 +1,5 @@ {{- if and .Site.Params.postMeta.updated.enable .Site.Params.postMeta.updated.anotherDay }} -{{- if and .Lastmod (gt .Lastmod .PublishDate) }} +{{- if and .Lastmod (gt .Lastmod .Date) }} {{ $modTime := .Lastmod.Format .Site.Params.timeFormat }} diff --git a/layouts/partials/post/index.html b/layouts/partials/post/index.html deleted file mode 100644 index b67e13e..0000000 --- a/layouts/partials/post/index.html +++ /dev/null @@ -1,13 +0,0 @@ - -
    -
    - - {{ partial "post/header.html" (dict "ctx" .ctx "IsHome" .IsHome) }} - - {{ partial "post/body.html" (dict "ctx" .ctx "IsHome" .IsHome) }} -
    - {{ partial "post/footer.html" (dict "ctx" .ctx "IsHome" .IsHome) }} -
    -
    -
    - diff --git a/layouts/partials/post/list.html b/layouts/partials/post/list.html deleted file mode 100644 index 97a9481..0000000 --- a/layouts/partials/post/list.html +++ /dev/null @@ -1,27 +0,0 @@ -
    - {{ .Key }} -
    -{{ range .Pages }} - -{{ end }} \ No newline at end of file diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html index f8c8471..216ddb7 100644 --- a/layouts/partials/scripts.html +++ b/layouts/partials/scripts.html @@ -16,4 +16,82 @@ {{- $pluginJS = replace $pluginJS "${version}" $js.version }} {{- $pluginJS = replace $pluginJS "${file}" $file }} -{{- end }} \ No newline at end of file +{{- end }} + + + +{{ $config := resources.Get "js/config.js" }} +{{ $boot := resources.Get "js/next-boot.js" }} +{{ $utils := resources.Get "js/utils.js" }} +{{ $alljs := (slice $config $boot $utils) | resources.Concat "js/all.js"}} + \ No newline at end of file diff --git a/layouts/partials/sidebar/overview.html b/layouts/partials/sidebar/overview.html index 6418422..ac6dc3b 100644 --- a/layouts/partials/sidebar/overview.html +++ b/layouts/partials/sidebar/overview.html @@ -12,7 +12,7 @@