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

timeline/common-comment.ftl

@@ -0,0 +1,25 @@
+<li id="${comment.oId}">
+    <img title="${comment.commentName}"
+         alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
+    <div>
+            <span class="author">
+                <#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}', 20);"
+                   onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a>
+                </#if>
+            </span>
+        <small><b> ${comment.commentDate2?string("yy-MM-dd HH:mm")}</b></small>
+    <#if article.commentable>
+        <span class="ico-reply ico right">
+                <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
+            </span>
+    </#if>
+        <div class="article-body">${comment.commentContent}</div>
+    </div>
+</li>

timeline/css/timeline.css

@@ -113,7 +113,8 @@ img {
 .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, 
 .em10, .em11, .em12, .em13, .em14 {
     cursor: pointer;
-    background-image: url("../../ease/images/emotions/emotions-ease.png");
+    background-image: url("../../../images/emotions/emotions.png");
+    background-size: 120px;
     float: left;
     height: 24px;
     margin-right: 5px;

timeline/lang/lang_en_US.properties

@@ -43,21 +43,6 @@ pageLabel=Page
 adminLabel=Admin
 logoutLabel=Logout
 loginLabel=Login
-em00Label=Smile
-em01Label=Laughter
-em02Label=Happy
-em03Label=Sad
-em04Label=Cry
-em05Label=No Comments
-em06Label=Fidget
-em07Label=Angry
-em08Label=Look Around
-em09Label=Surprise
-em10Label=Cool
-em11Label=Cheeky
-em12Label=Heart
-em13Label=Heart Broken
-em14Label=Devil
 commentLabel=Comment
 noCommentLabel=No Comment
 viewLabel=View

timeline/lang/lang_zh_CN.properties

@@ -19,75 +19,60 @@
 # Version: 1.0.0.6, Jul 31, 2016
 # Author: Liyuan Li
 #
-searchLabel=\u641c\u7d22
-dynamicLabel=\u52a8\u6001
-moreLabel=\u66f4\u591a
+searchLabel=\u641C\u7D22
+dynamicLabel=\u52A8\u6001
+moreLabel=\u66F4\u591A
 contentLabel=\u5168\u6587
 abstractLabel=\u6458\u8981
-viewCount1Label=\u6d4f\u89c8\u6b21\u6570\uff1a
-articleCount1Label=\u6587\u7ae0\u603b\u6570\uff1a
-commentCount1Label=\u8bc4\u8bba\u603b\u6570\uff1a
-allTagsLabel=\u6807\u7b7e\u5899
-updatedLabel=\u6709\u66f4\u65b0\uff01
-topArticleLabel=\u7f6e\u9876\uff01
-archiveLabel=\u5b58\u6863
-yearLabel=\u5e74
+viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A
+articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A
+commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A
+allTagsLabel=\u6807\u7B7E\u5899
+updatedLabel=\u6709\u66F4\u65B0\uFF01
+topArticleLabel=\u7F6E\u9876\uFF01
+archiveLabel=\u5B58\u6863
+yearLabel=\u5E74
 monthLabel=\u6708
-recentArticlesLabel=\u6700\u65b0\u6587\u7ae0
-recentCommentsLabel=\u6700\u65b0\u8bc4\u8bba
-mostCommentArticlesLabel=\u8bc4\u8bba\u6700\u591a\u7684\u6587\u7ae0
-mostViewCountArticlesLabel=\u8bbf\u95ee\u6700\u591a\u7684\u6587\u7ae0
-popTagsLabel=\u5206\u7c7b\u6807\u7b7e
-linkLabel=\u53cb\u60c5\u94fe\u63a5
+recentArticlesLabel=\u6700\u65B0\u6587\u7AE0
+recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA
+mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0
+mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0
+popTagsLabel=\u5206\u7C7B\u6807\u7B7E
+linkLabel=\u53CB\u60C5\u94FE\u63A5
 indexLabel=\u9996\u9875
 sumLabel=\u5171
 pageLabel=\u9875
-adminLabel=\u7ba1\u7406
-logoutLabel=\u767b\u51fa
-loginLabel=\u767b\u5f55
-em00Label=\u5fae\u7b11
-em01Label=\u5927\u7b11
-em02Label=\u9ad8\u5174
-em03Label=\u60b2\u4f24
-em04Label=\u54ed\u6ce3
-em05Label=\u65e0\u8bed
-em06Label=\u70e6\u8e81
-em07Label=\u751f\u6c14
-em08Label=\u6211\u7785
-em09Label=\u60ca\u8bb6
-em10Label=\u9177
-em11Label=\u987d\u76ae
-em12Label=\u7231\u5fc3
-em13Label=\u5fc3\u788e
-em14Label=\u9b54\u9b3c
-commentLabel=\u8bc4\u8bba
-noCommentLabel=\u65e0\u8bc4\u8bba
-viewLabel=\u6d4f\u89c8
-authorLabel=\u4f5c\u8005
-previousPageLabel=\u4e0a\u4e00\u9875
-nextPagePabel=\u4e0b\u4e00\u9875
-firstPageLabel=\u7b2c\u4e00\u9875
-lastPageLabel=\u6700\u540e\u4e00\u9875
-archive1Label=\u5b58\u6863\uff1a
-author1Label=\u4f5c\u8005\uff1a
-tagLabel=\u6807\u7b7e
-sorryLabel=\u5bf9\u4e0d\u8d77\uff01
-notFoundLabel=\u627e\u4e0d\u5230\uff01
-returnTo1Label=\u8fd4\u56de\uff1a
-replyLabel=\u56de\u590d
-commentNameLabel=\u59d3\u540d
-commentEmailLabel=\u90ae\u7bb1
+adminLabel=\u7BA1\u7406
+logoutLabel=\u767B\u51FA
+loginLabel=\u767B\u5F55
+commentLabel=\u8BC4\u8BBA
+noCommentLabel=\u65E0\u8BC4\u8BBA
+viewLabel=\u6D4F\u89C8
+authorLabel=\u4F5C\u8005
+previousPageLabel=\u4E0A\u4E00\u9875
+nextPagePabel=\u4E0B\u4E00\u9875
+firstPageLabel=\u7B2C\u4E00\u9875
+lastPageLabel=\u6700\u540E\u4E00\u9875
+archive1Label=\u5B58\u6863\uFF1A
+author1Label=\u4F5C\u8005\uFF1A
+tagLabel=\u6807\u7B7E
+sorryLabel=\u5BF9\u4E0D\u8D77\uFF01
+notFoundLabel=\u627E\u4E0D\u5230\uFF01
+returnTo1Label=\u8FD4\u56DE\uFF1A
+replyLabel=\u56DE\u590D
+commentNameLabel=\u59D3\u540D
+commentEmailLabel=\u90AE\u7BB1
 commentURLLabel=URL
-submmitCommentLabel=\u63d0\u4ea4\u8bc4\u8bba
-nameTooLongLabel=\u59d3\u540d\u53ea\u80fd\u4e3a 2 \u5230 20 \u4e2a\u5b57\u7b26\uff01
-mailCannotEmptyLabel=\u90ae\u7bb1\u4e0d\u80fd\u4e3a\u7a7a\uff01
-mailInvalidLabel=\u90ae\u7bb1\u683c\u5f0f\u4e0d\u6b63\u786e\uff01
-commentContentCannotEmptyLabel=\u8bc4\u8bba\u5185\u5bb9\u53ea\u80fd\u4e3a 2 \u5230 500 \u4e2a\u5b57\u7b26\uff01
-captchaCannotEmptyLabel=\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
-loadingLabel=\u8f7d\u5165\u4e2d....
-relevantArticlesLabel=\u76f8\u5173\u9605\u8bfb
-randomArticlesLabel=\u968f\u673a\u9605\u8bfb
-externalRelevantArticlesLabel=\u7ad9\u5916\u76f8\u5173\u9605\u8bfb
-captchaErrorLabel=\u9a8c\u8bc1\u7801\u9519\u8bef
+submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA
+nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01
+mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+mailInvalidLabel=\u90AE\u7BB1\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01
+commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01
+captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+loadingLabel=\u8F7D\u5165\u4E2D....
+relevantArticlesLabel=\u76F8\u5173\u9605\u8BFB
+randomArticlesLabel=\u968F\u673A\u9605\u8BFB
+externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB
+captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF
 b3logLabel=<span style="color: orange;">B</span><span style="color: blue;"><sup>3</sup></span><span style="color: green;">L</span><span style="color: red;">O</span><span style="color: blue;">G</span>
-killBrowserLabel=<h2>\u8ba9\u6211\u4eec\u653e\u5f03\u4f7f\u7528\u90a3\u4e9b\u8fc7\u65f6\u3001\u4e0d\u5b89\u5168\u7684\u6d4f\u89c8\u5668\u5427\uff01</h2><p>\u4e3a\u4e86\u8ba9\u6d4f\u89c8\u5668\u66f4\u597d\u7684\u53d1\u5c55\uff0c\u4eba\u7c7b\u66f4\u52a0\u7684\u8fdb\u6b65\uff0c\u62e5\u6709\u66f4\u597d\u7684\u4f53\u9a8c\uff0c\u8ba9\u6211\u4eec\u653e\u5f03\u4f7f\u7528\u90a3\u4e9b\u8fc7\u65f6\u3001\u4e0d\u5b89\u5168\u7684\u6d4f\u89c8\u5668\u3002</p>\u60a8\u53ef\u4ee5\u4e0b\u8f7d<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706b\u72d0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8c37\u6b4c\u6d4f\u89c8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6e38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5b83\u6d4f\u89c8\u5668</a>.</li></ul>
+killBrowserLabel=<h2>\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01</h2><p>\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002</p>\u60A8\u53EF\u4EE5\u4E0B\u8F7D<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706B\u72D0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8C37\u6B4C\u6D4F\u89C8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6E38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5B83\u6D4F\u89C8\u5668</a>.</li></ul>

timeline/macro-comments.ftl

@@ -1,31 +1,7 @@
 <#macro comments commentList article>
 <ul id="comments" class="comments list">
     <#list commentList as comment>
-    <li id="${comment.oId}">
-        <img title="${comment.commentName}"
-             alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
-        <div>
-            <span class="author">
-                <#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}', 20);"
-                   onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a>
-                </#if>
-            </span>
-            <small><b> ${comment.commentDate?string("yy-MM-dd HH:mm")}</b></small>
-            <#if article.commentable>
-            <span class="ico-reply ico right">
-                <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
-            </span>
-            </#if>
-            <div class="article-body">${comment.commentContent}</div>
-        </div>
-    </li>
+    <#include "common-comment.ftl"/>
     </#list>
 </ul>
 <#if article.commentable>
@@ -116,27 +92,6 @@
                            "externalRelevantArticles1Label": "${externalRelevantArticlesLabel}"
                        });
 
-                       var addComment = function(result, state) {
-                           var commentHTML = '<li id="' + result.oId + '"><img \
-                                    alt="' + result.userName +
-                                   '" src="' + result.commentThumbnailURL + '"/><div><span class="author">' + result.replyNameHTML;
-
-                           if (state !== "") {
-                               var commentOriginalCommentName = $("#" + page.currentCommentId + " .author > a").first().text();
-                               commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
-                                       + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 20);"'
-                                       + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
-                           }
-
-                           commentHTML += '</span>&nbsp;<small><b>' + result.commentDate.substring(2, 16)
-                                   + '</b></small><span class="ico-reply ico right"><a rel="nofollow" href="javascript:replyTo(\'' + result.oId
-                                   + '\');">${replyLabel}</a></span><div class="article-body">'
-                                   + Util.replaceEmString($("#comment" + state).val())
-                                   + '</div></div></li>';
-
-                           return commentHTML;
-                       }
-
                        var replyTo = function(id) {
                            var commentFormHTML = "<table class='comment-form' id='replyForm'>";
                            page.addReplyForm(id, commentFormHTML);