https://github.com/b3log/solo/issues/12286

classic/macro-comments.ftl

@@ -5,41 +5,7 @@
     ${noCommentLabel}
     </#if>
     <#list commentList as comment>
-    <div id="${comment.oId}">
-        <div class="comment-panel">
-            <div class="comment-title">
-                <#if "http://" == comment.commentURL>
-                <a>${comment.commentName}</a>
-                <#else>
-                <a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
-                </#if>
-                <#if comment.isReply>
-                @
-                <a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}"
-                   onmouseover="page.showComment(this, '${comment.commentOriginalCommentId}', 23);"
-                   onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a>
-                </#if>
-                <div class="right">
-                    ${comment.commentDate?string("yyyy-MM-dd HH:mm:ss")}
-
-                    <#if article.commentable>
-                    <a class="no-underline"
-                       href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
-                    </#if>
-                </div>
-                <div class="clear"></div>
-            </div>
-            <div class="comment-body">
-                <div class="left comment-picture">
-                    <img alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
-                </div>
-                <div class="comment-content content-reset">
-                    ${comment.commentContent}
-                </div>
-                <div class="clear"></div>
-            </div>
-        </div>
-    </div>
+    <#include "common-comment.ftl"/>
     </#list>
 </div>
 <#if article.commentable>
@@ -145,29 +111,6 @@
         "externalRelevantArticles1Label": "${externalRelevantArticles1Label}"
     });
 
-    var addComment = function (result, state) {
-        var commentHTML = '<div id="' + result.oId + 
-            '"><div class="comment-panel"><div class="comment-title">' + result.replyNameHTML;
-
-        if (state !== "") {
-            var commentOriginalCommentName = $("#" + page.currentCommentId).find(".comment-title a").first().text();
-            commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
-                + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 23);"'
-                + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
-        }
-
-        commentHTML += '<div class="right">' + result.commentDate
-            + '&nbsp;<a class="no-underline" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>'
-            + '</div><div class="clear"></div></div><div class="comment-body">'
-            + '<div class="left comment-picture"><img alt="' + result.userName
-            + '" src="' + result.commentThumbnailURL + '"/>'
-            + '</div><div class="comment-content content-reset">' +
-            Util.replaceEmString($("#comment" + state).val())
-            + '</div><div class="clear"></div>'
-            + '</div></div></div>';
-        return commentHTML;
-    }
-
     var replyTo = function (id) {
         var commentFormHTML = "<table class='form comment-reply' id='replyForm'>";
         page.addReplyForm(id, commentFormHTML);