Chuyaoyuan/Jiscuss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update fix

Browse Source
This commit is contained in:
Chuyaoyuan
2026-05-09 11:35:30 +08:00
parent 1828c37fca
commit ba8c1e3be3
15 changed files with 158 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/templates/discussions.ftl
+5 -1
View File
@@ -49,9 +49,13 @@
<i class="heart icon"></i> 赞这个主题
</div>
<a class="ui basic red left pointing label">
1,048
${discussions.likeCount!0}
</a>
</div>
<span style="margin-left:12px; color:#888; font-size:0.9em;">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
&nbsp;&nbsp;<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</span>
<div class="ui feed">
src/main/resources/templates/index.ftl
+67 -58
View File
@@ -347,10 +347,13 @@
</div>
<div class="nullright meta">
<a class="like ">
<i class="like icon"></i> ${discussions.likeCount} 喜欢
<i class="like icon"></i> ${discussions.likeCount!0} 喜欢
</a>
<a class="comment ">
<i class="comment icon"></i> ${discussions.commentsCount} 回复
<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</a>
<a class="comment ">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
</a>
</div>
</div>
@@ -397,10 +400,13 @@
</div>
<div class="nullright meta">
<a class="like ">
<i class="like icon"></i> ${discussions.likeCount} 喜欢
<i class="like icon"></i> ${discussions.likeCount!0} 喜欢
</a>
<a class="comment ">
<i class="comment icon"></i> ${discussions.commentsCount} 回复
<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</a>
<a class="comment ">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
</a>
</div>
</div>
@@ -446,10 +452,13 @@
</div>
<div class="nullright meta">
<a class="like ">
<i class="like icon"></i> ${discussions.likeCount} 喜欢
<i class="like icon"></i> ${discussions.likeCount!0} 喜欢
</a>
<a class="comment ">
<i class="comment icon"></i> ${discussions.commentsCount} 回复
<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</a>
<a class="comment ">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
</a>
</div>
</div>
@@ -461,68 +470,68 @@
</div>
<#-- Pagination: preserves tag and type query parameters -->
<div class="ui borderless menu">
<a class="icon item" id="upPage">
<i class="left chevron icon"></i>
</a>
<#assign baseUrl = "/?tag=" + tag + "&type=" + type>
<#if pageNum gt 1>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum - 1}">
<i class="left chevron icon"></i>
</a>
<#else>
<div class="disabled icon item"><i class="left chevron icon"></i></div>
</#if>
<#list pageDiscussions as page>
<#if page == pageNum && !(username)??>
<a class="item" style=" background-color: #7d827d;" href="/?pageNum=${page}">
${page}
</a>
</#if>
<#if page != pageNum && !(username)??>
<a class="item" href="/?pageNum=${page}">
${page}
</a>
</#if>
<#if page == pageNum && username??>
<a class="item" style=" background-color: #7d827d;" href="/main?pageNum=${page}">
${page}
</a>
</#if>
<#if page != pageNum && username??>
<a class="item" href="/main?pageNum=${page}">
${page}
</a>
<#assign pageInt = page?number>
<#if pageInt == pageNum>
<a class="active item" href="${baseUrl}&pageNum=${page}">${page}</a>
<#else>
<a class="item" href="${baseUrl}&pageNum=${page}">${page}</a>
</#if>
</#list>
<a class="icon item" id="nextPage"> <i class="right chevron icon"></i>
</a>
<#if pageNum lt pageTotalPages>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum + 1}">
<i class="right chevron icon"></i>
</a>
<#else>
<div class="disabled icon item"><i class="right chevron icon"></i></div>
</#if>
</div>
<!--pager-->
<#--<div class="ui borderless menu">
<ul class="pagination">
<#import "./comm/page.ftl" as page />
<@page.fpage page=pageNum pagesize=pageSize totalpages=pageTotalPages totalrecords=pageTotal url="/" />
</ul>
</div>-->
</div>
<div class="mobile only sixteen wide column">
<div class="ui segment">Jiscuss手机可见，内容正在编写中，pc端可正常访问</div>
<div class="ui large feed">
<#list allDiscussions as discussions>
<div class="event">
<div class="content">
<div class="summary">
<a href="/getdiscussionsbyid?id=${discussions.id}">
${discussions.title}
</a>
<div class="date">${discussions.startTime}</div>
</div>
<div class="meta">
<a><b>${discussions.username}</b></a>&nbsp;•&nbsp;
<i class="comment icon"></i>${discussions.commentsCount!0} 回复&nbsp;
<i class="eye icon"></i>${discussions.viewCount!0} 浏览
</div>
</div>
</div>
<div class="ui fitted divider"></div>
</#list>
</div>
<div class="ui borderless menu">
<a class="icon item">
<i class="left chevron icon"></i>
</a>
<a class="item">
1
</a>
<a class="item">
2
</a>
<div class="disabled item">
...
</div>
<a class="item">
10
</a>
<a class="item">
11
</a>
<a class="icon item"> <i class="right chevron icon"></i>
</a>
<#if pageNum gt 1>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum - 1}"><i class="left chevron icon"></i></a>
<#else>
<div class="disabled icon item"><i class="left chevron icon"></i></div>
</#if>
<span class="item">${pageNum} / ${pageTotalPages}</span>
<#if pageNum lt pageTotalPages>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum + 1}"><i class="right chevron icon"></i></a>
<#else>
<div class="disabled icon item"><i class="right chevron icon"></i></div>
</#if>
</div>
</div>