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

Merge branch 'dev' of github.com:shy-share/halo-theme-hao into dev

This commit is contained in:
sunheyi 2023-02-08 10:59:44 +08:00
parent d95cc7ab5d 06717abd68
commit 3e620e2200
9 changed files with 101 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/assets/js/main.js
View File

@ -682,10 +682,17 @@ document.addEventListener('DOMContentLoaded', function () {
* 網頁運行時間 * 網頁運行時間
*/ */
const addRuntime = () => { const addRuntime = () => {
const $runtimeCount = document.getElementById('runtimeshow') const $runtimeCount = document.getElementById('runtimeshow');
if ($runtimeCount) { if ($runtimeCount) {
const publishDate = $runtimeCount.getAttribute('data-publishDate') var s1 = $runtimeCount.innerText;;//建站时间
$runtimeCount.innerText = btf.diffDate(publishDate) + ' ' + GLOBAL_CONFIG.runtime if(s1)
{
s1 = new Date(s1.replace(/-/g, "/"));
s2 = new Date();
var days = s2.getTime() - s1.getTime();
var number_of_days = parseInt(days / (1000 * 60 * 60 * 24));
$runtimeCount.innerText =number_of_days+"天";
}
} }
} }
@ -863,6 +870,7 @@ document.addEventListener('DOMContentLoaded', function () {
// GLOBAL_CONFIG.runtime && addRuntime() // GLOBAL_CONFIG.runtime && addRuntime()
addLastPushDate() addLastPushDate()
toggleCardCategory() toggleCardCategory()
addRuntime()
} }
sidebarFn() sidebarFn()

8
templates/modules/right-menu.html
View File

@ -53,15 +53,15 @@
<i class="iconfont icon-dice"></i> <i class="iconfont icon-dice"></i>
<span>随便逛逛</span> <span>随便逛逛</span>
</a> </a>
<a class="rightMenu-item menu-link" href="categories/index.html"> <a class="rightMenu-item menu-link" href="../categories">
<i class="iconfont icon-list-ul"></i> <i class="iconfont icon-list-ul"></i>
<span>博客分类</span> <span>博客分类</span>
</a> </a>
<a class="rightMenu-item menu-link" href="tags/index.html"> <a class="rightMenu-item menu-link" href="../tags">
<i class="iconfont icon-tags"></i><span>文章标签</span> <i class="iconfont icon-tags"></i><span>文章标签</span>
</a> </a>
</div> </div>
<div class="rightMenu-group rightMenu-line"> <!-- <div class="rightMenu-group rightMenu-line">
<a class="rightMenu-item menu-link" href="cc/index.html"> <a class="rightMenu-item menu-link" href="cc/index.html">
<i class="iconfont icon-hand-holding"></i> <i class="iconfont icon-hand-holding"></i>
<span>隐私协议</span> <span>隐私协议</span>
@ -70,7 +70,7 @@
<i class="iconfont icon-closed-captioning"></i> <i class="iconfont icon-closed-captioning"></i>
<span>版权协议</span> <span>版权协议</span>
</a> </a>
</div> </div> -->
<div class="rightMenu-group rightMenu-line rightMenuOther"> <div class="rightMenu-group rightMenu-line rightMenuOther">
<div class="rightMenu-item" id="menu-copy"> <div class="rightMenu-item" id="menu-copy">
<i class="iconfont icon-link"></i> <i class="iconfont icon-link"></i>

4
templates/modules/sidebar.html
View File

@ -40,9 +40,9 @@
</th:block> </th:block>
<div class="menus_items"> <div class="menus_items">
<div class="menus_item"> <div class="menus_item">
<a class="site-page" href="javascript:void(0);" rel="external nofollow"> <!-- <a class="site-page" href="javascript:void(0);" rel="external nofollow">
<span>文库</span><i class="iconfont icon-chevron-down"></i> <span>文库</span><i class="iconfont icon-chevron-down"></i>
</a> </a> -->
<ul class="menus_item_child"> <ul class="menus_item_child">
<li> <li>
<a class="site-page child" href="/archives"> <a class="site-page child" href="/archives">

5
templates/modules/widgets/aside/categories.html
View File

@ -2,13 +2,12 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- 目录 --> <!-- 目录 -->
<div class="card-widget card-categories" th:fragment="categories" <div class="card-widget card-categories" th:fragment="categories"
${categoryFinder.list(1, categoryQuantity)}> th:with="categories = ${categoryFinder.list(1, theme.config.sidebar.categoryQuantity)}">
<div class="item-headline"><i class="iconfont icon-folder-open"></i><span>分类</span></div> <div class="item-headline"><i class="iconfont icon-folder-open"></i><span>分类</span></div>
<div class="aside-list"> <div class="aside-list">
<ul class="card-category-list"> <ul class="card-category-list">
<li class="card-category-list-item" th:each="category,iterStat : ${categories}"> <li class="card-category-list-item" th:each="category,iterStat : ${categories}">
<a class="card-category-list-link" th:href="@{${category.status.permalink}}" <a class="card-category-list-link" th:href="@{${category.status.permalink}}">
th:if="${categoryQuantity >= 0 && iterStat.index < categoryQuantity || categoryQuantity < 0}">
<span class="card-category-list-name" th:text="${category.spec.displayName}" <span class="card-category-list-name" th:text="${category.spec.displayName}"
th:title="${category.spec.displayName}"></span> th:title="${category.spec.displayName}"></span>
<span class="card-category-list-count" th:text="${category.status.postCount}"></span> <span class="card-category-list-count" th:text="${category.status.postCount}"></span>

48
templates/modules/widgets/aside/contain/stat-contain.html Normal file
View File

@ -0,0 +1,48 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- 侧边栏站点信息统计 -->
<th:block th:fragment="stat-contain" th:with="stats = ${siteStatsFinder.getStats()}">
<div class="item-headline"><i class="iconfont icon-icon-sidebar-scxmtj"></i><span>统计</span></div>
<div class="webinfo">
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="iconfont icon-file-alt"></i>
<div class="item-name">文章数 :</div>
</div>
<div class="item-count" th:text="${stats.post}"></div>
</div>
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="iconfont icon-sliders"></i>
<div class="item-name">分类数 :</div>
</div>
<div class="item-count" th:text="${stats.category}"></div>
</div>
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="iconfont icon-comment-alt"></i>
<div class="item-name">评论数 :</div>
</div>
<div class="item-count" th:text="${stats.comment}"></div>
</div>
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="iconfont icon-bullseye"></i>
<div class="item-name">访问量 :</div>
</div>
<div class="item-count" th:text="${stats.visit}"></div>
</div>
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="item-icon fas fa-stopwatch"></i>
<div class="item-name">建站天数 :</div>
</div>
<div class="item-count" th:text="${theme.config.basics.siteStartTime}" id="runtimeshow"></div>
</div>
<!-- <div class="webinfo-item">
<div class="webinfo-item-title"><i class="item-icon fas fa-font"></i>
<div class="item-name">全站字数 :</div>
</div>
<div class="item-count">606.7k</div>
</div> -->
</div>
</th:block>
</html>

23
templates/modules/widgets/aside/contain/tags-contain.html Normal file
View File

@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- 标签 -->
<th:block th:fragment="tags-contain"
th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}">
<div class="item-headline"><i class="iconfont icon-tags"></i><span>标签</span></div>
<div class="card-tag-cloud">
<a style="font-size:1em;color:#d3d3d3" th:each="tag,iterStat : ${tags}"
th:href="@{${tag.status.permalink}}"
th:if="${tagQuantity >= 0 && iterStat.index < tagQuantity || tagQuantity < 0}"
th:title="${tag.spec.displayName}">
<!-- 角标 -->
[[${tag.spec.displayName}]]<sup th:text="${tag.status.postCount}"></sup>
</a>
</div>
</th:block>
</html>

47
templates/modules/widgets/aside/stat.html
View File

@ -1,48 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- 侧边栏站点信息统计 -->
<th:block th:fragment="stat" th:with="stats = ${siteStatsFinder.getStats()}">
<div class="item-headline"><i class="iconfont icon-icon-sidebar-scxmtj"></i><span>统计</span></div> <div class="card-widget card-webinfo" th:fragment="stat">
<div class="webinfo"> <th:block th:replace="modules/widgets/aside/contain/stat-contain :: stat-contain"></th:block>
<div class="webinfo-item"> </div>
<div class="webinfo-item-title"><i class="iconfont icon-file-alt"></i>
<div class="item-name">文章数 :</div>
</div>
<div class="item-count" th:text="${stats.post}"></div>
</div>
<!--<div class="webinfo-item">-->
<!-- <div class="webinfo-item-title"><i class="item-icon fas fa-stopwatch"></i>-->
<!-- <div class="item-name">建站天数 :</div>-->
<!-- </div>-->
<!-- <div class="item-count" data-publishdate="2019-10-27T16:00:00.000Z" id="runtimeshow"></div>-->
<!--</div>-->
<!--<div class="webinfo-item">-->
<!-- <div class="webinfo-item-title"><i class="item-icon fas fa-font"></i>-->
<!-- <div class="item-name">全站字数 :</div>-->
<!-- </div>-->
<!-- <div class="item-count">606.7k</div>-->
<!--</div>-->
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="iconfont icon-sliders"></i>
<div class="item-name">分类数 :</div>
</div>
<div class="item-count" th:text="${stats.category}"></div>
</div>
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="iconfont icon-comment-alt"></i>
<div class="item-name">评论数 :</div>
</div>
<div class="item-count" th:text="${stats.comment}"></div>
</div>
<div class="webinfo-item">
<div class="webinfo-item-title"><i class="iconfont icon-bullseye"></i>
<div class="item-name">访问量 :</div>
</div>
<div class="item-count" th:text="${stats.visit}"></div>
</div>
</div>
</th:block>
</html>

6
templates/modules/widgets/aside/tags-stat.html
View File

@ -4,17 +4,15 @@
<th:block th:fragment="tags-stat"> <th:block th:fragment="tags-stat">
<div class="sticky_layout">
<div class="card-widget card-tags card-archives card-webinfo card-allinfo"> <div class="card-widget card-tags card-archives card-webinfo card-allinfo">
<th:block th:replace="modules/widgets/aside/tags :: tags"></th:block> <th:block th:replace="modules/widgets/aside/contain/tags-contain :: tags-contain"></th:block>
<hr> <hr>
<th:block th:replace="modules/widgets/aside/stat :: stat"></th:block> <th:block th:replace="modules/widgets/aside/contain/stat-contain :: stat-contain"></th:block>
</div> </div>
</div>
</th:block> </th:block>

22
templates/modules/widgets/aside/tags.html
View File

@ -2,22 +2,6 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- 标签 --> <!-- 标签 -->
<th:block th:fragment="tags" <div class="card-widget card-tags" th:fragment="tags">
th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}"> <th:block th:replace="modules/widgets/aside/contain/tags-contain :: tags-contain"></th:block>
</div>
<div class="item-headline"><i class="iconfont icon-tags"></i><span>标签</span></div>
<div class="card-tag-cloud">
<a style="font-size:1em;color:#d3d3d3" th:each="tag,iterStat : ${tags}"
th:href="@{${tag.status.permalink}}"
th:if="${tagQuantity >= 0 && iterStat.index < tagQuantity || categoryQuantity < 0}"
th:title="${tag.spec.displayName}">
<!-- 角标 -->
[[${tag.spec.displayName}]]<sup th:text="${tag.status.postCount}"></sup>
</a>
</div>
</th:block>
</html>