From 75f8ab4b63f9834f269b23dde9eeef4fff13eeb4 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Wed, 27 Sep 2023 20:20:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E9=A1=B5=E9=9D=A2=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 218 ++++++----- templates/fcircle.html | 4 +- templates/modules/comment/Artalk.html | 2 +- templates/modules/comment/Twikoo.html | 2 +- templates/modules/comment/Waline.html | 2 +- templates/modules/widgets/aside/comments.html | 7 +- templates/new_comment.html | 358 ++++++++++++++++++ theme.yaml | 4 + 8 files changed, 497 insertions(+), 100 deletions(-) create mode 100644 templates/new_comment.html diff --git a/settings.yaml b/settings.yaml index 7e4d5f69..bee75320 100644 --- a/settings.yaml +++ b/settings.yaml @@ -736,11 +736,20 @@ spec: label: 最新文章 value: 4 help: 文章数量 - - $formkit: number - name: newcommentnumber + - $formkit: group + name: newcomment label: 最新评论 - value: 5 - help: 最新评论数量, 小于 0 则展示5条评论 + value: + newcommentUrl: /newest + newcommentnumber: 5 + children: + - $formkit: url + name: newcommentUrl + label: 跳转地址 + - $formkit: number + name: newcommentnumber + label: 数量 + help: 最新评论数量, 小于 0 则展示5条评论 - $formkit: number name: categoryQuantity label: 文章分类 @@ -1563,6 +1572,117 @@ spec: placeholder: 请输入左下角按钮跳转链接 value: https://www.apple.com.cn/macbook-pro/ + - group: new_comment + label: 最近评论 + formSchema: + - $formkit: attachment + name: backgroundImg + label: 背景图 + value: https://liuzhihang.com/upload/moments.png + placeholder: 请输入图片地址 + - $formkit: text + name: smallTitle + label: 小标题 + value: 评论 + - $formkit: text + name: bigTitle + label: 大标题 + value: 最近评论 + - $formkit: text + name: detail + label: 描述 + value: 快速查看本站最近评论内容。 + + - group: envelope_comment + label: 留言板 + formSchema: + - $formkit: radio + label: 弹幕 + name: enable_danmu + value: true + options: + - label: 启用 + value: true + - label: 禁用 + value: false + - $formkit: radio + label: 信笺 + name: enable_envelope_comment + key: enable_envelope_comment + id: enable_envelope_comment + value: true + options: + - label: 启用 + value: true + - label: 禁用 + value: false + - $formkit: textarea + if: $get(enable_envelope_comment).value + name: title + label: 标题 + placeholder: 请输入内容 + value:
留言板
+ help: 支持 HTML 语法 + - $formkit: group + name: custom_pic + if: $get(enable_envelope_comment).value + label: 信笺图片 + value: + cover: + line: + beforeimg: + afterimg: + children: + - $formkit: attachment + name: cover + label: 头部图片 + placeholder: 请输入内容 + value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/violet.jpg" + - $formkit: attachment + name: line + label: 底部图片 + placeholder: 请输入内容 + value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/line.png" + - $formkit: attachment + name: beforeimg + label: 前半部分图片 + placeholder: 请输入内容 + value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/before.png" + - $formkit: attachment + name: afterimg + label: 后半部分图片 + placeholder: 请输入内容 + value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/after.png" + - $formkit: repeater + name: messageList + if: $get(enable_envelope_comment).value + label: 正文 + value: + - content: "有什么想问的？" + - content: "有什么想说的？" + - content: "有什么想吐槽的？" + - content: "哪怕是有什么想吃的，都可以告诉我哦~" + children: + - $formkit: text + name: content + label: 内容 + placeholder: 请输入内容 + value: "有什么想问的？" + - $formkit: text + name: bottom + if: $get(enable_envelope_comment).value + label: 底部文本 + placeholder: 请输入内容 + value: 自动书记人偶竭诚为您服务！ + help: 仅支持单行文本 + - $formkit: number + name: height + if: $get(enable_envelope_comment).value + label: 高度 + placeholder: 请输入内容 + help: 信封划出的高度 + value: 1024 + - group: about label: 关于 formSchema: @@ -1978,96 +2098,6 @@ spec: - label: 否 value: N - - group: envelope_comment - label: 留言板 - formSchema: - - $formkit: radio - label: 弹幕 - name: enable_danmu - value: true - options: - - label: 启用 - value: true - - label: 禁用 - value: false - - $formkit: radio - label: 信笺 - name: enable_envelope_comment - key: enable_envelope_comment - id: enable_envelope_comment - value: true - options: - - label: 启用 - value: true - - label: 禁用 - value: false - - $formkit: textarea - if: $get(enable_envelope_comment).value - name: title - label: 标题 - placeholder: 请输入内容 - value:
留言板
- help: 支持 HTML 语法 - - $formkit: group - name: custom_pic - if: $get(enable_envelope_comment).value - label: 信笺图片 - value: - cover: - line: - beforeimg: - afterimg: - children: - - $formkit: attachment - name: cover - label: 头部图片 - placeholder: 请输入内容 - value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/violet.jpg" - - $formkit: attachment - name: line - label: 底部图片 - placeholder: 请输入内容 - value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/line.png" - - $formkit: attachment - name: beforeimg - label: 前半部分图片 - placeholder: 请输入内容 - value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/before.png" - - $formkit: attachment - name: afterimg - label: 后半部分图片 - placeholder: 请输入内容 - value: "https://npm.elemecdn.com/hexo-butterfly-envelope/lib/after.png" - - $formkit: repeater - name: messageList - if: $get(enable_envelope_comment).value - label: 正文 - value: - - content: "有什么想问的？" - - content: "有什么想说的？" - - content: "有什么想吐槽的？" - - content: "哪怕是有什么想吃的，都可以告诉我哦~" - children: - - $formkit: text - name: content - label: 内容 - placeholder: 请输入内容 - value: "有什么想问的？" - - $formkit: text - name: bottom - if: $get(enable_envelope_comment).value - label: 底部文本 - placeholder: 请输入内容 - value: 自动书记人偶竭诚为您服务！ - help: 仅支持单行文本 - - $formkit: number - name: height - if: $get(enable_envelope_comment).value - label: 高度 - placeholder: 请输入内容 - help: 信封划出的高度 - value: 1024 - - group: comments label: 评论 formSchema: diff --git a/templates/fcircle.html b/templates/fcircle.html index 6b4d8b9b..8ee78d51 100644 --- a/templates/fcircle.html +++ b/templates/fcircle.html @@ -1,6 +1,6 @@ + th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'fcircle',title = ${singlePage.spec.title + ' | ' + site.title} )}"> @@ -8,7 +8,7 @@
- +
diff --git a/templates/modules/comment/Artalk.html b/templates/modules/comment/Artalk.html index b11cdc87..66d704bc 100644 --- a/templates/modules/comment/Artalk.html +++ b/templates/modules/comment/Artalk.html @@ -59,7 +59,7 @@ const necommHtml = array => { let result = '' - const pagesize = [[${ theme.config.sidebar.newcommentnumber }]]; + const pagesize = [[${ theme.config.sidebar.newcomment.newcommentnumber }]]; const defaultpagesize = 5; const finalpagesize = pagesize <= 0 ? defaultpagesize : pagesize; diff --git a/templates/modules/comment/Twikoo.html b/templates/modules/comment/Twikoo.html index 97b82154..457d5fff 100644 --- a/templates/modules/comment/Twikoo.html +++ b/templates/modules/comment/Twikoo.html @@ -98,7 +98,7 @@ not #strings.isEmpty(theme.config.comments.twikoos.envId)}"> const necommHtml = array => { let result = '' - const pagesize = [[${theme.config.sidebar.newcommentnumber}]]; + const pagesize = [[${theme.config.sidebar.newcomment.newcommentnumber}]]; const defaultpagesize = 5; const finalpagesize = pagesize <= 0 ? defaultpagesize : pagesize; diff --git a/templates/modules/comment/Waline.html b/templates/modules/comment/Waline.html index 7df69c7c..48dc5fb8 100644 --- a/templates/modules/comment/Waline.html +++ b/templates/modules/comment/Waline.html @@ -86,7 +86,7 @@ const necommHtml = array => { let result = '' - const pagesize = [[${ theme.config.sidebar.newcommentnumber }]]; + const pagesize = [[${ theme.config.sidebar.newcomment.newcommentnumber }]]; const defaultpagesize = 5; const finalpagesize = pagesize <= 0 ? defaultpagesize : pagesize; diff --git a/templates/modules/widgets/aside/comments.html b/templates/modules/widgets/aside/comments.html index 1382cd3e..6b72aeee 100644 --- a/templates/modules/widgets/aside/comments.html +++ b/templates/modules/widgets/aside/comments.html @@ -2,10 +2,15 @@
+
最新评论
+ th:with="newcommentnumber = ${#conversions.convert(theme.config.sidebar.newcomment.newcommentnumber, 'java.lang.Integer') >= 0 ? theme.config.sidebar.newcommentnumber : 5}">
+ + + +
+ + +
+ +
+
+
+
+
+ +
+
+ +
+ [[${comment.owner.displayName}]] + [[${#dates.format(comment.metadata.creationTimestamp, + 'yyyy-MM-dd HH:mm:ss')}]] +
+
+
[[${comment.spec.content}]] +
+
[[${article}]]
+
+ + +
+ + + + + + + +
+ + +
+ +
+ + +
+ + + + \ No newline at end of file diff --git a/theme.yaml b/theme.yaml index 029b7882..a4095362 100644 --- a/theme.yaml +++ b/theme.yaml @@ -41,6 +41,10 @@ spec: description: 相册页面 screenshot: file: album.html + - name: 最近评论页面模版 + description: 最近评论页面 + screenshot: + file: new_comment.html description: Halo 2.x Theme base on Thymeleaf, Referring to Butterfly and Heo logo: https://liuzhihang.com/upload/logo.jpg website: https://liuzhihang.com From db61a3634db1ec330cbaa55cdfe520c271d87ce1 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Wed, 27 Sep 2023 20:55:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=80=E8=BF=91=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=8D=9A=E4=B8=BB=E6=A0=87=E7=AD=BE=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/new_comment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/new_comment.html b/templates/new_comment.html index 05be4dd1..babb3837 100644 --- a/templates/new_comment.html +++ b/templates/new_comment.html @@ -232,7 +232,7 @@ font-size: 13px; line-height: 1; display: inline-flex; - padding: 3px 3px 3px 6px; + padding: 3px 4px 4px 4.5px; border-radius: 3px; margin-left: 5px; letter-spacing: 1px;