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

Merge pull request #66 from AirboZH/main 

fix: 修复侧栏分类、标签、统计组件
This commit is contained in:
sunheyi 2023-02-03 16:58:31 +08:00 committed by GitHub
parent 331825627c 2a25bd47e6
commit 0fef00f5f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 84 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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="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>

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>