github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor comment module

pull/137/head
ruibaby 2019-03-21 16:45:38 +08:00
parent 9b7227dc80
commit 078b6ab9c7
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/resources/templates/common/comment/_native_comment.ftl
View File

@ -32,23 +32,23 @@ ${options.native_css!}
<#macro childComments comments> <#macro childComments comments>
<ul class="comment-list" style="margin-left: 30px; border-left: 1px solid #f1f1f1"> <ul class="comment-list" style="margin-left: 30px; border-left: 1px solid #f1f1f1">
<#if comments?? && comments?size gt 0> <#if comments?? && comments?size gt 0>
<#list comments?sort_by("commentDate") as comment> <#list comments?sort_by("createTime") as comment>
<li class="comment-list-one" id="comment-id-${comment.commentId?c}" style="margin-left: 5px;"> <li class="comment-list-one" id="comment-id-${comment.id?c}" style="margin-left: 5px;">
<img class="comment-list-one-img" src="//gravatar.loli.net/avatar/${comment.commentAuthorAvatarMd5!}?s=256&d=${options.native_comment_avatar!'mm'}"> <img class="comment-list-one-img" src="//gravatar.loli.net/avatar/${comment.gavatarMd5!}?s=256&d=${options.native_comment_avatar!'mm'}">
<section> <section>
<div class="comment-list-one-head"> <div class="comment-list-one-head">
<a class="comment-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl!}">${comment.commentAuthor!}</a> <a class="comment-list-one-head-name" rel="nofollow" href="${comment.authorUrl!}">${comment.author!}</a>
<span class="comment-ua-info" style="display: none">${comment.commentAgent!}</span> <span class="comment-ua-info" style="display: none">${comment.userAgent!}</span>
<#if comment.isAdmin==1> <#if comment.isAdmin==1>
<span class="comment-list-one-head-admin">博主</span> <span class="comment-list-one-head-admin">博主</span>
</#if> </#if>
</div> </div>
<div class="comment-list-one-content"> <div class="comment-list-one-content">
<p>${comment.commentContent!}</p> <p>${comment.content!}</p>
</div> </div>
<div class="comment-list-one-footer"> <div class="comment-list-one-footer">
<span class="comment-list-one-footer-time">${comment.commentDate?string("yyyy-MM-dd HH:mm")}</span> <span class="comment-list-one-footer-time">${comment.createTime?string("yyyy-MM-dd HH:mm")}</span>
<span at="${comment.commentId?c}" class="comment-list-one-footer-reback">回复</span> <span at="${comment.id?c}" class="comment-list-one-footer-reback">回复</span>
</div> </div>
</section> </section>
<#if comment.childComments?? && comment.childComments?size gt 0> <#if comment.childComments?? && comment.childComments?size gt 0>
@ -61,23 +61,23 @@ ${options.native_css!}
</#macro> </#macro>
<ul class="comment-list" id="comments-list"> <ul class="comment-list" id="comments-list">
<#if comments?? && comments.getPageList()?size gt 0> <#if comments?? && comments.getPageList()?size gt 0>
<#list comments.getPageList()?sort_by("commentDate")?reverse as comment> <#list comments.getPageList()?sort_by("createTime")?reverse as comment>
<li class="comment-list-one" id="comment-id-${comment.commentId?c}"> <li class="comment-list-one" id="comment-id-${comment.id?c}">
<img class="comment-list-one-img" src="//gravatar.loli.net/avatar/${comment.commentAuthorAvatarMd5!}?s=256&d=${options.native_comment_avatar!'mm'}"> <img class="comment-list-one-img" src="//gravatar.loli.net/avatar/${comment.gavatarMd5!}?s=256&d=${options.native_comment_avatar!'mm'}">
<section> <section>
<div class="comment-list-one-head"> <div class="comment-list-one-head">
<a class="comment-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl!}">${comment.commentAuthor!}</a> <a class="comment-list-one-head-name" rel="nofollow" href="${comment.authorUrl!}">${comment.author!}</a>
<span class="comment-ua-info" style="display: none">${comment.commentAgent!}</span> <span class="comment-ua-info" style="display: none">${comment.userAgent!}</span>
<#if comment.isAdmin==1> <#if comment.isAdmin==1>
<label class="comment-list-one-head-admin">博主</label> <label class="comment-list-one-head-admin">博主</label>
</#if> </#if>
</div> </div>
<div class="comment-list-one-content"> <div class="comment-list-one-content">
<p>${comment.commentContent!}</p> <p>${comment.content!}</p>
</div> </div>
<div class="comment-list-one-footer"> <div class="comment-list-one-footer">
<span class="comment-list-one-footer-time">${comment.commentDate?string("yyyy-MM-dd HH:mm")}</span> <span class="comment-list-one-footer-time">${comment.createTime?string("yyyy-MM-dd HH:mm")}</span>
<span at="${comment.commentId?c}" class="comment-list-one-footer-reback">回复</span> <span at="${comment.id?c}" class="comment-list-one-footer-reback">回复</span>
</div> </div>
</section> </section>
<#if comment.childComments?? && comment.childComments?size gt 0> <#if comment.childComments?? && comment.childComments?size gt 0>

18
src/main/resources/templates/common/web/atom.ftl
View File

@ -10,7 +10,7 @@
<title>${options.blog_title!}</title> <title>${options.blog_title!}</title>
<atom:link href="${options.blog_url!}/atom.xml" rel="self" type="application/rss+xml"/> <atom:link href="${options.blog_url!}/atom.xml" rel="self" type="application/rss+xml"/>
<link>${options.blog_url!}</link> <link>${options.blog_url!}</link>
<description>${user.userDesc!}</description> <description>${user.description!}</description>
<language>zh-CN</language> <language>zh-CN</language>
<sy:updatePeriod>hourly</sy:updatePeriod> <sy:updatePeriod>hourly</sy:updatePeriod>
<sy:updateFrequency>1</sy:updateFrequency> <sy:updateFrequency>1</sy:updateFrequency>
@ -19,25 +19,25 @@
<#if posts?? && posts?size gt 0> <#if posts?? && posts?size gt 0>
<#list posts as post> <#list posts as post>
<item> <item>
<title>${post.postTitle!}</title> <title>${post.title!}</title>
<link>${options.blog_url!}/archives/${post.postUrl!}</link> <link>${options.blog_url!}/archives/${post.url!}</link>
<comments>${options.blog_url!}/archives/${post.postUrl!}#comments</comments> <comments>${options.blog_url!}/archives/${post.url!}#comments</comments>
<pubDate>${post.postDate}</pubDate> <pubDate>${post.createTime}</pubDate>
<dc:creator><![CDATA[${user.userDisplayName!}]]></dc:creator> <dc:creator><![CDATA[${user.nickName!}]]></dc:creator>
<#if post.categories?? && post.categories?size gt 0> <#if post.categories?? && post.categories?size gt 0>
<#list post.categories as cate> <#list post.categories as cate>
<category><![CDATA[${cate.cateName!}]]></category> <category><![CDATA[${cate.name!}]]></category>
</#list> </#list>
</#if> </#if>
<description> <description>
<![CDATA[ <![CDATA[
${post.postSummary!} ${post.summary!}
]]> ]]>
</description> </description>
<content:encoded> <content:encoded>
<![CDATA[ <![CDATA[
${post.postContent!} ${post.formatContent!}
]]> ]]>
</content:encoded> </content:encoded>
<slash:comments>${post.comments?size}</slash:comments> <slash:comments>${post.comments?size}</slash:comments>

12
src/main/resources/templates/common/web/rss.ftl
View File

@ -3,21 +3,21 @@
<channel> <channel>
<title>${options.blog_title!}</title> <title>${options.blog_title!}</title>
<link>${options.blog_url!}</link> <link>${options.blog_url!}</link>
<#if user.userDesc??> <#if user.description??>
<description>${user.userDesc!}</description> <description>${user.description!}</description>
</#if> </#if>
<language>zh-CN</language> <language>zh-CN</language>
<#if posts?? && posts?size gt 0> <#if posts?? && posts?size gt 0>
<#list posts as post> <#list posts as post>
<item> <item>
<title>${post.postTitle!}</title> <title>${post.title!}</title>
<link>${options.blog_url}/archives/${post.postUrl!}</link> <link>${options.blog_url}/archives/${post.url!}</link>
<content:encoded> <content:encoded>
<![CDATA[ <![CDATA[
${post.postContent!} ${post.formatContent!}
]]> ]]>
</content:encoded> </content:encoded>
<pubDate>${post.postDate}</pubDate> <pubDate>${post.createTime}</pubDate>
</item> </item>
</#list> </#list>
</#if> </#if>

12
src/main/resources/templates/common/web/sitemap_html.ftl
View File

@ -147,8 +147,8 @@ see https://gitee.com/yadong.zhang/DBlog/blob/master/blog-web/src/main/java/com/
<#if posts?? && posts?size gt 0> <#if posts?? && posts?size gt 0>
<#list posts as post> <#list posts as post>
<li> <li>
<div class="T1 pull-left"><a href="${options.blog_url!}/archives/${post.postUrl!}" title="${post.postTitle!}">${post.postTitle!} | ${options.blog_title!}</a></div> <div class="T1 pull-left"><a href="${options.blog_url!}/archives/${post.url!}" title="${post.title!}">${post.title!} | ${options.blog_title!}</a></div>
<div class="T2 pull-right">${post.postDate?string('yyyy-MM-dd')}</div> <div class="T2 pull-right">${post.createTime?string('yyyy-MM-dd')}</div>
<div class="T3 pull-right">daily</div> <div class="T3 pull-right">daily</div>
<div class="T4 pull-right">0.6</div> <div class="T4 pull-right">0.6</div>
</li> </li>
@ -164,8 +164,8 @@ see https://gitee.com/yadong.zhang/DBlog/blob/master/blog-web/src/main/java/com/
<#if categories?? && categories?size gt 0> <#if categories?? && categories?size gt 0>
<#list categories as cate> <#list categories as cate>
<li> <li>
<div class="T1 pull-left"><a href="${options.blog_url}/categories/${cate.cateUrl!}" title="前端编程">${cate.cateName} | ${options.blog_title!}</a></div> <div class="T1 pull-left"><a href="${options.blog_url}/categories/${cate.url!}" title="前端编程">${cate.name} | ${options.blog_title!}</a></div>
<div class="T2 pull-right">${options.blog_start!}</div> <div class="T2 pull-right">${cate.createTime?string('yyyy-MM-dd')}</div>
<div class="T3 pull-right">daily</div> <div class="T3 pull-right">daily</div>
<div class="T4 pull-right">0.6</div> <div class="T4 pull-right">0.6</div>
</li> </li>
@ -182,8 +182,8 @@ see https://gitee.com/yadong.zhang/DBlog/blob/master/blog-web/src/main/java/com/
<#if tags?? && tags?size gt 0> <#if tags?? && tags?size gt 0>
<#list tags as tag> <#list tags as tag>
<li> <li>
<div class="T1 pull-left"><a href="${options.blog_url}/tags/${tag.tagUrl!}" title="前端编程">${tag.tagName} | ${options.blog_title!}</a></div> <div class="T1 pull-left"><a href="${options.blog_url}/tags/${tag.url!}" title="前端编程">${tag.name} | ${options.blog_title!}</a></div>
<div class="T2 pull-right">${options.blog_start!}</div> <div class="T2 pull-right">${tag.createTime?string('yyyy-MM-dd')}</div>
<div class="T3 pull-right">daily</div> <div class="T3 pull-right">daily</div>
<div class="T4 pull-right">0.6</div> <div class="T4 pull-right">0.6</div>
</li> </li>

4
src/main/resources/templates/common/web/sitemap_xml.ftl
View File

@ -3,8 +3,8 @@
<#if posts?? && posts?size gt 0> <#if posts?? && posts?size gt 0>
<#list posts as post> <#list posts as post>
<url> <url>
<loc>${options.blog_url!}/archives/${post.postUrl!}</loc> <loc>${options.blog_url!}/archives/${post.url!}</loc>
<lastmod>${post.postDate?iso_local}</lastmod> <lastmod>${post.createTime?iso_local}</lastmod>
</url> </url>
</#list> </#list>
</#if> </#if>