zhengyi
/
halo-theme-joe3.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #79 from jiewenhuang/dev 

update:v1.1.0
This commit is contained in:
Jevon 2023-09-08 20:40:53 +08:00 committed by GitHub
parent e01196f410 6ae5eee787
commit 871655dbd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "halo-theme-joe3.0",
"version": "1.0.9",
"version": "1.1.0",
"description": "Theme of Halo2",
"devDependencies": {
"uglify-js": "^3.17.4"

19
settings.yaml
View File

@ -59,7 +59,7 @@ spec:
label: 否
- $formkit: attachment
name: background_dark_mode
label: 背景图（浅色模式）
label: 背景图（暗黑模式）
help: "设置暗黑模式下的背景图（建议webp格式），为空则只显示默认背景色"
value: ""
- $formkit: number
@ -704,6 +704,18 @@ spec:
label: 图片或者api地址
value: "http://imgapi.xl0408.top/index.php"
help: "填写图片地址或者随机图api地址"
- $formkit: select
if: "$get(enable_big_banner).value === true"
name: enable_big_banner_hitokoto
id: enable_big_banner_hitokoto
label: 是否启用一言
value: true
help: 更多设置自行修改（/templates/modules/macro/tail.html）s
options:
- value: true
label: 开启
- value: false
label: 关闭
- $formkit: select
if: "$get(enable_big_banner).value === true"
name: enable_big_banner_video
@ -1458,12 +1470,13 @@ spec:
label: 最新评论
- value: "enable_tag_cloud"
label: 标签云
- $formkit: textarea
- $formkit: code
# if: "$get(template_aside).value === 'enable_notice'"
name: site_notice
label: 网站公告
value: "这是你的公告"
help: "网站公告信息，将展示在页面右侧，尽量简洁明了，不填不展示该模块（需要先在 “侧边栏” 中开启公告模块）"
help: "网站公告信息，将展示在页面右侧，尽量简洁明了，不填不展示该模块（需要先在 “侧边栏” 中开启公告模块）,支持html代码"
language: html
- $formkit: attachment
# if: "$get(template_aside).value === 'enable_qrcode'"
name: qrcode_url

2
templates/links.html
View File

@ -20,7 +20,7 @@
<h3>友链列表<span class="totals" >
</span></h3>
<div class="links-group" th:each="group : ${groups}">
<div class="links-group" th:each="group : ${groups.?[spec.displayName != '']}">
<h5>[[${group.spec.displayName}]]</h5>
<ul class="joe_detail__friends evan-friends">
<li class="joe_detail__friends-item" th:each="link : ${group.links}">

1
templates/modules/link.html
View File

@ -268,6 +268,7 @@
.nav_login img{
width: 30px;
height: 30px;
border-radius: 50%;
object-fit: cover;
overflow: hidden;

2
templates/modules/macro/navbar.html
View File

@ -86,7 +86,7 @@
<th:block th:if="${theme.config.navbar.nav_login}">
<div class="nav_login">
<th:block th:if="${#authentication.name == 'anonymousUser'}">
<a class="login_before" href="/console" title="搜索"><i class="jiewen joe-icon-zhanghao" target="_blank"></i></a>
<a class="login_before" href="/console" title="登入"><i class="jiewen joe-icon-zhanghao" target="_blank"></i></a>
</th:block>
<th:block th:if="${#authentication.name != 'anonymousUser'}">
<th:block th:with="contributor = ${contributorFinder.getContributor(#authentication.name)}">

4
templates/modules/macro/tail.html
View File

@ -24,7 +24,7 @@
</th:block>
<script th:src="@{/assets/lib/fancybox/jquery.fancybox.min.js}"></script>
<th:block th:each="aside : ${theme.config.aside.enable_outpost_aside}">
<th:block th:if="${aside.template_aside == 'enable_music_player'} and ${theme.config.aside.music_id != null && theme.config.aside.music_id != ''}">
<th:block th:if="(${aside.template_aside == 'enable_music_player'} and ${theme.config.aside.music_id != null && theme.config.aside.music_id != ''}) or ${htmlType =='post'}">
<link rel="stylesheet" th:href="@{/assets/lib/APlayer/APlayer.min.css}">
<script th:src="@{/assets/lib/APlayer/APlayer.min.js}"></script>
<script th:src="@{/assets/lib/meting/meting.min.js}"></script>
@ -119,7 +119,7 @@
hitokotoParams: {}, // 一言参数，参考：https://developer.hitokoto.cn/sentence/#%E8%AF%B7%E6%B1%82%E5%8F%82%E6%95%B0
hitokotoApi: "https://v1.hitokoto.cn", // 一言API
hitokotoColor: "#ffffff", // 一言文字颜色
hitokotoEnable: true, // 是否使用一言
hitokotoEnable: /*[[${theme.config.beauty.enable_big_banner_hitokoto}]]*/true, // 是否使用一言
});
// 以上配置均为默认值，可直接使用进行初始化

31
templates/modules/widgets/asideWidget.html
View File

@ -11,7 +11,7 @@
<span class="text">公告信息</span>
</div>
<div class="joe_aside__item-contain">
<div class="notice_content">[[${theme.config.aside.site_notice}]]</div>
<div class="notice_content" th:utext="${theme.config.aside.site_notice}"></div>
</div>
</section>
</th:block>
@ -73,7 +73,34 @@
<div class="reply">
<!-- <th:block th:with="post = ${postFinder.getByName(postMate.name)}">-->
<p class="link aside-reply-content">[[${result.spec.content}]]</p>
<th:block th:if="${result.spec.subjectRef.kind == 'SinglePage'} and ${result.spec.subjectRef.name != 'links'}">
<th:block th:with="singlePage = ${singlePageFinder.getByName(result.spec.subjectRef.name)}">
<a class="link aside-reply-content"
th:href="@{${singlePage.status.permalink}}">
<p>[[${result.spec.content}]]</p>
</a>
</th:block>
</th:block>
<th:block th:if="${result.spec.subjectRef.kind == 'SinglePage'} and ${result.spec.subjectRef.name == 'links'}">
<a class="link aside-reply-content"
th:href="@{/links}">
<p>[[${result.spec.content}]]</p>
</a>
</th:block>
<th:block th:if="${result.spec.subjectRef.kind == 'Post'}">
<th:block th:with="post = ${postFinder.getByName(result.spec.subjectRef.name)}">
<a class="link aside-reply-content"
th:href="@{${post.status.permalink}}">
<p>[[${result.spec.content}]]</p>
</a>
</th:block>
</th:block>
<th:block th:if="${result.spec.subjectRef.kind == 'Moment'}">
<a class="link aside-reply-content"
th:href="@{/moments}">
<p>[[${result.spec.content}]]</p>
</a>
</th:block>
<!-- </th:block>-->
</div>
</li>

3
templates/page_links.html
View File

@ -20,7 +20,8 @@
<h3>友链列表<span class="totals" >
</span></h3>
<div class="links-group" th:each="group : ${linkFinder.groupBy()}">
<div class="links-group" th:each="group : ${linkFinder.groupBy()}"
th:if="${group.spec.displayName != ''}">
<h5>[[${group.spec.displayName}]]</h5>
<ul class="joe_detail__friends evan-friends">
<li class="joe_detail__friends-item" th:each="link : ${group.links}">

2
theme.yaml
View File

@ -13,7 +13,7 @@ spec:
repo: "https://github.com/jiewenhuang/halo-theme-joe3.0"
settingName: "theme-Joe-setting"
configMapName: "theme-Joe-configMap"
version: "1.0.9"
version: "1.1.0"
require: ">=2.8.0"
customTemplates:
page: