Merge pull request #225 from chengzhongxue/main

友联优化
This commit is contained in:
小孙同学 2023-07-01 09:51:41 +08:00 committed by GitHub
commit cbea58b70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 475 additions and 424 deletions

File diff suppressed because it is too large Load Diff

View File

@ -53,15 +53,13 @@
</div> </div>
<!--钓鱼--> <!--钓鱼-->
<th:block th:if="${not #lists.isEmpty(groups)}"> <th:block th:if="${not #lists.isEmpty(groups)}" >
<div class="title-h2-a"> <div class="title-h2-a">
<div class="title-h2-a-left"> <div class="title-h2-a-left">
<h2 style="padding-top:0;margin:.6rem 0 .6rem">🎣 钓鱼</h2><a class="random-post-start" <h2 style="padding-top:0;margin:.6rem 0 .6rem">🎣 钓鱼</h2><a class="random-post-start"
href="javascript:fetchRandomPost();"><i href="javascript:fetchRandomPost();"><i class="anzhiyufont anzhiyu-icon-arrow-rotate-right"></i></a>
class="anzhiyufont anzhiyu-icon-arrow-rotate-right"></i></a>
</div> </div>
<div class="title-h2-a-right"><a class="random-post-all" href="/fcircle" <div class="title-h2-a-right"><a class="random-post-all" href="/fcircle" data-pjax-state="">查看鱼塘</a></div>
data-pjax-state="">查看鱼塘</a></div>
</div> </div>
<div id="random-post"></div> <div id="random-post"></div>
<script type="text/javascript"> <script type="text/javascript">
@ -71,7 +69,6 @@
hungryFish: 500, hungryFish: 500,
} }
</script> </script>
<!-- <link rel="stylesheet" type="text/css" href="https://cdn.yzczi.com/moments/random-friends-post.css"> -->
<script th:src="@{/assets/libs/moments/random-friends-post.js}"></script> <script th:src="@{/assets/libs/moments/random-friends-post.js}"></script>
</th:block> </th:block>
@ -79,21 +76,24 @@
<th:block th:each="group,iterStat : ${groups}"> <th:block th:each="group,iterStat : ${groups}">
<h2> <h2 th:if="${not #lists.isEmpty(group.spec.displayName)}">
<a class="headerlink" href="#" th:title="${group.spec.displayName}"></a> <a class="headerlink" th:href="'#'+${group.spec.displayName}+'-'+${group.links.size}" th:title="${group.spec.displayName}+ '('+${group.links.size}+')'"></a>
[[${group.spec.displayName}]] [[${group.spec.displayName}]] ([[${group.links.size}]])
</h2> </h2>
<!--<div class="flink-desc">分类描述信息 xxxxx</div>-->
<div class="flink-desc">[[${group.spec.description}]]</div>
<!-- 第一个,使用卡片展示 --> <!-- 第一个,使用卡片展示 -->
<div class="site-card-group" th:if="${iterStat.first}"> <div th:if="${#strings.equals(group.spec.displayStyle,'beautify') && not #lists.isEmpty(group.spec.displayStyle)}" class="site-card-group" >
<div class="site-card" th:each="link : ${group.links}"> <div class="site-card" th:each="link : ${group.links}">
<!--<span class="site-card-tag">生活</span>--> <span th:if="${not #lists.isEmpty(link.spec.label)}" th:style="'background-color:' + ${link.spec.labelColor}" class="site-card-tag">[[${link.spec.label}]]</span>
<a class="img" target="_blank" th:href="${link.spec.url}" <a class="img" target="_blank" th:href="${link.spec.url}"
th:title="${link.spec.displayName}"> th:title="${link.spec.displayName}">
<img class="flink-avatar" style="pointer-events: none;" <img class="flink-avatar" style="pointer-events: none;"
th:alt="${link.spec.displayName}" th:src="${link.spec.logo}"> th:alt="${link.spec.displayName}" th:src="${link.spec.siteshot}">
</a> </a>
<a class="info cf-friends-link" target="_blank" th:href="${link.spec.url}" <a class="info cf-friends-link" target="_blank" th:href="${link.spec.url}"
th:title="${link.spec.displayName}"> th:title="${link.spec.displayName}">
<div class="site-card-avatar"> <div class="site-card-avatar">
@ -111,8 +111,9 @@
</div> </div>
<div class="flink-list" th:if="${not iterStat.first}"> <div class="flink-list" th:if="${#strings.equals(group.spec.displayStyle,'default') && not #lists.isEmpty(group.spec.displayStyle)}">
<div class="flink-list-item" th:each="link : ${group.links}"> <div class="flink-list-item" th:each="link : ${group.links}">
<span th:if="${not #lists.isEmpty(link.spec.label)}" th:style="'background-color:' + ${link.spec.labelColor}" class="site-card-tag">[[${link.spec.label}]]</span>
<a class="cf-friends-link" rel="external nofollow" <a class="cf-friends-link" rel="external nofollow"
target="_blank" target="_blank"
th:href="${link.spec.url}" th:href="${link.spec.url}"
@ -130,18 +131,34 @@
</div> </div>
</div> </div>
<div class="flink-list mini" th:if="${#strings.equals(group.spec.displayStyle,'deprecated') && not #lists.isEmpty(group.spec.displayStyle)}">
<div class="flink-list-item" th:each="link : ${group.links}">
<a class="cf-friends-link" rel="external nofollow"
target="_blank"
th:href="${link.spec.url}"
th:title="${link.spec.displayName}">
<img class="flink-avatar cf-friends-avatar entered loaded"
th:src="${link.spec.logo}"
th:alt="${link.spec.displayName}">
<div class="img-alt is-center">[[${link.spec.displayName}]]</div>
<div class="flink-item-info">
<span class="flink-item-name cf-friends-name">[[${link.spec.displayName}]]</span>
<span class="flink-item-desc" th:title="${link.spec.description}">[[${link.spec.description}]]</span>
</div>
</a>
</div>
</div>
</th:block> </th:block>
</div> </div>
<hr/> <hr/>
<!-- 评论模块 --> <!-- 评论模块 -->
<th:block <th:block th:if="${theme.config.comments.twikoo && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.envId)}">
th:if="${theme.config.comments.twikoo && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.envId)}">
<div th:replace="~{modules/twikoo :: twikoo}"></div> <div th:replace="~{modules/twikoo :: twikoo}"></div>
</th:block> </th:block>
<div id="post-comment" <div id="post-comment" th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
<div class="comment-head"> <div class="comment-head">
<div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div> <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
<div class="comment-privacy"><a href="/privacy">隐私政策</a></div> <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
@ -149,8 +166,7 @@
<span>你无需删除空行,直接评论以获取最佳展示效果</span> <span>你无需删除空行,直接评论以获取最佳展示效果</span>
</div> </div>
</div> </div>
<halo:comment group="content.halo.run" kind="SinglePage" th:attr="name='links'" <halo:comment group="content.halo.run" kind="SinglePage" th:attr="name='links'" colorScheme="document.documentElement.getAttribute('data-theme')" />
colorScheme="document.documentElement.getAttribute('data-theme')"/>
</div> </div>
</div> </div>

View File

@ -34,7 +34,7 @@
</a> </a>
</div> </div>
</div> </div>
<div class="footer-group"> <div th:if="${theme.config.footer.enable_footer_group}" class="footer-group">
<div class="footer-title-group"> <div class="footer-title-group">
<h3 class="footer-title">友链</h3><a class="random-friends-btn" <h3 class="footer-title">友链</h3><a class="random-friends-btn"
href="javascript:link.addFriendLinksInFooter();" href="javascript:link.addFriendLinksInFooter();"

View File

@ -17,12 +17,12 @@
<script th:src="@{/assets/js/halo.js}"></script> <script th:src="@{/assets/js/halo.js}"></script>
<link rel="stylesheet" th:href="@{/assets/zhheo/zhheoblog.css}"> <link rel="stylesheet" th:href="@{/assets/zhheo/zhheoblog.css}">
<link rel="stylesheet" th:href="@{/assets/zhheo/custom.css}"> <link rel="stylesheet" th:href="@{/assets/zhheo/custom.css}">
<link rel="stylesheet" th:href="@{/assets/zhheo/commentBarrage.css}"> <link rel="stylesheet" th:href="@{/assets/zhheo/commentBarrage.css}">
<link media="print" <link media="print"
onload='this.media="all"' onload='this.media="all"'
rel="stylesheet" rel="stylesheet"
@ -36,8 +36,8 @@
media="print" media="print"
onload='this.media="all"' onload='this.media="all"'
rel="stylesheet" rel="stylesheet"
/> />
<link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.2.0/css/all.min.css" media="all" onload="this.media='all'"> <link rel="stylesheet" href="https://cdn.staticfile.org/font-awesome/6.2.0/css/all.min.css" media="all" onload="this.media='all'">
@ -149,9 +149,7 @@
<link rel="stylesheet" th:href="@{/assets/libs/fancybox/jquery.fancybox.min.css}"> <link rel="stylesheet" th:href="@{/assets/libs/fancybox/jquery.fancybox.min.css}">
<!-- icon图标 --> <!-- icon图标 -->
<link rel="preload" as="style" onload="this.rel='stylesheet'" th:href="@{/assets/icon/fontawesome/fontawesome.min.css}">
<link rel="stylesheet" href="https://npm.elemecdn.com/anzhiyu-theme-static@1.1.0/icon/ali_iconfont_css.css"> <link rel="stylesheet" href="https://npm.elemecdn.com/anzhiyu-theme-static@1.1.0/icon/ali_iconfont_css.css">
<!-- 声明一些公共信息 --> <!-- 声明一些公共信息 -->
@ -192,7 +190,7 @@
}; };
// 根据htmlType设置页面title // 根据htmlType设置页面title
setTitle = () => { setTitle = () => {
let title = '' let title = ''
switch ([[${ htmlType }]]) { switch ([[${ htmlType }]]) {
@ -234,12 +232,12 @@
setTitle() setTitle()
})() })()
</script> </script>
</head> </head>
</html> </html>