commit
bd9cb5f8a9
|
@ -135,3 +135,41 @@ spec:
|
||||||
- $formkit: "textarea"
|
- $formkit: "textarea"
|
||||||
name: "description"
|
name: "description"
|
||||||
label: "分组描述"
|
label: "分组描述"
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
apiVersion: v1alpha1
|
||||||
|
kind: AnnotationSetting
|
||||||
|
metadata:
|
||||||
|
generateName: annotation-setting-
|
||||||
|
spec:
|
||||||
|
targetRef:
|
||||||
|
group: core.halo.run
|
||||||
|
kind: EquipmentGroup
|
||||||
|
formSchema:
|
||||||
|
- $formkit: "textarea"
|
||||||
|
name: "description"
|
||||||
|
label: "分组描述"
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
apiVersion: v1alpha1
|
||||||
|
kind: AnnotationSetting
|
||||||
|
metadata:
|
||||||
|
generateName: annotation-setting-
|
||||||
|
spec:
|
||||||
|
targetRef:
|
||||||
|
group: core.halo.run
|
||||||
|
kind: Equipment
|
||||||
|
formSchema:
|
||||||
|
- $formkit: "text"
|
||||||
|
name: "model"
|
||||||
|
label: "装备型号/版本"
|
||||||
|
- $formkit: "text"
|
||||||
|
name: "button"
|
||||||
|
label: "左下角按钮显示文字"
|
||||||
|
value: "详情"
|
||||||
|
- $formkit: "text"
|
||||||
|
name: "link"
|
||||||
|
label: "左下角按钮跳转链接"
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" xmlns:th="http://www.thymeleaf.org"
|
<html lang="en" xmlns:th="http://www.thymeleaf.org"
|
||||||
th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head})}">
|
th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'equipments',title = ${title + ' | ' + site.title}, head = ~{::head},_title = ${title})}">
|
||||||
<th:block th:fragment="head">
|
<th:block th:fragment="head">
|
||||||
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
|
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${_title},
|
||||||
_permalink = ${singlePage.status.permalink},
|
_permalink = '/equipments',
|
||||||
_cover = ${singlePage.spec.cover},
|
_cover = ${theme.config.other.opengraph.image},
|
||||||
_excerpt = ${singlePage.status.excerpt},
|
_excerpt = ${site.seo.description},
|
||||||
_type = 'website')}"></th:block>
|
_type = 'website')}"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:fragment="content">
|
<th:block th:fragment="content">
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<!-- 头部导航栏 -->
|
<!-- 头部导航栏 -->
|
||||||
<header class="not-top-img" id="page-header">
|
<header class="not-top-img" id="page-header">
|
||||||
<nav th:replace="~{modules/nav :: nav(title = ${singlePage.spec.title})}"></nav>
|
<nav th:replace="~{modules/nav :: nav(title = ${_title})}"></nav>
|
||||||
</header>
|
</header>
|
||||||
<main class="layout hide-aside" id="content-inner">
|
<main class="layout hide-aside" id="content-inner">
|
||||||
<div id="page">
|
<div id="page">
|
||||||
|
@ -24,36 +24,35 @@
|
||||||
detail = ${theme.config.equipment.detail},
|
detail = ${theme.config.equipment.detail},
|
||||||
buttonUrl = '',
|
buttonUrl = '',
|
||||||
buttonTitle = '')}" ></div>
|
buttonTitle = '')}" ></div>
|
||||||
<div id="equipment" th:if="${not #lists.isEmpty(theme.config.equipment.category_list)}"
|
<div id="equipment" th:if="${not #lists.isEmpty(groups)}">
|
||||||
th:with="categoryList = ${theme.config.equipment.category_list}">
|
<th:block th:each="group : ${groups}">
|
||||||
<th:block th:each="category : ${categoryList}">
|
|
||||||
<div class="equipment-item">
|
<div class="equipment-item">
|
||||||
<h2 class="equipment-item-title">[[${category.category_name}]]</h2>
|
<h2 class="equipment-item-title">[[${group.spec.displayName}]]</h2>
|
||||||
<div class="equipment-item-description">[[${category.description}]]</div>
|
<div class="equipment-item-description">[[${#annotations.get(group, 'description')}]]</div>
|
||||||
<div class="equipment-item-content" th:with="equipmentList = ${category.equipment_list}">
|
<div class="equipment-item-content" th:with="equipmentList = ${group.equipments}">
|
||||||
|
|
||||||
<div class="equipment-item-content-item" th:each="equipment : ${equipmentList}">
|
<div class="equipment-item-content-item" th:each="equipment : ${equipmentList}">
|
||||||
<div class="equipment-item-content-item-cover">
|
<div class="equipment-item-content-item-cover">
|
||||||
<img class="equipment-item-content-item-image"
|
<img class="equipment-item-content-item-image"
|
||||||
th:alt="${equipment.name}"
|
th:alt="${equipment.spec.displayName}"
|
||||||
th:src="${isLazyload ? loadingImg : equipment.img}"
|
th:src="${isLazyload ? loadingImg : equipment.spec.url}"
|
||||||
th:data-lazy-src="${ isLazyload ? equipment.img : ''}">
|
th:data-lazy-src="${ isLazyload ? equipment.spec.url : ''}">
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-item-content-item-info">
|
<div class="equipment-item-content-item-info">
|
||||||
<div class="equipment-item-content-item-name"
|
<div class="equipment-item-content-item-name"
|
||||||
th:onclick="rm.rightmenuCopyText([[${equipment.name}]]);btf.snackbarShow('已复制装备名称');">
|
th:onclick="rm.rightmenuCopyText([[${equipment.spec.displayName}]]);btf.snackbarShow('已复制装备名称');">
|
||||||
[[${equipment.name}]]
|
[[${equipment.spec.displayName}]]
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-item-content-item-specification">[[${equipment.model}]]
|
<div class="equipment-item-content-item-specification">[[${#annotations.get(equipment, 'model')}]]
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-item-content-item-description">
|
<div class="equipment-item-content-item-description">
|
||||||
[[${equipment.description}]]
|
[[${equipment.spec.description}]]
|
||||||
</div>
|
</div>
|
||||||
<div class="equipment-item-content-item-toolbar">
|
<div class="equipment-item-content-item-toolbar">
|
||||||
<a class="equipment-item-content-item-link" th:href="${equipment.url}"
|
<a class="equipment-item-content-item-link" th:href="${#annotations.get(equipment, 'link')}"
|
||||||
target="_blank">[[${equipment.button}]]</a>
|
target="_blank">[[${#annotations.get(equipment, 'button')}]]</a>
|
||||||
<a class="bber-reply"
|
<a class="bber-reply"
|
||||||
th:onclick="rightMenuCommentText([['"'+${equipment.name}+' '+${equipment.model}+' '+${equipment.description}+'"']]);"
|
th:onclick="rightMenuCommentText([['"'+${equipment.spec.displayName}+' '+${#annotations.get(equipment, 'model')}+' '+${equipment.spec.description}+'"']]);"
|
||||||
data-pjax-state="">
|
data-pjax-state="">
|
||||||
<i class="haofont hao-icon-message" style="font-size: 17px;"></i>
|
<i class="haofont hao-icon-message" style="font-size: 17px;"></i>
|
||||||
</a>
|
</a>
|
||||||
|
@ -197,8 +196,8 @@
|
||||||
<th:block
|
<th:block
|
||||||
th:replace="~{modules/comment :: comment(group = 'content.halo.run',
|
th:replace="~{modules/comment :: comment(group = 'content.halo.run',
|
||||||
kind = 'SinglePage',
|
kind = 'SinglePage',
|
||||||
name = ${singlePage.metadata.name},
|
name = 'equipment',
|
||||||
allowComment = ${singlePage.spec.allowComment})}"/>
|
allowComment = true)}"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</main>
|
</main>
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '404', title = '404')}"
|
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '404', title = '404', head = null)}"
|
||||||
xmlns:th="http://www.thymeleaf.org">
|
xmlns:th="http://www.thymeleaf.org">
|
||||||
|
|
||||||
<th:block th:fragment="content">
|
<th:block th:fragment="content">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '500', title = '500')}"
|
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '500', title = '500', head = null)}"
|
||||||
xmlns:th="http://www.thymeleaf.org">
|
xmlns:th="http://www.thymeleaf.org">
|
||||||
|
|
||||||
<th:block th:fragment="content">
|
<th:block th:fragment="content">
|
||||||
|
|
|
@ -55,8 +55,8 @@
|
||||||
<div class="title-h2-a-right"><span>以下内容自动生成,未经过审核</span></div>
|
<div class="title-h2-a-right"><span>以下内容自动生成,未经过审核</span></div>
|
||||||
</div>
|
</div>
|
||||||
<div id="hexo-circle-of-friends-root"></div>
|
<div id="hexo-circle-of-friends-root"></div>
|
||||||
<script>
|
<script type="text/javascript">
|
||||||
let UserConfig = {
|
var UserConfig = {
|
||||||
// 填写你的api地址
|
// 填写你的api地址
|
||||||
private_api_url: "[(${theme.config.fcircle.apiurl})]",
|
private_api_url: "[(${theme.config.fcircle.apiurl})]",
|
||||||
// 点击加载更多时,一次最多加载几篇文章,默认10
|
// 点击加载更多时,一次最多加载几篇文章,默认10
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${site.title},
|
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${site.title},
|
||||||
_permalink = '',
|
_permalink = '',
|
||||||
_cover = ${theme.config.other.opengraph.image},
|
_cover = ${theme.config.other.opengraph.image},
|
||||||
_excerpt = '',
|
_excerpt = ${site.seo.description},
|
||||||
_type = 'website')}"></th:block>
|
_type = 'website')}"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:fragment="content">
|
<th:block th:fragment="content">
|
||||||
|
|
|
@ -157,7 +157,7 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- 动态加载条 -->
|
<!-- 动态加载条 -->
|
||||||
<script data-pace-options='{ "restartOnRequestAfter":false,"eventLag":false}'
|
<script data-pace-options="{ "restartOnRequestAfter":false,"eventLag":false}"
|
||||||
th:src="${assets_link + '/libs/pace/pace.min.js'}"
|
th:src="${assets_link + '/libs/pace/pace.min.js'}"
|
||||||
th:if="${theme.config.other.loadingBoxs.loadProgressBar}">
|
th:if="${theme.config.other.loadingBoxs.loadProgressBar}">
|
||||||
</script>
|
</script>
|
||||||
|
@ -165,10 +165,6 @@
|
||||||
<!-- 复制 https://githubfast.com/zenorocha/clipboard.js -->
|
<!-- 复制 https://githubfast.com/zenorocha/clipboard.js -->
|
||||||
<script th:src="${assets_link + '/libs/clipboard/clipboard.min.js'}"></script>
|
<script th:src="${assets_link + '/libs/clipboard/clipboard.min.js'}"></script>
|
||||||
|
|
||||||
<!-- 全局图片预览-->
|
|
||||||
<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/fancybox/3.5.7/jquery.fancybox.min.js"></script>
|
|
||||||
<link rel="stylesheet" href="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/fancybox/3.5.7/jquery.fancybox.min.css">
|
|
||||||
|
|
||||||
<!-- 关于统计-->
|
<!-- 关于统计-->
|
||||||
<script th:if="${#strings.contains(theme.config.about.widgets,'statistics-map')}" th:src="${assets_link + '/libs/countup/countup.js'}"></script>
|
<script th:if="${#strings.contains(theme.config.about.widgets,'statistics-map')}" th:src="${assets_link + '/libs/countup/countup.js'}"></script>
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<!-- loading 页面 -->
|
<!-- loading 页面 -->
|
||||||
<div th:replace="~{modules/loading-box :: loading-box}"></div>
|
<th:block th:replace="~{modules/loading-box :: loading-box}"></th:block>
|
||||||
|
|
||||||
<!-- 网站背景 -->
|
<!-- 网站背景 -->
|
||||||
<div id="web_bg"></div>
|
<div id="web_bg"></div>
|
||||||
|
@ -68,6 +68,21 @@
|
||||||
<!-- todo head 中有它的 css,应该可以写一块,并改成后台可配置的功能,代码中应该还有他的 js -->
|
<!-- todo head 中有它的 css,应该可以写一块,并改成后台可配置的功能,代码中应该还有他的 js -->
|
||||||
<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/node-snackbar/0.1.16/snackbar.min.js"></script>
|
<script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/node-snackbar/0.1.16/snackbar.min.js"></script>
|
||||||
|
|
||||||
|
<div class="js-pjax">
|
||||||
|
<!-- 动态标题 -->
|
||||||
|
<script th:replace="~{modules/common/diytitle :: diytitle}"></script>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 评论 -->
|
||||||
|
<th:block th:if="${theme.config.comments.use!='commentWidget' && theme.config.comments.commentsEnable }"
|
||||||
|
th:with="use = ${theme.config.comments.use}">
|
||||||
|
<th:block th:replace="~{'modules/comment/' + ${use}}"></th:block>
|
||||||
|
<script th:if="${theme.config.comments.visitorMail.visitorMailEnable}">var visitorMail = "[(${theme.config.comments.visitorMail.mail})]";</script>
|
||||||
|
</th:block>
|
||||||
|
|
||||||
|
<!--音乐-->
|
||||||
|
<script>var meting_api = "[(${theme.config.tool.nav_music.meting_api})]"; </script>
|
||||||
|
|
||||||
<!-- 深色模式下添加粒子效果canvas -->
|
<!-- 深色模式下添加粒子效果canvas -->
|
||||||
<canvas th:if="${theme.config.style.universe}" id="universe" width="1312" height="880"></canvas>
|
<canvas th:if="${theme.config.style.universe}" id="universe" width="1312" height="880"></canvas>
|
||||||
<script th:if="${theme.config.style.universe}" async="" th:src="${assets_link + '/libs/canvas/dark.js'}"></script>
|
<script th:if="${theme.config.style.universe}" async="" th:src="${assets_link + '/libs/canvas/dark.js'}"></script>
|
||||||
|
@ -76,12 +91,6 @@
|
||||||
<!-- 应该是文章页分享使用 -->
|
<!-- 应该是文章页分享使用 -->
|
||||||
<script data-pjax src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/qrcodejs/1.0.0/qrcode.min.js"></script>
|
<script data-pjax src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/qrcodejs/1.0.0/qrcode.min.js"></script>
|
||||||
|
|
||||||
<!-- 评论 -->
|
|
||||||
<th:block th:if="${theme.config.comments.use!='commentWidget' && theme.config.comments.commentsEnable }"
|
|
||||||
th:with="use = ${theme.config.comments.use}">
|
|
||||||
<th:block th:replace="~{'modules/comment/' + ${use}}"></th:block>
|
|
||||||
<script th:if="${theme.config.comments.visitorMail.visitorMailEnable}">var visitorMail = "[(${theme.config.comments.visitorMail.mail})]";</script>
|
|
||||||
</th:block>
|
|
||||||
<!-- https://raphamorim.io/waterfall.js/ 应该是这个 还有相关的 js 代码 是否可以调整-->
|
<!-- https://raphamorim.io/waterfall.js/ 应该是这个 还有相关的 js 代码 是否可以调整-->
|
||||||
<script th:src="${assets_link + '/libs/waterfall/waterfall.min.js'}"></script>
|
<script th:src="${assets_link + '/libs/waterfall/waterfall.min.js'}"></script>
|
||||||
|
|
||||||
|
@ -91,9 +100,6 @@
|
||||||
|
|
||||||
<script th:src="${assets_link + '/libs/view-image/view-image.min.js'}"></script>
|
<script th:src="${assets_link + '/libs/view-image/view-image.min.js'}"></script>
|
||||||
|
|
||||||
<!--音乐-->
|
|
||||||
<script>var meting_api = "[(${theme.config.tool.nav_music.meting_api})]"; </script>
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/aplayer/1.10.1/APlayer.min.css" media="all" onload="this.media='all'">
|
<link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/aplayer/1.10.1/APlayer.min.css" media="all" onload="this.media='all'">
|
||||||
|
|
||||||
<script th:src="${assets_link + '/libs/aplayer/APlayer.min.js'}"></script>
|
<script th:src="${assets_link + '/libs/aplayer/APlayer.min.js'}"></script>
|
||||||
|
@ -125,15 +131,8 @@
|
||||||
<!--官方评论插件js-->
|
<!--官方评论插件js-->
|
||||||
<script th:if="${pluginFinder.available('PluginCommentWidget')}" src="/plugins/PluginCommentWidget/assets/static/comment-widget.iife.js"></script>
|
<script th:if="${pluginFinder.available('PluginCommentWidget')}" src="/plugins/PluginCommentWidget/assets/static/comment-widget.iife.js"></script>
|
||||||
|
|
||||||
<div class="js-pjax">
|
|
||||||
<!-- 动态标题 -->
|
|
||||||
<script th:replace="~{modules/common/diytitle :: diytitle}"></script>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script th:if="${theme.config.envelope_comment.enable_danmu}" th:src="${assets_link + '/libs/twikoo/easy-Danmaku.min.js'}" id="Danmaku"></script>
|
<script th:if="${theme.config.envelope_comment.enable_danmu}" th:src="${assets_link + '/libs/twikoo/easy-Danmaku.min.js'}" id="Danmaku"></script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
let pjaxSelectors = ['title', '#config-diff', '#body-wrap', '#rightside-config-hide', '#rightside-config-show', '.js-pjax','#site-config']
|
let pjaxSelectors = ['title', '#config-diff', '#body-wrap', '#rightside-config-hide', '#rightside-config-show', '.js-pjax','#site-config']
|
||||||
|
|
||||||
|
|
|
@ -1,30 +1,9 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" xmlns:th="http://www.thymeleaf.org">
|
<html lang="en" xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<!-- loading页面 -->
|
||||||
<!-- loading 页面,todo 这块都可以不要,后面删除,先精简代码,后续考虑组件添加 -->
|
<th:block th:fragment="loading-box"
|
||||||
<div id="loading-box" onclick="heo.hideLoading()"
|
|
||||||
th:fragment="loading-box"
|
|
||||||
th:if="${theme.config.other.loadingBoxs.loadingBoxEnable} and not ${#strings.isEmpty(theme.config.other.loadingBoxs.loadingBoxImg)}">
|
th:if="${theme.config.other.loadingBoxs.loadingBoxEnable} and not ${#strings.isEmpty(theme.config.other.loadingBoxs.loadingBoxImg)}">
|
||||||
|
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
|
|
||||||
#loading-box .loading-image-dot {
|
|
||||||
width: 30px;
|
|
||||||
height: 30px;
|
|
||||||
background: #6bdf8f;
|
|
||||||
position: absolute;
|
|
||||||
border-radius: 50%;
|
|
||||||
border: 6px solid #fff;
|
|
||||||
top: 50%;
|
|
||||||
left: 50%;
|
|
||||||
-webkit-transform: translate(18px, 24px);
|
|
||||||
-moz-transform: translate(18px, 24px);
|
|
||||||
-o-transform: translate(18px, 24px);
|
|
||||||
-ms-transform: translate(18px, 24px);
|
|
||||||
transform: translate(18px, 24px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#loading-box {
|
#loading-box {
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
}
|
}
|
||||||
|
@ -34,7 +13,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
background: var(--heo-background);
|
background: var(--heo-card-bg);
|
||||||
z-index: 1999;
|
z-index: 1999;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transition: 0.2s;
|
transition: 0.2s;
|
||||||
|
@ -57,11 +36,26 @@
|
||||||
animation-direction: alternate;
|
animation-direction: alternate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#loading-box .loading-image-dot {
|
||||||
|
width: 30px;
|
||||||
|
height: 30px;
|
||||||
|
background: #6bdf8f;
|
||||||
|
position: absolute;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: 6px solid #fff;
|
||||||
|
top: 50%;
|
||||||
|
left: 50%;
|
||||||
|
-webkit-transform: translate(18px, 24px);
|
||||||
|
-moz-transform: translate(18px, 24px);
|
||||||
|
-o-transform: translate(18px, 24px);
|
||||||
|
-ms-transform: translate(18px, 24px);
|
||||||
|
transform: translate(18px, 24px);
|
||||||
|
}
|
||||||
|
|
||||||
@keyframes loadingAction {
|
@keyframes loadingAction {
|
||||||
from {
|
from {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
to {
|
to {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
@ -71,7 +65,6 @@
|
||||||
from {
|
from {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
to {
|
to {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
@ -81,20 +74,18 @@
|
||||||
from {
|
from {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
<div id="loading-box" onclick="heo.hideLoading()">
|
||||||
<div class="loading-bg">
|
<div class="loading-bg">
|
||||||
<img class="loading-img" style="border-radius: 50%;" th:src="${theme.config.other.loadingBoxs.loadingBoxImg}">
|
<img class="loading-img" style="border-radius: 50%;" th:src="${theme.config.other.loadingBoxs.loadingBoxImg}">
|
||||||
<div class="loading-image-dot"></div>
|
<div class="loading-image-dot"></div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
var preloader = {
|
var preloader = {
|
||||||
endLoading: () => {
|
endLoading: () => {
|
||||||
//- document.body.style.overflow = 'auto';
|
//- document.body.style.overflow = 'auto';
|
||||||
|
@ -109,9 +100,8 @@
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
preloader.endLoading();
|
preloader.endLoading();
|
||||||
}, 3000)
|
}, 3000)
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
</div>
|
</th:block>
|
||||||
|
|
||||||
</html>
|
</html>
|
|
@ -13,7 +13,7 @@
|
||||||
th:with="newcommentnumber = ${#conversions.convert(theme.config.sidebar.newcomment.newcommentnumber, 'java.lang.Integer') >= 0 ? theme.config.sidebar.newcommentnumber : 5}">
|
th:with="newcommentnumber = ${#conversions.convert(theme.config.sidebar.newcomment.newcommentnumber, 'java.lang.Integer') >= 0 ? theme.config.sidebar.newcommentnumber : 5}">
|
||||||
<div th:each="comment,iterStat : ${commentFinder.list(null, 1, newcommentnumber)}" class="aside-list-item"
|
<div th:each="comment,iterStat : ${commentFinder.list(null, 1, newcommentnumber)}" class="aside-list-item"
|
||||||
th:with="page = ${comment.spec.subjectRef.kind == 'Post' ? postFinder.getByName(comment.spec.subjectRef.name) :
|
th:with="page = ${comment.spec.subjectRef.kind == 'Post' ? postFinder.getByName(comment.spec.subjectRef.name) :
|
||||||
comment.spec.subjectRef.kind == 'SinglePage' && not #strings.contains('photos,links,moments', comment.spec.subjectRef.name) ? singlePageFinder.getByName(comment.spec.subjectRef.name) : null},
|
comment.spec.subjectRef.kind == 'SinglePage' && not #strings.contains('photos,links,moments,equipment', comment.spec.subjectRef.name) ? singlePageFinder.getByName(comment.spec.subjectRef.name) : null},
|
||||||
url = ${page == null? '/' : page.status.permalink + '#comment-' + comment.metadata.name}">
|
url = ${page == null? '/' : page.status.permalink + '#comment-' + comment.metadata.name}">
|
||||||
<span th:text="${commentIndex}"></span>
|
<span th:text="${commentIndex}"></span>
|
||||||
<a class="thumbnail" th:href="${url}" data-pjax-state="">
|
<a class="thumbnail" th:href="${url}" data-pjax-state="">
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" xmlns:th="http://www.thymeleaf.org"
|
<html lang="en" xmlns:th="http://www.thymeleaf.org"
|
||||||
th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'moments',title = ${title + ' | ' + site.title}, head = ~{::head})}">
|
th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'moments',title = ${title + ' | ' + site.title}, head = ~{::head}, _title = ${title})}">
|
||||||
<th:block th:fragment="head">
|
<th:block th:fragment="head">
|
||||||
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = '瞬间',
|
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${_title},
|
||||||
_permalink = '/moments',
|
_permalink = '/moments',
|
||||||
_cover = ${theme.config.other.opengraph.image},
|
_cover = ${theme.config.other.opengraph.image},
|
||||||
_excerpt = ${site.seo.description},
|
_excerpt = ${site.seo.description},
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<!-- 头部导航栏 -->
|
<!-- 头部导航栏 -->
|
||||||
<header class="not-top-img" id="page-header">
|
<header class="not-top-img" id="page-header">
|
||||||
<nav th:replace="~{modules/nav :: nav(title = '瞬间')}"></nav>
|
<nav th:replace="~{modules/nav :: nav(title = ${_title})}"></nav>
|
||||||
</header>
|
</header>
|
||||||
<main class="layout hide-aside" id="content-inner">
|
<main class="layout hide-aside" id="content-inner">
|
||||||
<div id="page">
|
<div id="page">
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
<script data-pjax th:inline="javascript">
|
<script data-pjax th:inline="javascript">
|
||||||
var postsData = [[${ postFinder.listAll() }]];
|
var postsData = [[${ postFinder.listAll() }]];
|
||||||
var pageData = [[${ singlePageFinder.list(1, 50) }]];
|
var pageData = [[${ singlePageFinder.list(1, 50) }]];
|
||||||
var articles = [{ path: '/links', title: '友链' }, { path: '/bangumis', title: '追番' }, { path: '/moments', title: '瞬间' }, { path: '/photos', title: '图库' }];
|
var articles = [{ path: '/links', title: '友链' }, { path: '/bangumis', title: '追番' }, { path: '/equipment', title: '我的装备' }, { path: '/moments', title: '瞬间' }, { path: '/photos', title: '图库' }];
|
||||||
|
|
||||||
if (postsData.length > 0) {
|
if (postsData.length > 0) {
|
||||||
postsData.map((item) => {
|
postsData.map((item) => {
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" xmlns:th="http://www.thymeleaf.org"
|
<html lang="en" xmlns:th="http://www.thymeleaf.org"
|
||||||
th:replace="~{modules/layouts/layout :: layout(content = ~{::content},htmlType = 'photos',title = ${title + ' | ' + site.title}, head = ~{::head})}">
|
th:replace="~{modules/layouts/layout :: layout(content = ~{::content},htmlType = 'photos',title = ${title + ' | ' + site.title}, head = ~{::head},_title = ${title})}">
|
||||||
<th:block th:fragment="head">
|
<th:block th:fragment="head">
|
||||||
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = '图库',
|
<th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${_title},
|
||||||
_permalink = '/photos',
|
_permalink = '/photos',
|
||||||
_cover = ${theme.config.other.opengraph.image},
|
_cover = ${theme.config.other.opengraph.image},
|
||||||
_excerpt = ${site.seo.description},
|
_excerpt = ${site.seo.description},
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
<div class="page" id="body-wrap">
|
<div class="page" id="body-wrap">
|
||||||
<!-- 头部导航栏 -->
|
<!-- 头部导航栏 -->
|
||||||
<header class="not-top-img" id="page-header">
|
<header class="not-top-img" id="page-header">
|
||||||
<nav th:replace="~{modules/nav :: nav(title = '图库')}"></nav>
|
<nav th:replace="~{modules/nav :: nav(title = ${_title})}"></nav>
|
||||||
</header>
|
</header>
|
||||||
<main class="layout hide-aside" id="content-inner">
|
<main class="layout hide-aside" id="content-inner">
|
||||||
<div id="page">
|
<div id="page">
|
||||||
|
|
|
@ -37,10 +37,6 @@ spec:
|
||||||
description: 待办清单页面
|
description: 待办清单页面
|
||||||
screenshot:
|
screenshot:
|
||||||
file: todolist.html
|
file: todolist.html
|
||||||
- name: 我的装备页面模版
|
|
||||||
description: 我的装备页面
|
|
||||||
screenshot:
|
|
||||||
file: equipment.html
|
|
||||||
- name: 相册页面模版
|
- name: 相册页面模版
|
||||||
description: 相册页面
|
description: 相册页面
|
||||||
screenshot:
|
screenshot:
|
||||||
|
|
Loading…
Reference in New Issue