diff --git a/package.json b/package.json index 1c23ee87..0daf97b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-theme-hao", - "version": "1.4.4", + "version": "1.4.5", "dependencies": { } } diff --git a/settings.yaml b/settings.yaml index 14c25a8e..66a6e360 100644 --- a/settings.yaml +++ b/settings.yaml @@ -645,8 +645,8 @@ spec: - $formkit: attachment name: backgroundImg label: 背景图片 - value: https://pic.cnkj.site/b/2023/6585299246b8a.webp?type=blog - placeholder: 请输入背景图片地址 + value: /themes/theme-hao/assets/images/sidebar/profile.webp + placeholder: 请输入背景图片路径或地址（建议使用 280px * 330px 图片效果最佳） - $formkit: attachment name: stickerImg if: $get(profileStyle).value == 'one' @@ -1058,7 +1058,15 @@ spec: name: footerContent label: 页脚内容 value: - default_enable: true + default_enable_group: + default_enable: true + dingyue: true + zhuti: true + about: true + icp_icon: true + gongwangan: true + yingsi: true + yunzhichi: false style_one: owner_enable: false runtime_enable: true @@ -1072,43 +1080,131 @@ spec: shields: "https://npm.onmicrosoft.cn/hao-theme-static@1.3.6/images/Frame-Halo-blue.svg" message: "博客框架为halo2.x" children: - - $formkit: radio - name: default_enable - id: default_enable - key: default_enable - label: 底部 - options: - - label: 显示 - value: true - - label: 隐藏 - value: false - - $formkit: radio - if: $get(default_enable).value - name: dingyue - label: 订阅 - options: - - label: 显示 - value: true - - label: 隐藏 - value: false - - $formkit: radio - if: $get(default_enable).value - name: zhuti - label: 主题 - options: - - label: 显示 - value: true - - label: 隐藏 - value: false - - $formkit: radio - if: $get(default_enable).value - name: about - label: 关于 - options: - - label: 显示 - value: true - - label: 隐藏 - value: false + - $formkit: group + name: default_enable_group + label: 底部页脚 + value: + children: + - $formkit: radio + name: default_enable + id: default_enable + key: default_enable + label: 底部启用 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: dingyue + id: dingyue + key: dingyue + label: 订阅 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: zhuti + id: zhuti + key: zhuti + label: 主题 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: about + id: about + key: about + label: 关于 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: icp_icon + id: icp_icon + key: icp_icon + label: icp备案 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: gongwangan + id: gongwangan + key: gongwangan + label: 公网安备案 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: yingsi + id: yingsi + key: yingsi + label: 隐私 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + if: $get(default_enable).value + name: yunzhichi + id: yunzhichi + key: yunzhichi + label: 云服务支持 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: select + name: yunzhichi_list + id: yunzhichi_list + key: yunzhichi_list + if: $get(yunzhichi).value + label: 云服务商 + options: + - value: upyun_cloud + label: 又拍云 + - value: aliyun_cloud + label: 阿里云 + - value: tencent_cloud + label: 腾讯云 + - value: huawei_cloud + label: 华为云 + - value: custom_cloud + label: 自定义地址 + - $formkit: attachment + name: yunzhichi_url + id: yunzhichi_url + key: yunzhichi_url + label: 自定义云支持地址 + if: $get(yunzhichi_list).value == 'custom_cloud' + value: + placeholder: 请输入自定义云支持地址 + - $formkit: attachment + name: yunzhichi_url_link + id: yunzhichi_url_link + key: yunzhichi_url_link + label: 自定义云支持跳转地址 + if: $get(yunzhichi_list).value == 'custom_cloud' + value: + placeholder: 请输入自定义云支持跳转地址（注意是跳转地址不是图片展示地址） - $formkit: group name: style_one label: 中间 diff --git a/templates/assets/images/footer/aliyun.png b/templates/assets/images/footer/aliyun.png new file mode 100644 index 00000000..fd24d23b Binary files /dev/null and b/templates/assets/images/footer/aliyun.png differ diff --git a/templates/assets/images/footer/huawei.png b/templates/assets/images/footer/huawei.png new file mode 100644 index 00000000..2223833c Binary files /dev/null and b/templates/assets/images/footer/huawei.png differ diff --git a/templates/assets/images/footer/tencent.png b/templates/assets/images/footer/tencent.png new file mode 100644 index 00000000..231bc040 Binary files /dev/null and b/templates/assets/images/footer/tencent.png differ diff --git a/templates/assets/images/footer/upyun-5.png b/templates/assets/images/footer/upyun-5.png new file mode 100644 index 00000000..bd32376d Binary files /dev/null and b/templates/assets/images/footer/upyun-5.png differ diff --git a/templates/assets/images/footer/youpaiyun.png b/templates/assets/images/footer/youpaiyun.png new file mode 100644 index 00000000..2b231a5e Binary files /dev/null and b/templates/assets/images/footer/youpaiyun.png differ diff --git a/templates/assets/images/sidebar/profile.webp b/templates/assets/images/sidebar/profile.webp new file mode 100644 index 00000000..ceb41b5e Binary files /dev/null and b/templates/assets/images/sidebar/profile.webp differ diff --git a/templates/modules/footer.html b/templates/modules/footer.html index bbadea08..48a1a757 100644 --- a/templates/modules/footer.html +++ b/templates/modules/footer.html @@ -1,5 +1,5 @@ - diff --git a/templates/modules/post-list.html b/templates/modules/post-list.html index 9773fe9d..b6cebe11 100644 --- a/templates/modules/post-list.html +++ b/templates/modules/post-list.html @@ -40,7 +40,14 @@
- + +
+ + +    + + +
@@ -98,6 +105,29 @@ transform: translateX(100%) skewX(-60deg); } + +
diff --git a/templates/modules/sidebar.html b/templates/modules/sidebar.html index b52cb2b2..ef9b4bb4 100644 --- a/templates/modules/sidebar.html +++ b/templates/modules/sidebar.html @@ -64,8 +64,9 @@ th:with="tags = ${tagFinder.listAll()}">
- [[${tag.spec.displayName}]] @@ -73,4 +74,4 @@
- \ No newline at end of file + diff --git a/templates/modules/variables/site-config.html b/templates/modules/variables/site-config.html index 2299da95..6c651972 100644 --- a/templates/modules/variables/site-config.html +++ b/templates/modules/variables/site-config.html @@ -129,7 +129,7 @@ locale: [[${not #strings.isEmpty(theme.config.comments.walines.locale) ? theme.config.comments.walines.locale : '' }]] }, footer: { - default_enable: [[${theme.config.footer.footerContent.default_enable}]] + default_enable: [[${theme.config.footer.footerContent.default_enable_group.default_enable}]] } } }; diff --git a/theme.yaml b/theme.yaml index 81ce6162..1f91b77a 100644 --- a/theme.yaml +++ b/theme.yaml @@ -51,5 +51,5 @@ spec: repo: https://githubfast.com/liuzhihang/halo-theme-hao settingName: "theme-hao-setting" configMapName: "theme-hao-configMap" - version: "1.4.4" + version: "1.4.5" require: ">=2.10.0"