Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
1152958806@qq.com 2023-08-23 11:02:18 +08:00
commit 95025e4b0a
26 changed files with 84 additions and 145 deletions

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'about')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'about',title = ${'关于' + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -8,7 +8,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(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">

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -8,7 +8,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${singlePage.spec.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">
@ -26,7 +26,7 @@
<img class="card_cover" <img class="card_cover"
th:src="${isLazyload ? loadingImg : #annotations.get(group, 'cover')}" th:src="${isLazyload ? loadingImg : #annotations.get(group, 'cover')}"
th:data-lazy-src="${ isLazyload ? #annotations.get(group, 'cover') : ''}" th:data-lazy-src="${ isLazyload ? #annotations.get(group, 'cover') : ''}"
> >
<div class="card__content"> <div class="card__content">
<p class="card__category" th:text="${group.spec.displayName}"></p> <p class="card__category" th:text="${group.spec.displayName}"></p>
<h3 class="card__heading" th:text="${#annotations.get(group, 'description')}"></h3> <h3 class="card__heading" th:text="${#annotations.get(group, 'description')}"></h3>

View File

@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'archive')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'archive',title = ${'文章' + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = '文章')}"></nav>
</header> </header>
<main class="layout" id="content-inner"> <main class="layout" id="content-inner">
<!-- archive --> <!-- archive -->

View File

@ -168,17 +168,6 @@ function getContrastYIQ(hexcolor) {
} }
} }
//导航栏文章
function navTitle() {
var titlevalue = document.title;
var postName = document.getElementsByClassName("post-title")[0];
if(postName==null || postName==''){
document.getElementById("page-name-text").innerHTML = titlevalue;
}else{
document.getElementById("page-name-text").innerHTML = postName?.innerText;
}
}
window.onload = function () { window.onload = function () {
var copybtnlist = document.getElementsByClassName("copybtn") var copybtnlist = document.getElementsByClassName("copybtn")
for (var i = 0; i < copybtnlist.length; i++) { for (var i = 0; i < copybtnlist.length; i++) {
@ -662,7 +651,6 @@ function listenToPageInputPress() {
function initBlog() { function initBlog() {
// 图片主色 // 图片主色
GLOBAL_CONFIG.source.post.dynamicBackground && coverColor(), GLOBAL_CONFIG.source.post.dynamicBackground && coverColor(),
navTitle(),
percent(), percent(),
heo.topCategoriesBarScroll(), heo.topCategoriesBarScroll(),
heo.initIndexEssay(), heo.initIndexEssay(),

View File

@ -4752,6 +4752,7 @@ blockquote.pullquote.right {
.note.success:not(.no-icon)::before { .note.success:not(.no-icon)::before {
content: "\e66c"; content: "\e66c";
font-family: haofont!important;
} }
.note.success:not(.no-icon):not(.modern)::before { .note.success:not(.no-icon):not(.modern)::before {
@ -4790,6 +4791,7 @@ blockquote.pullquote.right {
.note.warning:not(.no-icon)::before { .note.warning:not(.no-icon)::before {
content: "\e61a"; content: "\e61a";
font-family: haofont!important;
} }
.note.warning:not(.no-icon):not(.modern)::before { .note.warning:not(.no-icon):not(.modern)::before {

View File

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'bangumis')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'bangumis',title = ${'追番' + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(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">

View File

@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'category')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'category',title = ${'分类' + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = '分类')}"></nav>
</header> </header>
<main class="layout hide-aside" id="content-inner"> <main class="layout hide-aside" id="content-inner">

View File

@ -1,11 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'category')}" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org"
th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'category',title = ${'分类' + ': ' + category.spec.displayName + ' | ' + site.title})}" >
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${'分类' + ': ' + category.spec.displayName})}"></nav>
</header> </header>
<main class="layout" id="content-inner"> <main class="layout" id="content-inner">
<div id="category"> <div id="category">

View File

@ -1,16 +1,14 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${singlePage.spec.title})}"></nav>
</header> </header>
<main class="layout hide-aside" id="content-inner"> <main class="layout hide-aside" id="content-inner">

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -8,7 +8,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${singlePage.spec.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">

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'fcircle')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'fcircle',title = ${'友链鱼塘' + ' | ' + site.title} )}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -8,7 +8,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(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">

View File

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'index')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'index', title = ${site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<div class="page" id="body-wrap"> <div class="page" id="body-wrap">
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header th:class="${theme.config.top.above.enable_above ? 'full_page' : 'not-top-img'}" id="page-header"> <header th:class="${theme.config.top.above.enable_above ? 'full_page' : 'not-top-img'}" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${siteSubtitle})}"></nav>
<!-- 问候语 --> <!-- 问候语 -->
<th:block th:replace="~{modules/header/greeting :: greeting}"></th:block> <th:block th:replace="~{modules/header/greeting :: greeting}"></th:block>
<!-- 第一屏 --> <!-- 第一屏 -->

View File

@ -1,11 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'links')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'links',title = ${'友链' + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = '友链')}"></nav>
<link rel="stylesheet" type="text/css" th:href="${assets_link + '/libs/fcircle/heo-fcircle3.css' + theme_version}"> <link rel="stylesheet" type="text/css" th:href="${assets_link + '/libs/fcircle/heo-fcircle3.css' + theme_version}">
</header> </header>

View File

@ -3,10 +3,10 @@
<!-- 动态标题 --> <!-- 动态标题 -->
<script th:fragment="diytitle" <script th:fragment="diytitle"
th:if="${theme.config.other.diytitle.diytitleEnable}"> th:if="${theme.config.other.diytitle.diytitleEnable}">
let leaveTitle = '[[${theme.config.other.diytitle.leaveTitle}]]'; var leaveTitle = '[[${theme.config.other.diytitle.leaveTitle}]]';
let backTitle = '[[${theme.config.other.diytitle.backTitle}]]'; var backTitle = '[[${theme.config.other.diytitle.backTitle}]]';
let OriginTitile = document.title var OriginTitile = "[(${title})]"
let titleTime var titleTime
document.addEventListener('visibilitychange', function () { document.addEventListener('visibilitychange', function () {
if (document.hidden) { if (document.hidden) {
//离开当前页面时标签显示内容 //离开当前页面时标签显示内容

View File

@ -1,11 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- 公共的 head 部分,可以定义部分 links,scripts,styles --> <!-- 公共的 head 部分,可以定义部分 links,scripts,styles -->
<head th:fragment="head(htmlType)"> <th:block th:fragment="head(htmlType)">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta content="IE=edge" http-equiv="X-UA-Compatible"> <meta content="IE=edge" http-equiv="X-UA-Compatible">
<meta content="width=device-width,initial-scale=1" name="viewport"> <meta content="width=device-width,initial-scale=1" name="viewport">
<title th:text="${site.title}"></title>
<meta content="telephone=no" name="format-detection"> <meta content="telephone=no" name="format-detection">
<meta content="var(--heo-card-bg)" name="theme-color"> <meta content="var(--heo-card-bg)" name="theme-color">
<link rel="shortcut icon" <link rel="shortcut icon"
@ -181,6 +180,9 @@
<!-- icon图标 --> <!-- icon图标 -->
<link rel="stylesheet" th:href="'https://cdn.cbd.int/hao-theme-static@1.3.2/icon/iconfont.css'"> <link rel="stylesheet" th:href="'https://cdn.cbd.int/hao-theme-static@1.3.2/icon/iconfont.css'">
<link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.2.0/css/all.min.css" media="all" onload="this.media='all'">
<!-- 声明一些公共信息 --> <!-- 声明一些公共信息 -->
<script id="site-config" th:inline="javascript"> <script id="site-config" th:inline="javascript">
var GLOBAL_CONFIG = { var GLOBAL_CONFIG = {
@ -271,61 +273,6 @@
}; };
// 根据htmlType设置页面title
setTitle = () => {
let title = ''
switch ([[${ htmlType }]]) {
case 'post':
if (GLOBAL_CONFIG.postTitle != '')
title = GLOBAL_CONFIG.postTitle
break;
case 'page':
if (GLOBAL_CONFIG.postTitle != '')
title = GLOBAL_CONFIG.postTitle
break;
case 'archive':
title = '归档'
break;
case 'category':
title = '分类'
break;
case 'links':
title = '友链'
break;
case 'tag':
title = '标签'
break;
case 'moments':
title = '瞬间'
break;
case 'fcircle':
title = '友链鱼塘'
break;
case 'about':
title = '关于'
break;
case '404':
title = '页面没有找到'
break;
case 'music':
title = '音乐馆'
break;
case 'photos':
title = '图库'
break;
case 'bangumis':
title = '追番'
break;
}
if (title != '')
document.title = title + ' - ' + [[${ site.title }]]
}
(() => {
setTitle()
})()
</script> </script>
@ -342,6 +289,6 @@
</head> </th:block>
</html> </html>

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:fragment="layout(content, htmlType)" xmlns:th="http://www.thymeleaf.org" <html lang="en" th:fragment="layout(content, htmlType, title)" xmlns:th="http://www.thymeleaf.org"
th:with="assets_link=${theme.config.other.staticResource.use == 'onmicrosoft' ? 'https://npm.onmicrosoft.cn/hao-theme-static@' + theme.spec.version +'/templates/assets' : th:with="assets_link=${theme.config.other.staticResource.use == 'onmicrosoft' ? 'https://npm.onmicrosoft.cn/hao-theme-static@' + theme.spec.version +'/templates/assets' :
theme.config.other.staticResource.use == 'cbd' ? 'https://cdn.cbd.int/hao-theme-static@' + theme.spec.version +'/templates/assets' : theme.config.other.staticResource.use == 'cbd' ? 'https://cdn.cbd.int/hao-theme-static@' + theme.spec.version +'/templates/assets' :
theme.config.other.staticResource.use == 'custom' ? theme.config.other.staticResource.cdn_link : #theme.assets('/')}, theme.config.other.staticResource.use == 'custom' ? theme.config.other.staticResource.cdn_link : #theme.assets('/')},
@ -9,8 +9,9 @@
<!-- head 中自定义的 --> <!-- head 中自定义的 -->
<head th:replace="~{modules/head :: head(htmlType = ${htmlType})}"> <head>
<title th:text="${site.title}"></title> <th:block th:replace="~{modules/head :: head(htmlType = ${htmlType})}"/>
<title th:text="${title}"></title>
</head> </head>
<body> <body>
@ -110,13 +111,13 @@
<!-- 51统计 --> <!-- 51统计 -->
<th:block th:replace="~{modules/common/51-la :: 51-la}"></th:block> <th:block th:replace="~{modules/common/51-la :: 51-la}"></th:block>
<!-- 动态标题 -->
<script th:replace="~{modules/common/diytitle :: diytitle}"></script>
<!--官方评论插件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 id="js-pjax"></div> <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' + theme_version}" id="Danmaku"></script> <script th:if="${theme.config.envelope_comment.enable_danmu}" th:src="${assets_link + '/libs/twikoo/easy-Danmaku.min.js' + theme_version}" id="Danmaku"></script>

View File

@ -5,10 +5,11 @@
<!-- 导航栏左侧 --> <!-- 导航栏左侧 -->
<div th:replace="~{modules/widgets/nav-left :: nav-left}"></div> <div th:replace="~{modules/widgets/nav-left :: nav-left}"></div>
<div id="page-name-mask"> <div id="page-name-mask">
<div id="page-name"><a id="page-name-text" onclick="btf.scrollToDest(0,500)" <div id="page-name" >
th:text="${#strings.isEmpty(title) ? site.title : title}"></a></div> <a id="page-name-text" onclick="btf.scrollToDest(0,500)"
th:text="${#strings.isEmpty(title) ? site.title : title}"></a>
</div>
</div> </div>
<!-- 导航栏中间 --> <!-- 导航栏中间 -->

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'moments')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'moments',title = ${title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -8,7 +8,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></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">

View File

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'music')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'music',title = '音乐馆' + ' | ' + site.title)}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(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">

View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page')}" 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})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -7,7 +8,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${singlePage.spec.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">

View File

@ -1,11 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${singlePage.spec.title})}"></nav>
<link rel="stylesheet" type="text/css" th:href="${assets_link + '/libs/fcircle/heo-fcircle3.css' + theme_version}"> <link rel="stylesheet" type="text/css" th:href="${assets_link + '/libs/fcircle/heo-fcircle3.css' + theme_version}">
</header> </header>

View File

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'photos')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content},htmlType = 'photos',title = ${title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></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">

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'post')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'post',title = ${post.spec.title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<div class="post" id="body-wrap"> <div class="post" id="body-wrap">

View File

@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'tag')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'tag',title = ${'标签' + ': ' + tag.spec.displayName + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${'标签'+ ': ' + tag.spec.displayName})}"></nav>
</header> </header>
<main class="layout" id="content-inner"> <main class="layout" id="content-inner">
<div id="tag"> <div id="tag">

View File

@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'tag')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content},htmlType = 'tag',title = ${'标签' + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
<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 = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = '标签')}"></nav>
</header> </header>
<main class="layout hide-aside" id="content-inner"> <main class="layout hide-aside" id="content-inner">
<div id="page"><h1 class="page-title" style="display: inline;">标签</h1> <div id="page"><h1 class="page-title" style="display: inline;">标签</h1>
@ -16,7 +16,7 @@
th:href="@{${tagItem.status.permalink}}" th:href="@{${tagItem.status.permalink}}"
th:id="${tagItem.spec.displayName}" th:style="'font-size: 1em; color:' + ${tagItem.spec.color} "> th:id="${tagItem.spec.displayName}" th:style="'font-size: 1em; color:' + ${tagItem.spec.color} ">
<span class="tags-punctuation">[[${tagItem.spec.displayName}]]</span> <span class="tags-punctuation">[[${tagItem.spec.displayName}]]</span>
<span class="tagsPageCount">[[${tagItem.status.visiblePostCount}]]</span> <span class="tagsPageCount">[[${tagItem.status.visiblePostCount}]]</span>
</a> </a>

View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page')}" <html lang="en" xmlns:th="http://www.thymeleaf.org"
xmlns:th="http://www.thymeleaf.org"> th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@ -8,7 +8,7 @@
<!-- 头部导航栏 --> <!-- 头部导航栏 -->
<header class="not-top-img" id="page-header"> <header class="not-top-img" id="page-header">
<nav th:replace="~{modules/nav :: nav(title = null)}"></nav> <nav th:replace="~{modules/nav :: nav(title = ${singlePage.spec.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">