update v1.1.7 from upstream #2

Merged
zhengyi merged 42 commits from merge into main 2023-12-15 16:58:32 +08:00
2 changed files with 15 additions and 8 deletions
Showing only changes of commit 358cb28f43 - Show all commits

View File

@ -2415,13 +2415,15 @@ spec:
label: 金山云
- value: custom
label: 自定义
- $formkit: code
- $formkit: text
name: driven_by_custom_url
if: "$get(driven_by).value === 'custom'"
name: driven_custom
label: 自定义提供商
help: "配置自定义服务提供商此处可填写html代码"
value: ""
language: html
label: 跳转链接
- $formkit: attachment
name: driven_by_custom_img
if: "$get(driven_by).value === 'custom'"
label: 图片地址
- $formkit: radio
name: enable_rss
label: 展示 RSS

View File

@ -72,8 +72,13 @@
</a>提供云服务
</p>
</th:block>
<th:block th:if="${theme.config.footer.driven_by == 'custom'}">
<p class="site_driven" th:utext="${theme.config.footer.driven_custom}"></p>
<th:block th:if="${theme.config.footer.driven_by == 'custom'} and ${theme.config.footer.driven_by_custom_img != ''}">
<p class="site_driven">本站点由
<a th:href="${theme.config.footer.driven_by_custom_url}" target="_blank" rel="noopener noreferrer nofollow">
<img th:class="${theme.config.footer.driven_by}" th:src="${theme.config.footer.driven_by_custom_img}" alt="云服务商"/>
</a>提供云服务
</p>
</th:block>