Commit ef31c684 authored by Van's avatar Van

🐛 #comment 为动态评论时无法定位

parent 1f4f3d0f
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
  |     |  
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${commentCountLabel}"> <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${commentCountLabel}">
<i class="icon-comments"></i> <i class="icon-comments"></i>
<a href="${servePath}${article.articlePermalink}#comments"> <a href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a>
</span> </span>
</#if> </#if>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
&nbsp; | &nbsp; &nbsp; | &nbsp;
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${commentCountLabel}"> <span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${commentCountLabel}">
<i class="icon-comments"></i> <i class="icon-comments"></i>
<a href="${servePath}${article.articlePermalink}#comments"> <a href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a>
</span> </span>
</#if> </#if>
...@@ -109,7 +109,8 @@ ...@@ -109,7 +109,8 @@
</div> </div>
</footer> </footer>
<#if commentable> <#if commentable>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" class="fn__none"> <div id="soloComments" class="fn__none">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
${article.authorName}</a> ${article.authorName}</a>
<#if commentable> <#if commentable>
| |
<a rel="nofollow" class="underline" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" class="underline" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel} <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}
</a> </a>
</#if> </#if>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
${article.authorName}</a> ${article.authorName}</a>
<#if commentable> <#if commentable>
| |
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel} <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}
</a> </a>
</#if> </#if>
...@@ -105,9 +105,10 @@ ...@@ -105,9 +105,10 @@
<div id="externalRelevantArticles" class="article-relative"></div> <div id="externalRelevantArticles" class="article-relative"></div>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" <div id="b3logsolocomments"></div>
style="border-top: 2px solid #3F3D36;margin-top: 30px;padding-top: 27px; padding-bottom: 30px;" <div id="vcomment"
data-name="${article.authorName}" data-postId="${article.oId}"></div> style="border-top: 2px solid #3F3D36;margin-top: 30px;padding-top: 27px; padding-bottom: 30px;"
data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
</div> </div>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -1386,7 +1386,6 @@ pre { ...@@ -1386,7 +1386,6 @@ pre {
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
} }
pre code { pre code {
......
...@@ -1385,7 +1385,6 @@ pre { ...@@ -1385,7 +1385,6 @@ pre {
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #ccc;
border-radius: 4px; } border-radius: 4px; }
pre code { pre code {
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</#list> </#list>
<#if commentable> <#if commentable>
&nbsp;·&nbsp; &nbsp;·&nbsp;
<a class="item__tag" href="${servePath}${article.articlePermalink}#comments"> <a class="item__tag" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel} <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}
</a> </a>
</#if> </#if>
......
...@@ -83,16 +83,17 @@ ...@@ -83,16 +83,17 @@
</div> </div>
</#if> </#if>
<#if commentable> <#if commentable>
<div class="wrapper"> <div id="b3logsolocomments"></div>
<div id="vcomment" <div class="wrapper">
style=" margin-bottom: 40px; margin-top: 80px; <div id="vcomment"
border: 1px solid rgba(255,255,255,0.8); style=" margin-bottom: 40px; margin-top: 80px;
border-radius: 5px; border: 1px solid rgba(255,255,255,0.8);
background: rgba(255,255,255,0.9); border-radius: 5px;
box-shadow: 0 1px 4px rgba(0,0,0,0.04); background: rgba(255,255,255,0.9);
padding: 20px;" box-shadow: 0 1px 4px rgba(0,0,0,0.04);
data-name="${article.authorName}" data-postId="${article.oId}"></div> padding: 20px;"
</div> data-name="${article.authorName}" data-postId="${article.oId}"></div>
</div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
<svg class="side__top" id="sideTop" version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"> <svg class="side__top" id="sideTop" version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<path d="M26.562 13.958c0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303v0c0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303v0zM23.305 10.7c0 0 0 0 0 0 0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303c0-0 0-0 0-0v0c0-0 0-0 0-0 0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303c0 0 0 0 0 0v0zM20.022 7.417c0 0 0 0 0 0 0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303c0-0 0-0 0-0v0c0-0 0-0 0-0 0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303c0 0 0 0 0 0v0zM29.67 0h-27.339c-0.677 0-1.228 0.551-1.228 1.228s0.551 1.228 1.228 1.228h11.151l-10.725 10.725c-0.476 0.476-0.476 1.253 0 1.729 0.226 0.226 0.551 0.351 0.852 0.351s0.626-0.125 0.852-0.351l10.074-10.074v25.936c0 0.677 0.551 1.228 1.228 1.228s1.228-0.551 1.228-1.228v-26.011c0.476 0.426 1.203 0.426 1.679-0.050s0.476-1.253 0-1.729l-0.576-0.576h11.577c0.677 0 1.228-0.551 1.228-1.228 0-0.626-0.551-1.178-1.228-1.178z"></path> <path d="M26.562 13.958c0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303v0c0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303v0zM23.305 10.7c0 0 0 0 0 0 0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303c0-0 0-0 0-0v0c0-0 0-0 0-0 0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303c0 0 0 0 0 0v0zM20.022 7.417c0 0 0 0 0 0 0 0.72 0.583 1.303 1.303 1.303s1.303-0.583 1.303-1.303c0-0 0-0 0-0v0c0-0 0-0 0-0 0-0.72-0.583-1.303-1.303-1.303s-1.303 0.583-1.303 1.303c0 0 0 0 0 0v0zM29.67 0h-27.339c-0.677 0-1.228 0.551-1.228 1.228s0.551 1.228 1.228 1.228h11.151l-10.725 10.725c-0.476 0.476-0.476 1.253 0 1.729 0.226 0.226 0.551 0.351 0.852 0.351s0.626-0.125 0.852-0.351l10.074-10.074v25.936c0 0.677 0.551 1.228 1.228 1.228s1.228-0.551 1.228-1.228v-26.011c0.476 0.426 1.203 0.426 1.679-0.050s0.476-1.253 0-1.729l-0.576-0.576h11.577c0.677 0 1.228-0.551 1.228-1.228 0-0.626-0.551-1.178-1.228-1.178z"></path>
</svg> </svg>
<script type="text/javascript"
src="${staticServePath}/skins/${skinDirName}/js/circleMagic.min.js?${staticResourceVersion}"
charset="utf-8"></script>
<#include "../../common-template/label.ftl"> <#include "../../common-template/label.ftl">
<script type="text/javascript" <script type="text/javascript"
src="${staticServePath}/skins/${skinDirName}/js/common.min.js?${staticResourceVersion}" src="${staticServePath}/skins/${skinDirName}/js/common.min.js?${staticResourceVersion}"
charset="utf-8"></script> charset="utf-8"></script>
<script type="text/javascript"
src="${staticServePath}/skins/${skinDirName}/js/circleMagic.min.js?${staticResourceVersion}"
charset="utf-8"></script>
${plugins} ${plugins}
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<img src="${article.authorThumbnailURL}" /> <img src="${article.authorThumbnailURL}" />
</a> </a>
<#if commentable> <#if commentable>
<a class="item__meta" href="${servePath}${article.articlePermalink}#comments"> <a class="item__meta" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span></span> ${commentLabel} <span data-uvstatcmt="${article.oId}"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span></span> ${commentLabel}
</a> </a>
<#else> <#else>
......
...@@ -86,7 +86,8 @@ ...@@ -86,7 +86,8 @@
</div> </div>
</#if> </#if>
<#if commentable> <#if commentable>
<div id="vcomment" class="comment__wrapper wrapper" style="margin: 40px auto" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" class="comment__wrapper wrapper" style="margin: 40px auto" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</li> </li>
<#if commentable> <#if commentable>
<li> <li>
<a rel="nofollow" title="${commentLabel}" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" title="${commentLabel}" href="${servePath}${article.articlePermalink}#b3logsolocomments">
${commentLabel} (<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>) ${commentLabel} (<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>)
</a> </a>
</li> </li>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</li> </li>
<#if commentable> <#if commentable>
<li> <li>
<a rel="nofollow" title="${commentLabel}" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" title="${commentLabel}" href="${servePath}${article.articlePermalink}#b3logsolocomments">
${commentLabel} (<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>) ${commentLabel} (<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>)
</a> </a>
</li> </li>
...@@ -122,9 +122,8 @@ ...@@ -122,9 +122,8 @@
</div> </div>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" style="margin-bottom: 40px; <div id="b3logsolocomments"></div>
border-top: 1px solid #dcdcdc; <div id="vcomment" style="margin-bottom: 40px;border-top: 1px solid #dcdcdc;padding-top: 30px;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
padding-top: 30px;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
<div id="externalRelevantArticles" class="fn-wrap"></div> <div id="externalRelevantArticles" class="fn-wrap"></div>
</#if> </#if>
<#if commentable> <#if commentable>
<div id="vcomment" style="margin-top: 100px" class="fn-wrap" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" style="margin-top: 100px" class="fn-wrap" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</span> </span>
<div class="fn__right"> <div class="fn__right">
<#if commentable> <#if commentable>
<a class="ft__red" href="${servePath}${article.articlePermalink}#comments"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a> <a class="ft__red" href="${servePath}${article.articlePermalink}#b3logsolocomments"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a>
</#if> </#if>
<a class="ft__red" href="${servePath}${article.articlePermalink}"><span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> ${viewLabel}</a> <a class="ft__red" href="${servePath}${article.articlePermalink}"><span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> ${viewLabel}</a>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</span> </span>
<div class="fn__right"> <div class="fn__right">
<#if commentable> <#if commentable>
<a class="ft__red" href="${servePath}${article.articlePermalink}#comments"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a> <a class="ft__red" href="${servePath}${article.articlePermalink}#b3logsolocomments"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}</a>
</#if> </#if>
<span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> ${viewLabel} <span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> ${viewLabel}
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
</#if> </#if>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
${article.articleUpdateDate?string("yyyy-MM-dd")} ${article.articleUpdateDate?string("yyyy-MM-dd")}
</time> &nbsp;•&nbsp; </time> &nbsp;•&nbsp;
<#if commentable> <#if commentable>
<a href="${servePath}${article.articlePermalink}#comments" class="ft-gray"> <a href="${servePath}${article.articlePermalink}#b3logsolocomments" class="ft-gray">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel} <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}
</a> &nbsp;•&nbsp; </a> &nbsp;•&nbsp;
</#if> </#if>
......
...@@ -119,7 +119,8 @@ ...@@ -119,7 +119,8 @@
<div class="fn-flex-1" id="randomArticles"></div> <div class="fn-flex-1" id="randomArticles"></div>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" class="article__comment" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" class="article__comment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
<div class="right article-element"> <div class="right article-element">
<#if commentable> <#if commentable>
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>&nbsp;&nbsp;${commentLabel} <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>&nbsp;&nbsp;${commentLabel}
</a>&nbsp;&nbsp; </a>&nbsp;&nbsp;
</#if> </#if>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
<div class="right article-element"> <div class="right article-element">
<#if commentable> <#if commentable>
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>&nbsp;&nbsp;${commentLabel} <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>&nbsp;&nbsp;${commentLabel}
</a>&nbsp;&nbsp; </a>&nbsp;&nbsp;
</#if> </#if>
...@@ -107,8 +107,9 @@ ...@@ -107,8 +107,9 @@
</div> </div>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" style="margin:15px 5px 0 5px;padding: 10px;background-color: #F5F5F5;box-sizing: border-box" <div id="b3logsolocomments"></div>
data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="vcomment" style="margin:15px 5px 0 5px;padding: 10px;background-color: #F5F5F5;box-sizing: border-box"
data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</#if> </#if>
with <span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> views with <span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> views
<#if commentable> <#if commentable>
and <a href="#comments"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> comments</a> and <a href="#b3logsolocomments"><span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> comments</a>
</#if> </#if>
</div> </div>
<div class="item__tags"> <div class="item__tags">
...@@ -91,7 +91,8 @@ ...@@ -91,7 +91,8 @@
<div class="body--gray post__gray"> <div class="body--gray post__gray">
<div class="wrapper comment"> <div class="wrapper comment">
<#if commentable> <#if commentable>
<div id="vcomment" style="padding: 30px 0;" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" style="padding: 30px 0;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</#list> </#list>
</div> </div>
<#if commentable> <#if commentable>
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments" class="left"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments" class="left">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
<span class="count" data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span class="count" data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
......
...@@ -89,12 +89,12 @@ ...@@ -89,12 +89,12 @@
</span> </span>
</#list> </#list>
</div> </div>
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments" class="left"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments" class="left">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
<span class="count" data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span class="count" data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
<div class="right"> <div class="right">
<a rel="nofollow" href="#comments" class="right"> <a rel="nofollow" href="#b3logsolocomments" class="right">
${replyLabel} ${replyLabel}
</a> </a>
</div> </div>
...@@ -120,10 +120,11 @@ ...@@ -120,10 +120,11 @@
<div id="externalRelevantArticles" class="article-relative"></div> <div id="externalRelevantArticles" class="article-relative"></div>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" <div id="b3logsolocomments"></div>
class="comments" <div id="vcomment"
style="padding-top: 15px" class="comments"
data-name="${article.authorName}" data-postId="${article.oId}"></div> style="padding-top: 15px"
data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</div> </div>
<#if commentable> <#if commentable>
<div class="right"> <div class="right">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments" class="left"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments" class="left">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</div> </div>
<#if commentable> <#if commentable>
<div class="right"> <div class="right">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments" class="left"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments" class="left">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
...@@ -113,7 +113,8 @@ ...@@ -113,7 +113,8 @@
<div id="externalRelevantArticles" class="article-relative"></div> <div id="externalRelevantArticles" class="article-relative"></div>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" class="comments" <div id="b3logsolocomments"></div>
<div id="vcomment" class="comments"
style="padding-top: 15px" style="padding-top: 15px"
data-name="${article.authorName}" data-postId="${article.oId}"></div> data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
<div class="fn-right"> <div class="fn-right">
<#if commentable> <#if commentable>
<a rel="nofollow" data-ico="&#xe14e;" data-uvstatcmt="${article.oId}" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" data-ico="&#xe14e;" data-uvstatcmt="${article.oId}" href="${servePath}${article.articlePermalink}#b3logsolocomments">
${article.articleCommentCount} ${article.articleCommentCount}
</a> </a>
</#if> </#if>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</div> </div>
<div class="article-info"> <div class="article-info">
<#if commentable> <#if commentable>
<a rel="nofollow" data-ico="&#xe14e;" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" data-ico="&#xe14e;" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
</#if> </#if>
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
</#if> </#if>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
@import "../../../scss/toc"; @import "../../../scss/toc";
@import "../../../scss/usite"; @import "../../../scss/usite";
@import "../../../scss/function"; @import "../../../scss/function";
@import "vditor/src/assets/scss/classic"; @import "vditor/src/assets/scss/dark";
.vditor-reset pre > code { .vditor-reset pre > code {
background-color: rgba(255, 255, 255, 0.04); background-color: rgba(255, 255, 255, 0.04);
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<#if commentable> <#if commentable>
<span> <span>
&nbsp; | &nbsp; &nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments"> <a href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${cmtLabel}</a> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${cmtLabel}</a>
</span> </span>
</#if> </#if>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<#if commentable> <#if commentable>
<span class="post-comments-count"> <span class="post-comments-count">
&nbsp; | &nbsp; &nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments"> <a href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${cmtLabel}</a> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${cmtLabel}</a>
</span> </span>
</#if> </#if>
...@@ -108,7 +108,8 @@ ...@@ -108,7 +108,8 @@
</article> </article>
</div> </div>
<#if commentable> <#if commentable>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -1321,7 +1321,7 @@ img { ...@@ -1321,7 +1321,7 @@ img {
padding: 5px; padding: 5px;
background: #222; background: #222;
line-height: 0; line-height: 0;
z-index: 1050; z-index: 21;
cursor: pointer; cursor: pointer;
-webkit-transform: translateZ(0); } -webkit-transform: translateZ(0); }
...@@ -1380,7 +1380,7 @@ img { ...@@ -1380,7 +1380,7 @@ img {
position: fixed; position: fixed;
bottom: 19px; bottom: 19px;
right: 50px; right: 50px;
z-index: 1050; z-index: 22;
width: 15px; width: 15px;
height: 13px; height: 13px;
padding: 5px; padding: 5px;
...@@ -1408,7 +1408,7 @@ img { ...@@ -1408,7 +1408,7 @@ img {
right: -320px; right: -320px;
top: 0; top: 0;
bottom: 0; bottom: 0;
z-index: 1040; z-index: 20;
box-shadow: inset 0 2px 6px #000; box-shadow: inset 0 2px 6px #000;
background: #222; background: #222;
-webkit-transform: translateZ(0); -webkit-transform: translateZ(0);
......
...@@ -345,7 +345,7 @@ img { ...@@ -345,7 +345,7 @@ img {
padding: 5px; padding: 5px;
background: #222; background: #222;
line-height: 0; line-height: 0;
z-index: 1050; z-index: 21;
cursor: pointer; cursor: pointer;
-webkit-transform: translateZ(0); -webkit-transform: translateZ(0);
} }
...@@ -407,7 +407,7 @@ img { ...@@ -407,7 +407,7 @@ img {
position: fixed; position: fixed;
bottom: 19px; bottom: 19px;
right: 50px; right: 50px;
z-index: 1050; z-index: 22;
width: 15px; width: 15px;
height: 13px; height: 13px;
padding: 5px; padding: 5px;
...@@ -438,7 +438,7 @@ img { ...@@ -438,7 +438,7 @@ img {
right: -320px; right: -320px;
top: 0; top: 0;
bottom: 0; bottom: 0;
z-index: 1040; z-index: 20;
box-shadow: inset 0 2px 6px #000; box-shadow: inset 0 2px 6px #000;
background: #222; background: #222;
-webkit-transform: translateZ(0); -webkit-transform: translateZ(0);
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</#list> </#list>
</span> </span>
<#if commentable> <#if commentable>
<a class="tag" href="${servePath}${article.articlePermalink}#comments"> <a class="tag" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<i class="icon__comments"></i> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel} <i class="icon__comments"></i> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}
</a> </a>
</#if> </#if>
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</#list> </#list>
</span> </span>
<#if commentable> <#if commentable>
<a class="tag" href="${servePath}${article.articlePermalink}#comments"> <a class="tag" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<i class="icon__comments"></i> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel} <i class="icon__comments"></i> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}
</a> </a>
</#if> </#if>
...@@ -133,9 +133,10 @@ ...@@ -133,9 +133,10 @@
</div> </div>
</#if> </#if>
<#if commentable> <#if commentable>
<div id="vcomment" class="module__content" <div id="b3logsolocomments"></div>
style="border-radius: 5px;margin-bottom: 30px;box-shadow: 1px 1px 3px 1px rgba(0,0,0,0.2);transition: all .3s;" <div id="vcomment" class="module__content"
data-name="${article.authorName}" data-postId="${article.oId}"></div> style="border-radius: 5px;margin-bottom: 30px;box-shadow: 1px 1px 3px 1px rgba(0,0,0,0.2);transition: all .3s;"
data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" class="fn__none"> <div id="soloComments" class="fn__none">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<a rel="nofollow" href="${servePath}${article.articlePermalink}"> <a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> <span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span>
</a><#if commentable> | ${commentCount1Label} </a><#if commentable> | ${commentCount1Label}
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
......
...@@ -62,7 +62,7 @@ ${topBarReplacement} ...@@ -62,7 +62,7 @@ ${topBarReplacement}
<span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span> <span data-uvstaturl="${servePath}${article.articlePermalink}">${article.articleViewCount}</span>
</a> </a>
<#if commentable> | ${commentCount1Label} <#if commentable> | ${commentCount1Label}
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span class="left articles-commentIcon" title="${commentLabel}"></span> <span class="left articles-commentIcon" title="${commentLabel}"></span>
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
...@@ -104,10 +104,11 @@ ${topBarReplacement} ...@@ -104,10 +104,11 @@ ${topBarReplacement}
<div id="randomArticles"></div> <div id="randomArticles"></div>
<div id="externalRelevantArticles"></div> <div id="externalRelevantArticles"></div>
<#if commentable> <#if commentable>
<div id="vcomment" <div id="b3logsolocomments"></div>
class="comments" <div id="vcomment"
style="padding-top: 15px;" class="comments"
data-name="${article.authorName}" data-postId="${article.oId}"></div> style="padding-top: 15px;"
data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> <a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a>
</span> </span>
<span class="ico-comment ico" title="${commentLabel}"> <span class="ico-comment ico" title="${commentLabel}">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
</span> </span>
......
...@@ -79,7 +79,7 @@ ${topBarReplacement} ...@@ -79,7 +79,7 @@ ${topBarReplacement}
</span> </span>
<#if commentable> <#if commentable>
<span class="ico-comment ico" title="${commentLabel}"> <span class="ico-comment ico" title="${commentLabel}">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
</a> </a>
</span> </span>
...@@ -118,7 +118,8 @@ ${topBarReplacement} ...@@ -118,7 +118,8 @@ ${topBarReplacement}
<div id="externalRelevantArticles"></div> <div id="externalRelevantArticles"></div>
</#if> </#if>
<#if commentable> <#if commentable>
<div id="vcomment" class="module" data-name="${article.authorName}" data-postId="${article.oId}"></div> <div id="b3logsolocomments"></div>
<div id="vcomment" class="module" data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;" class="module"> <div id="soloComments" style="display: none;" class="module">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</span> </span>
<#if commentable> <#if commentable>
<span class="ico-comment ico" title="${commentLabel}"> <span class="ico-comment ico" title="${commentLabel}">
<a rel="nofollow" data-uvstatcmt="${article.oId} href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" data-uvstatcmt="${article.oId} href="${servePath}${article.articlePermalink}#b3logsolocomments">
${article.articleCommentCount} ${article.articleCommentCount}
</a> </a>
</span> </span>
......
...@@ -310,7 +310,7 @@ window.timeline = { ...@@ -310,7 +310,7 @@ window.timeline = {
+ '<a rel="author" href="' + Label.servePath + '/authors/' + article.authorId + '">' + '<a rel="author" href="' + Label.servePath + '/authors/' + article.authorId + '">'
+ article.authorName + '</a></span>&nbsp;<span class="ico-comment ico" title="' + article.authorName + '</a></span>&nbsp;<span class="ico-comment ico" title="'
+ Label.commentLabel + '"><a rel="nofollow" href="' + Label.servePath + article.articlePermalink + Label.commentLabel + '"><a rel="nofollow" href="' + Label.servePath + article.articlePermalink
+ '#comments" data-uvstatcmt="' + article.oId + '">' + article.articleCommentCount + '#b3logsolocomments" data-uvstatcmt="' + article.oId + '">' + article.articleCommentCount
+ '</a></span>&nbsp;<span class="ico-view ico" title="' + Label.viewLabel + '">' + '</a></span>&nbsp;<span class="ico-view ico" title="' + Label.viewLabel + '">'
+ '<a rel="nofollow" href="${servePath}${article.articlePermalink}">' + '<a rel="nofollow" href="${servePath}${article.articlePermalink}">'
+ '<span data-uvstaturl="' + Label.servePath + article.articlePermalink + '">' + article.articleViewCount + '</span>' + '<span data-uvstaturl="' + Label.servePath + article.articlePermalink + '">' + article.articleViewCount + '</span>'
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</div> </div>
<#if commentable> <#if commentable>
<div class="article-comment"> <div class="article-comment">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments">
${commentLabel}(<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>) ${commentLabel}(<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>)
</a> </a>
</div> </div>
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </div>
<div class="right"> <div class="right">
<#if commentable> <#if commentable>
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments" class="left"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#b3logsolocomments" class="left">
&nbsp;<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}&nbsp;&nbsp; &nbsp;<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> ${commentLabel}&nbsp;&nbsp;
</a> </a>
</#if> </#if>
...@@ -103,9 +103,10 @@ ...@@ -103,9 +103,10 @@
</div> </div>
<div class="line right"></div> <div class="line right"></div>
<#if commentable> <#if commentable>
<div id="vcomment" <div id="b3logsolocomments"></div>
style="margin: 88px 100px 0 99px;background-color: #effdff;border-radius: 10px;padding: 10px;" <div id="vcomment"
data-name="${article.authorName}" data-postId="${article.oId}"></div> style="margin: 88px 100px 0 99px;background-color: #effdff;border-radius: 10px;padding: 10px;"
data-name="${article.authorName}" data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
<div id="soloComments" style="display: none;"> <div id="soloComments" style="display: none;">
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</div> </div>
<span>&nbsp;&nbsp;&nbsp;</span> <span>&nbsp;&nbsp;&nbsp;</span>
<#if commentable> <#if commentable>
<a href="${servePath}${article.articlePermalink}#comments" <a href="${servePath}${article.articlePermalink}#b3logsolocomments"
class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center" class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center"
aria-label="${commentLabel}"> aria-label="${commentLabel}">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</div> </div>
<span>&nbsp;&nbsp;&nbsp;</span> <span>&nbsp;&nbsp;&nbsp;</span>
<#if commentable> <#if commentable>
<a href="${servePath}${article.articlePermalink}#comments" <a href="${servePath}${article.articlePermalink}#b3logsolocomments"
class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center" class="vditor-tooltipped__n vditor-tooltipped link fn__flex-center"
aria-label="${commentLabel}"> aria-label="${commentLabel}">
<span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span> <span data-uvstatcmt="${article.oId}">${article.articleCommentCount}</span>
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
<br> <br>
</article> </article>
<#if commentable> <#if commentable>
<div id="b3logsolocomments"></div>
<div id="vcomment" style="padding: 30px 60px 30px 50px;" data-name="${article.authorName}" <div id="vcomment" style="padding: 30px 60px 30px 50px;" data-name="${article.authorName}"
data-postId="${article.oId}"></div> data-postId="${article.oId}"></div>
<#if !staticSite> <#if !staticSite>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment