diff --git a/_config.yml b/_config.yml index 83587e8..e8f5644 100755 --- a/_config.yml +++ b/_config.yml @@ -52,9 +52,6 @@ music: links: true # layout: links 的页面是否显示 post: true # layout: post 的页面是否显示 -top_post: - icon: fas fa-award - text: 置顶 # 推荐文章 recommended_posts: diff --git a/languages/en.yml b/languages/en.yml index 5b000eb..6fdb143 100755 --- a/languages/en.yml +++ b/languages/en.yml @@ -1,8 +1,9 @@ sidebar: category: Categories - tagcloud: Tag Cloud + tagcloud: Hot Tags toc: Table of Contents post: + top: Top read_more: Read More sticky: Sticky comments: Comments diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index 4c03954..b09f4cc 100755 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -3,6 +3,7 @@ sidebar: tagcloud: 热门标签 toc: 文章目录 post: + top: 置顶 read_more: 阅读全文 sticky: 置顶 comments: 评论 diff --git a/languages/zh-HK.yml b/languages/zh-HK.yml index 1eecb4d..9b86bb8 100755 --- a/languages/zh-HK.yml +++ b/languages/zh-HK.yml @@ -3,6 +3,7 @@ sidebar: tagcloud: 熱門標籤 toc: 文章目錄 post: + top: 置頂 read_more: 閱讀全文 sticky: 置頂 comments: 評論 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index b86643e..fbd60ed 100755 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -3,6 +3,7 @@ sidebar: tagcloud: 熱門標籤 toc: 文章目錄 post: + top: 置頂 read_more: 閱讀全文 sticky: 置頂 comments: 評論 diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs index 9f0a88a..85ae362 100755 --- a/layout/_partial/article.ejs +++ b/layout/_partial/article.ejs @@ -6,10 +6,12 @@ <% if(post.layout == 'post'){ %> diff --git a/layout/_partial/meta.ejs b/layout/_partial/meta.ejs index fb5495e..cedb456 100644 --- a/layout/_partial/meta.ejs +++ b/layout/_partial/meta.ejs @@ -29,17 +29,17 @@ <% } %> <% } %> - <% if(post.date){ %> + <% if(post.date && (!page.meta || page.meta.date != false)){ %> <% } %> - <% if(post.categories){ %> + <% if(post.categories && (!page.meta || page.meta.categories != false)){ %> <%- partial('categories',{post:post}) %> <% } %> - <% if(!isPostList && theme.services){ %> + <% if(!isPostList && theme.services && (!page.meta || page.meta.counter != false)){ %> <% if (theme.services.leancloud_visitors == true && config.leancloud_visitors && config.leancloud_visitors.app_id && config.leancloud_visitors.app_key) { %>
@@ -53,9 +53,9 @@ <% } %> <% } %> - <% if(theme.top_post && isPostList && post.top == true){ %> + <% if(isPostList && post.top == true){ %>
-  <%- theme.top_post.text %> +  <%- __('post.top') %>
<% } %> diff --git a/layout/_widget/author.ejs b/layout/_widget/author.ejs index ac5aa02..f17be5d 100755 --- a/layout/_widget/author.ejs +++ b/layout/_widget/author.ejs @@ -14,7 +14,7 @@ <%- markdown(item.body) %> <% } %> <% if (item.jinrishici){ %> -

<%- config.title %>

+

<%- item.jinrishici != true ? item.jinrishici : config.title %>

<% } %>