github
/
halo-theme-hao
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'liuzhihang:main' into main

This commit is contained in:
困困鱼 2023-12-19 20:35:56 +08:00 committed by GitHub
parent 120a3e8de7 993f2722b0
commit 8256264d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.all-contributorsrc
View File

@ -129,6 +129,15 @@
"contributions": [ "contributions": [
"code" "code"
] ]
},
{
"login": "carolcoral",
"name": "Carol",
"avatar_url": "https://avatars.githubusercontent.com/u/8952687?v=4",
"profile": "https://github.com/carolcoral",
"contributions": [
"code"
]
} }
], ],
"files": [ "files": [

52
README.md
View File

@ -34,15 +34,16 @@
## 🔥 预览 ## 🔥 预览
| 站点名称 | 站点地址 | | 站点名称 | 站点地址 |
|:--------:|:-------------------------:| |:----------:|:-----------------------:|
| 程序员小航 | https://liuzhihang.com | | 程序员小航 | https://liuzhihang.com |
| 流殃 | https://shyblog.world | | 流殃 | https://shyblog.world |
| 羡羡 | https://www.hydsb0.com/ | | 羡羡 | https://www.hydsb0.com/ |
| 困困鱼 | https://kunkunyu.com | | 困困鱼 | https://kunkunyu.com |
| Top John | https://op-lab.top | | Top John | https://op-lab.top |
| Roozen | https://roozen.top | | Roozen | https://roozen.top |
| Lanbin | https://lib.lanbin.top | | Lanbin | https://lib.lanbin.top |
| Carol`s 小屋 | https://blog.cnkj.site |
## 👋 简介 ## 👋 简介
@ -132,7 +133,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-) [![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END --> <!-- ALL-CONTRIBUTORS-BADGE:END -->
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section --> <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@ -141,30 +142,31 @@ This project follows the [all-contributors](https://github.com/all-contributors/
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td align="center" valign="top" width="16.66%"><a href="https://liuzhihang.com/"><img src="https://usercontent.github.com/avatars/u/26057042?v=4?s=100" width="100px;" alt="liuzhihang"/><br /><sub><b>liuzhihang</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=liuzhihang" title="Code">💻</a> <a href="#tutorial-liuzhihang" title="Tutorials">✅</a></td> <td align="center" valign="top" width="16.66%"><a href="https://liuzhihang.com/"><img src="https://avatars.githubusercontent.com/u/26057042?v=4?s=100" width="100px;" alt="liuzhihang"/><br /><sub><b>liuzhihang</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=liuzhihang" title="Code">💻</a> <a href="#tutorial-liuzhihang" title="Tutorials">✅</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://shyblog.world/"><img src="https://usercontent.github.com/avatars/u/50973219?v=4?s=100" width="100px;" alt="sunheyi"/><br /><sub><b>sunheyi</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=shy-share" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://shyblog.world/"><img src="https://avatars.githubusercontent.com/u/50973219?v=4?s=100" width="100px;" alt="sunheyi"/><br /><sub><b>sunheyi</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=shy-share" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Joydevelop"><img src="https://usercontent.github.com/avatars/u/79132319?v=4?s=100" width="100px;" alt="Joy"/><br /><sub><b>Joy</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Joydevelop" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://github.com/Joydevelop"><img src="https://avatars.githubusercontent.com/u/79132319?v=4?s=100" width="100px;" alt="Joy"/><br /><sub><b>Joy</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Joydevelop" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://johnniang.me"><img src="https://usercontent.github.com/avatars/u/16865714?v=4?s=100" width="100px;" alt="John Niang"/><br /><sub><b>John Niang</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=JohnNiang" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://johnniang.me"><img src="https://avatars.githubusercontent.com/u/16865714?v=4?s=100" width="100px;" alt="John Niang"/><br /><sub><b>John Niang</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=JohnNiang" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://lanbinovo.cn"><img src="https://usercontent.github.com/avatars/u/62149873?v=4?s=100" width="100px;" alt="Lanbin"/><br /><sub><b>Lanbin</b></sub></a><br /><a href="#tutorial-lanbinshijie" title="Tutorials">✅</a></td> <td align="center" valign="top" width="16.66%"><a href="https://lanbinovo.cn"><img src="https://avatars.githubusercontent.com/u/62149873?v=4?s=100" width="100px;" alt="Lanbin"/><br /><sub><b>Lanbin</b></sub></a><br /><a href="#tutorial-lanbinshijie" title="Tutorials">✅</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://blog.sunguoqi.com/"><img src="https://usercontent.github.com/avatars/u/79169717?v=4?s=100" width="100px;" alt="小孙同学"/><br /><sub><b>小孙同学</b></sub></a><br /><a href="#tutorial-sun0225SUN" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=sun0225SUN" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://blog.sunguoqi.com/"><img src="https://avatars.githubusercontent.com/u/79169717?v=4?s=100" width="100px;" alt="小孙同学"/><br /><sub><b>小孙同学</b></sub></a><br /><a href="#tutorial-sun0225SUN" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=sun0225SUN" title="Code">💻</a></td>
</tr> </tr>
<tr> <tr>
<td align="center" valign="top" width="16.66%"><a href="http://airbozh.cn"><img src="https://usercontent.github.com/avatars/u/50261327?v=4?s=100" width="100px;" alt="airbo"/><br /><sub><b>airbo</b></sub></a><br /><a href="#tutorial-AirboZH" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=AirboZH" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="http://airbozh.cn"><img src="https://avatars.githubusercontent.com/u/50261327?v=4?s=100" width="100px;" alt="airbo"/><br /><sub><b>airbo</b></sub></a><br /><a href="#tutorial-AirboZH" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=AirboZH" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/gadore"><img src="https://usercontent.github.com/avatars/u/18081104?v=4?s=100" width="100px;" alt="Gadore"/><br /><sub><b>Gadore</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=gadore" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://github.com/gadore"><img src="https://avatars.githubusercontent.com/u/18081104?v=4?s=100" width="100px;" alt="Gadore"/><br /><sub><b>Gadore</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=gadore" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://www.hydsb0.com"><img src="https://usercontent.github.com/avatars/u/64968400?v=4?s=100" width="100px;" alt="羡羡"/><br /><sub><b>羡羡</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=xyhcode" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://www.hydsb0.com"><img src="https://avatars.githubusercontent.com/u/64968400?v=4?s=100" width="100px;" alt="羡羡"/><br /><sub><b>羡羡</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=xyhcode" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/chengzhongxue"><img src="https://usercontent.github.com/avatars/u/89380218?v=4?s=100" width="100px;" alt="困困鱼"/><br /><sub><b>困困鱼</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=chengzhongxue" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://github.com/chengzhongxue"><img src="https://avatars.githubusercontent.com/u/89380218?v=4?s=100" width="100px;" alt="困困鱼"/><br /><sub><b>困困鱼</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=chengzhongxue" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://op-lab.top"><img src="https://usercontent.github.com/avatars/u/7914367?v=4?s=100" width="100px;" alt="Top John"/><br /><sub><b>Top John</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=TopJohn" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://op-lab.top"><img src="https://avatars.githubusercontent.com/u/7914367?v=4?s=100" width="100px;" alt="Top John"/><br /><sub><b>Top John</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=TopJohn" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://khbit.cn"><img src="https://usercontent.github.com/avatars/u/72146468?v=4?s=100" width="100px;" alt="BugJi"/><br /><sub><b>BugJi</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=daizihan233" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://khbit.cn"><img src="https://avatars.githubusercontent.com/u/72146468?v=4?s=100" width="100px;" alt="BugJi"/><br /><sub><b>BugJi</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=daizihan233" title="Code">💻</a></td>
</tr> </tr>
<tr> <tr>
<td align="center" valign="top" width="16.66%"><a href="http://roozen.top"><img src="https://usercontent.github.com/avatars/u/93673944?v=4?s=100" width="100px;" alt="Roozen"/><br /><sub><b>Roozen</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Roozenlz" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="http://roozen.top"><img src="https://avatars.githubusercontent.com/u/93673944?v=4?s=100" width="100px;" alt="Roozen"/><br /><sub><b>Roozen</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Roozenlz" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://www.stonewu.com/"><img src="https://usercontent.github.com/avatars/u/25025423?v=4?s=100" width="100px;" alt="石头君"/><br /><sub><b>石头君</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Stonewuu" title="Code">💻</a></td> <td align="center" valign="top" width="16.66%"><a href="https://www.stonewu.com/"><img src="https://avatars.githubusercontent.com/u/25025423?v=4?s=100" width="100px;" alt="石头君"/><br /><sub><b>石头君</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Stonewuu" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/carolcoral"><img src="https://avatars.githubusercontent.com/u/8952687?v=4?s=100" width="100px;" alt="Carol"/><br /><sub><b>Carol</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=carolcoral" title="Code">💻</a></td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td align="center" size="13px" colspan="6"> <td align="center" size="13px" colspan="6">
<img src="https://usercontent.github.com/raw/all-contributors/all-contributors-cli/1b8533af435da9854653492b1327a23a4dbd0a10/assets/logo-small.svg"> <img src="https://raw.githubusercontent.com/all-contributors/all-contributors-cli/1b8533af435da9854653492b1327a23a4dbd0a10/assets/logo-small.svg">
<a href="https://all-contributors.js.org/docs/en/bot/usage">Add your contributions</a> <a href="https://all-contributors.js.org/docs/en/bot/usage">Add your contributions</a>
</img> </img>
</td> </td>

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "halo-theme-hao", "name": "halo-theme-hao",
"version": "1.4.3", "version": "1.4.4",
"dependencies": { "dependencies": {
} }
} }

29
settings.yaml
View File

@ -1041,12 +1041,41 @@ spec:
children: children:
- $formkit: radio - $formkit: radio
name: default_enable name: default_enable
id: default_enable
key: default_enable
label: 底部 label: 底部
options: options:
- label: 显示 - label: 显示
value: true value: true
- label: 隐藏 - label: 隐藏
value: false 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 - $formkit: group
name: style_one name: style_one
label: 中间 label: 中间

18
templates/modules/footer.html
View File

@ -119,19 +119,25 @@
</div> </div>
<div class="footer-banner-right"> <div class="footer-banner-right">
<!-- 订阅 需要 RSS 插件支持 --> <!-- 订阅 需要 RSS 插件支持 -->
<a class="footer-banner-link" href="/sitemap.xml" <a class="footer-banner-link" href="/rss.xml" th:if="${pluginFinder.available('PluginFeed')} and ${theme.config.footer.footerContent.dingyue}">订阅</a>
th:if="${pluginFinder.available('PluginSitemap')}">订阅</a> <a th:if="${theme.config.footer.footerContent.zhuti}" class="footer-banner-link" href="https://github.com/liuzhihang/halo-theme-hao">主题</a>
<a class="footer-banner-link" href="https://github.com/liuzhihang/halo-theme-hao">主题</a> <a th:if="${theme.config.footer.footerContent.about}" class="footer-banner-link" href="/about">关于</a>
<a class="footer-banner-link" href="/about">关于</a>
<a th:if="${not #strings.isEmpty(theme.config.basics.icp)}" <a th:if="${not #strings.isEmpty(theme.config.basics.icp)}"
class="footer-banner-link" href="https://beian.miit.gov.cn/#/Integrated/index" class="footer-banner-link" href="https://beian.miit.gov.cn/#/Integrated/index"
rel="noopener external nofollow noreferrer noopener" rel="noopener external nofollow noreferrer noopener"
target="_blank">[[${theme.config.basics.icp}]] target="_blank">
<span th:if="${not #strings.startsWith(theme.config.basics.icp, 'http')}">[[${theme.config.basics
.icp}]]</span>
<img th:if="${#strings.startsWith(theme.config.basics.icp, 'http')}"
th:src="@{${theme.config.basics.icp}}" alt="icp"/>
</a> </a>
<a th:if="${not #strings.isEmpty(theme.config.basics.gongan)}" <a th:if="${not #strings.isEmpty(theme.config.basics.gongan)}"
class="footer-banner-link" href="http://www.beian.gov.cn/portal/registerSystemInfo" class="footer-banner-link" href="http://www.beian.gov.cn/portal/registerSystemInfo"
rel="noopener external nofollow noreferrer noopener" rel="noopener external nofollow noreferrer noopener"
target="_blank">[[${theme.config.basics.gongan}]] target="_blank">
<span th:if="${not #strings.startsWith(theme.config.basics.gongan, 'http')}">[[${theme.config.basics.gongan}]]</span>
<img th:if="${#strings.startsWith(theme.config.basics.gongan, 'http')}"
th:src="@{${theme.config.basics.gongan}}" alt="gongan"/>
</a> </a>
<a class="footer-banner-link cc" th:href="${theme.config.basics.copyrightAgreement}" <a class="footer-banner-link cc" th:href="${theme.config.basics.copyrightAgreement}"
th:if="${not #strings.isEmpty(theme.config.basics.copyrightAgreement)}" title="cc协议"> th:if="${not #strings.isEmpty(theme.config.basics.copyrightAgreement)}" title="cc协议">

2
theme.yaml
View File

@ -51,5 +51,5 @@ spec:
repo: https://githubfast.com/liuzhihang/halo-theme-hao repo: https://githubfast.com/liuzhihang/halo-theme-hao
settingName: "theme-hao-setting" settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap" configMapName: "theme-hao-configMap"
version: "1.4.3" version: "1.4.4"
require: ">=2.10.0" require: ">=2.10.0"