From 5aa707909f1b6959636d9c3a6f8a6af7568262fd Mon Sep 17 00:00:00 2001 From: fishcpy <2049879862@qq.com> Date: Tue, 11 Mar 2025 21:55:38 +0800 Subject: [PATCH 01/10] Delete unused Link declaration --- settings.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/settings.yaml b/settings.yaml index e1452dc..78b893c 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1213,6 +1213,8 @@ spec: label: 小火车 - value: 'error/common/error_concise' label: 简洁 + - value: 'error/common/error_travellings' + label: 类似开往页面 - value: 'error/common/error_default' label: 默认 - value: 'error/common/error_custom' @@ -1239,6 +1241,8 @@ spec: label: 小火车 - value: 'error/common/error_concise' label: 简洁 + - value: 'error/common/error_travellings' + label: 类似开往页面 - value: 'error/common/error_default' label: 默认 - value: 'error/common/error_custom' From 25639ac2610d405d8f9a155333da4f82b3679d7f Mon Sep 17 00:00:00 2001 From: fishcpy <2049879862@qq.com> Date: Tue, 11 Mar 2025 23:11:15 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E5=BC=80=E5=BE=80=E7=9A=84=E9=94=99=E8=AF=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/error/common/error_travellings.html | 165 ++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 templates/error/common/error_travellings.html diff --git a/templates/error/common/error_travellings.html b/templates/error/common/error_travellings.html new file mode 100644 index 0000000..0d28728 --- /dev/null +++ b/templates/error/common/error_travellings.html @@ -0,0 +1,165 @@ + + + + + + [[${error.status + ' - ' + #strings.defaultString(error.title, 'Internal server error')}]] + + + + + +
+
+

[[${error.status + ' ' + #strings.defaultString(error.title, 'Internal server error')}]]

+

围观群众太过热情，服务器繁忙，请稍后访问。

+

抱歉，您请求的页面不存在。

+

可能是输入的网址有误，或者该页面已被移动或删除。

+ 手动返回首页 +
+
+
+
+
+
+ 本页面基于 开往 制作 +
+ + + + + \ No newline at end of file From 0b2228b92b7f7f6188e2bd7c830e615743c32041 Mon Sep 17 00:00:00 2001 From: fishcpy <2049879862@qq.com> Date: Tue, 11 Mar 2025 23:11:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E5=BC=80=E5=BE=80=E7=9A=84=E9=94=99=E8=AF=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.yaml b/settings.yaml index 78b893c..f2530e4 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1563,3 +1563,4 @@ spec: label: "内嵌Html内容（body）" placeholder: 请输入 Html 代码内容 help: '填入Html代码，将插入body标签尾部，用于自定义显示一段Html内容，注意：Html内容默认会在页脚下方，请注意设置样式避免页脚出现样式问题。' + From f2b0c31e133ca30c651ff8ca315af1abc2b94641 Mon Sep 17 00:00:00 2001 From: fishcpy <2049879862@qq.com> Date: Tue, 11 Mar 2025 23:11:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E5=BC=80=E5=BE=80=E7=9A=84=E9=94=99=E8=AF=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/settings.yaml b/settings.yaml index f2530e4..7c60e02 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1562,5 +1562,4 @@ spec: name: inline_body_html label: "内嵌Html内容（body）" placeholder: 请输入 Html 代码内容 - help: '填入Html代码，将插入body标签尾部，用于自定义显示一段Html内容，注意：Html内容默认会在页脚下方，请注意设置样式避免页脚出现样式问题。' - + help: '填入Html代码，将插入body标签尾部，用于自定义显示一段Html内容，注意：Html内容默认会在页脚下方，请注意设置样式避免页脚出现样式问题。' \ No newline at end of file From 6e570e04acefb78abdd0327c852101aa7c22e44e Mon Sep 17 00:00:00 2001 From: fishcpy <2049879862@qq.com> Date: Tue, 11 Mar 2025 23:14:26 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E5=BC=80=E5=BE=80=E7=9A=84=E9=94=99=E8=AF=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.yaml b/settings.yaml index 7c60e02..78b893c 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1562,4 +1562,4 @@ spec: name: inline_body_html label: "内嵌Html内容（body）" placeholder: 请输入 Html 代码内容 - help: '填入Html代码，将插入body标签尾部，用于自定义显示一段Html内容，注意：Html内容默认会在页脚下方，请注意设置样式避免页脚出现样式问题。' \ No newline at end of file + help: '填入Html代码，将插入body标签尾部，用于自定义显示一段Html内容，注意：Html内容默认会在页脚下方，请注意设置样式避免页脚出现样式问题。' From 9270dfe326c04751a3479eaa3fb65484ae9a6537 Mon Sep 17 00:00:00 2001 From: fishcpy <2049879862@qq.com> Date: Tue, 11 Mar 2025 23:49:10 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=8B=E9=93=BE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF=E6=9D=A5?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 20 +++++++++++++++++++ templates/assets/js/dshare.min.js.LICENSE.txt | 0 templates/links.html | 10 ++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 templates/assets/js/dshare.min.js.LICENSE.txt diff --git a/settings.yaml b/settings.yaml index 78b893c..72eb7a5 100644 --- a/settings.yaml +++ b/settings.yaml @@ -951,6 +951,26 @@ spec: label: 友链页面-RSS订阅地址 placeholder: '请输入RSS订阅地址' help: '用于交换友链时添加朋友圈的RSS订阅地址。' + - $formkit: radio + name: use_user_bio + label: 友链页面-描述来源 + value: true + options: + - value: true + label: 使用用户信息 + - value: false + label: 单独提供 + - $formkit: text + name: links_descriptive + label: 友链页面-自定义描述 + placeholder: '请输入描述' + help: '用于交换友链时添加的描述。' + if: $get(use_user_bio).value == false + - $formkit: text + name: links_descriptive + label: 友链页面-描述（仅在选择单独提供时可用） + placeholder: '请输入描述' + help: '用于交换友链时添加的描述。' - $formkit: code name: links_info label: "友链页面-补充信息" diff --git a/templates/assets/js/dshare.min.js.LICENSE.txt b/templates/assets/js/dshare.min.js.LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/templates/links.html b/templates/links.html index 568df88..13ee1fc 100644 --- a/templates/links.html +++ b/templates/links.html @@ -33,13 +33,19 @@
+ th:with="bloggerAvatar= ${#strings.defaultString(theme.config.page_config.links_blogger_avatar, contributor.avatar)}, + descriptive= ${#strings.defaultString(theme.config.page_config.links_descriptive, '')}">

申请友链的方法：

 From effa4a5ae84ccc758a6ef1ff1d163163492fda37 Mon Sep 17 00:00:00 2001 From: fishcpy <2049879862@qq.com> Date: Wed, 12 Mar 2025 18:23:32 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=8B=E9=93=BE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF=E6=9D=A5?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 21 +++-------------- templates/error/common/error_travellings.html | 23 +++++++++++-------- templates/links.html | 10 ++++---- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/settings.yaml b/settings.yaml index 72eb7a5..cdf65b4 100644 --- a/settings.yaml +++ b/settings.yaml @@ -951,24 +951,9 @@ spec: label: 友链页面-RSS订阅地址 placeholder: '请输入RSS订阅地址' help: '用于交换友链时添加朋友圈的RSS订阅地址。' - - $formkit: radio - name: use_user_bio - label: 友链页面-描述来源 - value: true - options: - - value: true - label: 使用用户信息 - - value: false - label: 单独提供 - $formkit: text name: links_descriptive - label: 友链页面-自定义描述 - placeholder: '请输入描述' - help: '用于交换友链时添加的描述。' - if: $get(use_user_bio).value == false - - $formkit: text - name: links_descriptive - label: 友链页面-描述（仅在选择单独提供时可用） + label: 友链页面-自定义描述（留空使用用户信息） placeholder: '请输入描述' help: '用于交换友链时添加的描述。' - $formkit: code @@ -1234,7 +1219,7 @@ spec: - value: 'error/common/error_concise' label: 简洁 - value: 'error/common/error_travellings' - label: 类似开往页面 + label: 智能归航 - value: 'error/common/error_default' label: 默认 - value: 'error/common/error_custom' @@ -1262,7 +1247,7 @@ spec: - value: 'error/common/error_concise' label: 简洁 - value: 'error/common/error_travellings' - label: 类似开往页面 + label: 智能归航 - value: 'error/common/error_default' label: 默认 - value: 'error/common/error_custom' diff --git a/templates/error/common/error_travellings.html b/templates/error/common/error_travellings.html index 0d28728..1cb0276 100644 --- a/templates/error/common/error_travellings.html +++ b/templates/error/common/error_travellings.html @@ -141,21 +141,26 @@ -
- 本页面基于 开往 制作 -