diff --git a/settings.yaml b/settings.yaml index d8ad4df..2ab8e3a 100644 --- a/settings.yaml +++ b/settings.yaml @@ -828,17 +828,17 @@ sidebar_show: label: 侧边栏标题 type: text placeholder: 请输入标题内容 - description: "可覆盖默认侧边栏标题。" + description: "非必填，可覆盖默认侧边栏标题。" - name: icon label: 侧边栏图标 type: text placeholder: 请输入图标 class 内容 - description: "可覆盖默认侧边栏图标。" + description: "非必填，可覆盖默认侧边栏图标。" - name: content label: 侧边栏内容 type: textarea placeholder: 请输入 HTML 内容 - description: "仅在侧边栏类型为自定义时生效。" + description: "非必填，仅在侧边栏类型为自定义时生效。" sidebar_config: label: 侧边栏配置 items: diff --git a/template/widget/categories.ftl b/template/widget/categories.ftl index 0f0dd59..81e8d0d 100644 --- a/template/widget/categories.ftl +++ b/template/widget/categories.ftl @@ -22,7 +22,7 @@ <#assign postCounts = {}> <@categoryTag method="list">
- 分类 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "分类")} <#if settings.categories_more?? && settings.categories_more== true && categories?size gt num?number> 更多 diff --git a/template/widget/custom.ftl b/template/widget/custom.ftl index 128c625..c395583 100644 --- a/template/widget/custom.ftl +++ b/template/widget/custom.ftl @@ -4,5 +4,5 @@ ${sidebar.title}
- ${sidebar.content} + ${sidebar.content!} \ No newline at end of file diff --git a/template/widget/links.ftl b/template/widget/links.ftl index 4139415..6b23cda 100644 --- a/template/widget/links.ftl +++ b/template/widget/links.ftl @@ -2,7 +2,7 @@
<@linkTag method="listByRandom">
- 友链 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "友链")} <#if settings.links_more?? && settings.links_more== true && links?size gt num?number> 更多 diff --git a/template/widget/love.ftl b/template/widget/love.ftl index 72dcdad..8506fb1 100644 --- a/template/widget/love.ftl +++ b/template/widget/love.ftl @@ -1,6 +1,6 @@
- 恋爱墙 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "恋爱墙")}
diff --git a/template/widget/music.ftl b/template/widget/music.ftl index 68882e4..5151cc3 100644 --- a/template/widget/music.ftl +++ b/template/widget/music.ftl @@ -3,7 +3,7 @@ <#assign sidebar_music = true>
- 音乐 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "音乐")}
<#if (settings.music_mode!'playlist') == 'playlist'> diff --git a/template/widget/notice.ftl b/template/widget/notice.ftl index a04ec76..4c632b8 100644 --- a/template/widget/notice.ftl +++ b/template/widget/notice.ftl @@ -1,6 +1,6 @@
- 公告 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "公告")}
${settings.notice_content!'

  欢迎来访${blog_title!}，博主还没有发布任何公告！

'}
diff --git a/template/widget/recent_comments.ftl b/template/widget/recent_comments.ftl index 200e54e..3cbe9ba 100644 --- a/template/widget/recent_comments.ftl +++ b/template/widget/recent_comments.ftl @@ -1,6 +1,6 @@
- 最新评论 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "最新评论")}
<@commentTag method="latest" top="${settings.recent_comments_num!5}"> <#if comments.content?size gt 0> diff --git a/template/widget/recent_posts.ftl b/template/widget/recent_posts.ftl index 8ea0da8..990e712 100644 --- a/template/widget/recent_posts.ftl +++ b/template/widget/recent_posts.ftl @@ -1,6 +1,6 @@
- 最新文章 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "最新文章")}
<@postTag method="latest" top="${settings.recent_posts_num!5}"> <#if posts?size gt 0> diff --git a/template/widget/tagcloud.ftl b/template/widget/tagcloud.ftl index 7190549..f59108e 100644 --- a/template/widget/tagcloud.ftl +++ b/template/widget/tagcloud.ftl @@ -2,7 +2,7 @@
<@tagTag method="list">
- 标签云 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "标签云")} <#if settings.tagcloud_more?? && settings.tagcloud_more== true && tags?size gt num?number> 更多 diff --git a/template/widget/tags.ftl b/template/widget/tags.ftl index 47d8353..448922c 100644 --- a/template/widget/tags.ftl +++ b/template/widget/tags.ftl @@ -2,7 +2,7 @@
<@tagTag method="list">
- 标签 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "标签")} <#if settings.tags_more?? && settings.tags_more== true && tags?size gt num?number> 更多 diff --git a/template/widget/toc.ftl b/template/widget/toc.ftl index fd287a8..12c7fca 100644 --- a/template/widget/toc.ftl +++ b/template/widget/toc.ftl @@ -1,7 +1,7 @@ <#assign sidebar_toc = true>
- 目录 + ${(sidebar.title?? && sidebar.title != "")?then(sidebar.title, "目录")}