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

9IPHP/css/base.css

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

andrea/common-comment.ftl

@@ -0,0 +1,31 @@
+<div id="${comment.oId}"
+     class="comment-body">
+    <div class="comment-panel">
+        <div class="left comment-author">
+            <img alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
+        </div>
+        <div class="left comment-info">
+        <#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>
+            &nbsp;${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
+            <div class="comment-content">
+            ${comment.commentContent}
+            </div>
+        <#if article.commentable>
+            <div>
+                <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
+            </div>
+        </#if>
+        </div>
+        <div class="clear"></div>
+    </div>
+</div>

andrea/css/andrea.css

@@ -502,7 +502,8 @@ a:hover {
 }
 
 .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 {
-    background-image: url("../../andrea/images/emotions/emotions-black.png");
+    background-image: url("../../../images/emotions/emotions.png");
+    background-size: 120px;
     margin-right: 4px;
 }
 
@@ -524,6 +525,10 @@ h2.comment-label {
     padding: 20px 0;
 }
 
+.comment-body:nth-child(2n) {
+    background-color: #F1EEE9;
+}
+
 .comment-author {
     width: 100px;
 }
@@ -544,10 +549,6 @@ h2.comment-label {
     margin: 10px 0;
 }
 
-.comment-odd {
-    background-color: #F1EEE9;
-}
-
 .comment-author img {
     width: 64px;
     height: 64px;

andrea/lang/lang_en_US.properties

@@ -55,21 +55,6 @@ recentCommentsLabel=Recent Comments
 postCommentsLabel=Post Comment
 mostCommentArticlesLabel=Most Comment Articles
 mostViewCountArticlesLabel=Most View Articles
-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
 linkLabel=Friend Links
 sumLabel=
 pageLabel=Page
@@ -203,9 +188,9 @@ permalinkLabel=Permalink
 welcomeToSoloLabel=Welcome to B3log Solo!
 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>Let's kill outdated and insecure browser!</h2><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</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">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul>
-readmoreLabel=Read more\u00bb
+readmoreLabel=Read more\u00BB
 readmore2Label=Read more
-replyLabel=Reply\u00bb
+replyLabel=Reply\u00BB
 homeLabel=Home
 enableArticleUpdateHint1Label=Enable Article Update Hint:
 allowVisitDraftViaPermalink1Label=Allow Visit Draft Via Link:
@@ -278,8 +263,8 @@ duplicatedEmailLabel=Duplicated email!
 canntBeLocalhostOnProductionLabel=Can not set host as localhost on production!
 refreshAndRetryLabel=Please refresh and try again!
 noDataLable=NO Data
-editorLeaveLabel=Content is not null, Do you leave\uff1f
+editorLeaveLabel=Content is not null, Do you leave\uFF1F
-editorPostLabel=Content is not null, Do you clear\uff1f
+editorPostLabel=Content is not null, Do you clear\uFF1F
 ####
 confirmRemoveLabel=Are You Sure?
 confirmInitLabel=Are You Sure?

andrea/lang/lang_zh_CN.properties

@@ -20,266 +20,251 @@
 # Author: Liang Ding
 #
 
-adminConsoleLabel=\u540e\u53f0\u7ba1\u7406
+adminConsoleLabel=\u540E\u53F0\u7BA1\u7406
-adminIndexLabel=\u540e\u53f0\u9996\u9875
+adminIndexLabel=\u540E\u53F0\u9996\u9875
-postArticleLabel=\u53d1\u5e03\u6587\u7ae0
+postArticleLabel=\u53D1\u5E03\u6587\u7AE0
-articleListLabel=\u6587\u7ae0\u7ba1\u7406
+articleListLabel=\u6587\u7AE0\u7BA1\u7406
-commentListLabel=\u8bc4\u8bba\u7ba1\u7406
+commentListLabel=\u8BC4\u8BBA\u7BA1\u7406
-draftListLabel=\u8349\u7a3f\u5939
+draftListLabel=\u8349\u7A3F\u5939
-userManageLabel=\u7528\u6237\u7ba1\u7406
+userManageLabel=\u7528\u6237\u7BA1\u7406
-commonUserLabel=\u4e00\u822c\u7528\u6237
+commonUserLabel=\u4E00\u822C\u7528\u6237
-addUserLabel=\u6dfb\u52a0\u7528\u6237
+addUserLabel=\u6DFB\u52A0\u7528\u6237
-updateUserLabel=\u66f4\u65b0\u7528\u6237
+updateUserLabel=\u66F4\u65B0\u7528\u6237
-linkManagementLabel=\u94fe\u63a5\u7ba1\u7406
+linkManagementLabel=\u94FE\u63A5\u7BA1\u7406
-pluginMgmtLabel=\u63d2\u4ef6\u7ba1\u7406
+pluginMgmtLabel=\u63D2\u4EF6\u7BA1\u7406
-pluginNameLabel=\u63d2\u4ef6\u540d
+pluginNameLabel=\u63D2\u4EF6\u540D
-versionLabel=\u7248\u672c
+versionLabel=\u7248\u672C
-statusLabel=\u72b6\u6001
+statusLabel=\u72B6\u6001
-enabledLabel=\u5df2\u542f\u7528
+enabledLabel=\u5DF2\u542F\u7528
-disabledLabel=\u5df2\u7981\u7528
+disabledLabel=\u5DF2\u7981\u7528
-enableLabel=\u542f\u7528
+enableLabel=\u542F\u7528
 disableLabel=\u7981\u7528
-preferenceLabel=\u504f\u597d\u8bbe\u5b9a
+preferenceLabel=\u504F\u597D\u8BBE\u5B9A
-localeString1Label=\u8bed\u8a00\uff1a
+localeString1Label=\u8BED\u8A00\uFF1A
-timeZoneId1Label=\u65f6\u533a\uff1a
+timeZoneId1Label=\u65F6\u533A\uFF1A
-adminLabel=\u7ba1\u7406
+adminLabel=\u7BA1\u7406
-administratorLabel=\u7ba1\u7406\u5458
+administratorLabel=\u7BA1\u7406\u5458
-loginLabel=\u767b\u5f55
+loginLabel=\u767B\u5F55
-logoutLabel=\u767b\u51fa
+logoutLabel=\u767B\u51FA
-initLabel=\u521d\u59cb\u5316
+initLabel=\u521D\u59CB\u5316
-popTagsLabel=\u5206\u7c7b\u6807\u7b7e
+popTagsLabel=\u5206\u7C7B\u6807\u7B7E
-tag1Label=\u6807\u7b7e\uff1a
+tag1Label=\u6807\u7B7E\uFF1A
-tags1Label=\u6807\u7b7e\uff1a
+tags1Label=\u6807\u7B7E\uFF1A
-recentArticlesLabel=\u6700\u65b0\u6587\u7ae0
+recentArticlesLabel=\u6700\u65B0\u6587\u7AE0
-recentCommentsLabel=\u6700\u65b0\u8bc4\u8bba
+recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA
-postCommentsLabel=\u53d1\u8868\u8bc4\u8bba
+postCommentsLabel=\u53D1\u8868\u8BC4\u8BBA
-mostCommentArticlesLabel=\u8bc4\u8bba\u6700\u591a\u7684\u6587\u7ae0
+mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0
-mostViewCountArticlesLabel=\u8bbf\u95ee\u6700\u591a\u7684\u6587\u7ae0
+mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0
-em00Label=\u5fae\u7b11
+linkLabel=\u53CB\u60C5\u94FE\u63A5
-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
-linkLabel=\u53cb\u60c5\u94fe\u63a5
 sumLabel=\u5171
 pageLabel=\u9875
-commentLabel=\u8bc4\u8bba
+commentLabel=\u8BC4\u8BBA
-linkTitleLabel=\u94fe\u63a5\u6807\u9898
+linkTitleLabel=\u94FE\u63A5\u6807\u9898
-linkTitle1Label=\u6807\u9898\uff1a
+linkTitle1Label=\u6807\u9898\uFF1A
-updateLabel=\u66f4\u65b0
+updateLabel=\u66F4\u65B0
 removeLabel=\u5220\u9664
-putTopLabel=\u7f6e\u9876
+putTopLabel=\u7F6E\u9876
-cancelPutTopLabel=\u53d6\u6d88\u7f6e\u9876
+cancelPutTopLabel=\u53D6\u6D88\u7F6E\u9876
-downloadCountLabel=\u4e0b\u8f7d\u6b21\u6570
+downloadCountLabel=\u4E0B\u8F7D\u6B21\u6570
-sizeLabel=\u5927\u5c0f
+sizeLabel=\u5927\u5C0F
-uploadDateLabel=\u4e0a\u4f20\u65e5\u671f
+uploadDateLabel=\u4E0A\u4F20\u65E5\u671F
-downloadURLLabel=\u4e0b\u8f7d\u5730\u5740
+downloadURLLabel=\u4E0B\u8F7D\u5730\u5740
-downloadLabel=\u4e0b\u8f7d
+downloadLabel=\u4E0B\u8F7D
-createDateLabel=\u521b\u5efa\u65e5\u671f
+createDateLabel=\u521B\u5EFA\u65E5\u671F
-updateDateLabel=\u66f4\u65b0\u65e5\u671f
+updateDateLabel=\u66F4\u65B0\u65E5\u671F
 titleLabel=\u6807\u9898
-title1Label=\u6807\u9898\uff1a
+title1Label=\u6807\u9898\uFF1A
-content1Label=\u6b63\u6587\uff1a
+content1Label=\u6B63\u6587\uFF1A
-abstract1Label=\u6458\u8981\uff1a
+abstract1Label=\u6458\u8981\uFF1A
-publishLabel=\u53d1\u5e03
+publishLabel=\u53D1\u5E03
-unPublishLabel=\u53d6\u6d88\u53d1\u5e03
+unPublishLabel=\u53D6\u6D88\u53D1\u5E03
 urlLabel=URL
-url1Label=URL (\u8bf7\u4ee5\u534f\u8bae\u5f00\u5934\uff0c\u5982: http://)\uff1a 
+url1Label=URL (\u8BF7\u4EE5\u534F\u8BAE\u5F00\u5934\uFF0C\u5982: http://)\uFF1A 
-addLinkLabel=\u6dfb\u52a0\u94fe\u63a5
+addLinkLabel=\u6DFB\u52A0\u94FE\u63A5
-updateLinkLabel=\u66f4\u65b0\u94fe\u63a5
+updateLinkLabel=\u66F4\u65B0\u94FE\u63A5
-archiveLabel=\u5b58\u6863
+archiveLabel=\u5B58\u6863
-archive1Label=\u5b58\u6863\uff1a
+archive1Label=\u5B58\u6863\uFF1A
-yearLabel=\u5e74
+yearLabel=\u5E74
 monthLabel=\u6708
-blogSyncLabel=\u535a\u5ba2\u540c\u6b65
+blogSyncLabel=\u535A\u5BA2\u540C\u6B65
 pageLabel=\u9875\u9762
-pageMgmtLabel=\u9875\u9762\u7ba1\u7406
+pageMgmtLabel=\u9875\u9762\u7BA1\u7406
-othersLabel=\u5176\u4ed6
+othersLabel=\u5176\u4ED6
-fileListLabel=\u6587\u4ef6\u7ba1\u7406
+fileListLabel=\u6587\u4EF6\u7BA1\u7406
-submitUploadLabel=\u4e0a\u4f20
+submitUploadLabel=\u4E0A\u4F20
-fileNameLabel=\u6587\u4ef6\u540d
+fileNameLabel=\u6587\u4EF6\u540D
-paramSettingsLabel=\u53c2\u6570\u8bbe\u7f6e
+paramSettingsLabel=\u53C2\u6570\u8BBE\u7F6E
-skinLabel=\u76ae\u80a4
+skinLabel=\u76AE\u80A4
-signLabel=\u7b7e\u540d\u6863
+signLabel=\u7B7E\u540D\u6863
-sign1Label=\u7b7e\u540d\u6863\uff1a
+sign1Label=\u7B7E\u540D\u6863\uFF1A
-noSignLabel=\u4e0d\u4f7f\u7528\u7b7e\u540d\u6863
+noSignLabel=\u4E0D\u4F7F\u7528\u7B7E\u540D\u6863
-signIsNullLabel=\u8be5\u7b7e\u540d\u6863\u4e3a\u7a7a
+signIsNullLabel=\u8BE5\u7B7E\u540D\u6863\u4E3A\u7A7A
-statisticLabel=\u535a\u5ba2\u7edf\u8ba1
+statisticLabel=\u535A\u5BA2\u7EDF\u8BA1
-viewLabel=\u6d4f\u89c8
+viewLabel=\u6D4F\u89C8
-countLabel=\u7bc7
+countLabel=\u7BC7
-viewCount1Label=\u6d4f\u89c8\u6b21\u6570\uff1a
+viewCount1Label=\u6D4F\u89C8\u6B21\u6570\uFF1A
-articleCount1Label=\u6587\u7ae0\u603b\u6570\uff1a
+articleCount1Label=\u6587\u7AE0\u603B\u6570\uFF1A
-commentCountLabel=\u8bc4\u8bba\u6570
+commentCountLabel=\u8BC4\u8BBA\u6570
-commentCount1Label=\u8bc4\u8bba\u603b\u6570\uff1a
+commentCount1Label=\u8BC4\u8BBA\u603B\u6570\uFF1A
-commentEmotions1Label=\u8868\u60c5\uff1a
+commentEmotions1Label=\u8868\u60C5\uFF1A
-commentEmotionsLabel=\u8868\u60c5
+commentEmotionsLabel=\u8868\u60C5
-commentName1Label=\u59d3\u540d\uff1a
+commentName1Label=\u59D3\u540D\uFF1A
-commentNameLabel=\u59d3\u540d
+commentNameLabel=\u59D3\u540D
-commentEmail1Label=\u90ae\u7bb1\uff1a
+commentEmail1Label=\u90AE\u7BB1\uFF1A
-commentEmailLabel=\u90ae\u7bb1
+commentEmailLabel=\u90AE\u7BB1
-commentURL1Label=URL\uff1a
+commentURL1Label=URL\uFF1A
 commentURLLabel=URL
-commentContent1Label=\u8bc4\u8bba\u5185\u5bb9\uff1a
+commentContent1Label=\u8BC4\u8BBA\u5185\u5BB9\uFF1A
-commentContentLabel=\u8bc4\u8bba\u5185\u5bb9
+commentContentLabel=\u8BC4\u8BBA\u5185\u5BB9
-getDateLabel=\u83b7\u53d6\u65e5\u671f
+getDateLabel=\u83B7\u53D6\u65E5\u671F
-getArticleLabel=\u83b7\u53d6\u6587\u7ae0
+getArticleLabel=\u83B7\u53D6\u6587\u7AE0
-selectDateLabel=\u9009\u62e9\u65e5\u671f
+selectDateLabel=\u9009\u62E9\u65E5\u671F
-selectDate1Label=\u9009\u62e9\u65e5\u671f\uff1a
+selectDate1Label=\u9009\u62E9\u65E5\u671F\uFF1A
-importLabel=\u5bfc\u5165
+importLabel=\u5BFC\u5165
-chooseBlog1Label=\u8bf7\u9009\u62e9\u9700\u8981\u7ba1\u7406\u7684\u535a\u5ba2\uff1a
+chooseBlog1Label=\u8BF7\u9009\u62E9\u9700\u8981\u7BA1\u7406\u7684\u535A\u5BA2\uFF1A
-blogArticleImportLabel=\u6587\u7ae0\u5bfc\u5165
+blogArticleImportLabel=\u6587\u7AE0\u5BFC\u5165
-blogSyncMgmtLabel=\u535a\u5ba2\u540c\u6b65\u7ba1\u7406
+blogSyncMgmtLabel=\u535A\u5BA2\u540C\u6B65\u7BA1\u7406
-syncMgmtLabel=\u540c\u6b65\u7ba1\u7406\u535a\u5ba2
+syncMgmtLabel=\u540C\u6B65\u7BA1\u7406\u535A\u5BA2
-userName1Label=\u7528\u6237\u540d\uff1a
+userName1Label=\u7528\u6237\u540D\uFF1A
-userPassword1Label=\u5bc6\u7801\uff1a
+userPassword1Label=\u5BC6\u7801\uFF1A
-syncPostLabel=\u540c\u6b65\u53d1\u5e03
+syncPostLabel=\u540C\u6B65\u53D1\u5E03
-syncUpdateLabel=\u540c\u6b65\u66f4\u65b0
+syncUpdateLabel=\u540C\u6B65\u66F4\u65B0
-syncRemoveLabel=\u540c\u6b65\u5220\u9664
+syncRemoveLabel=\u540C\u6B65\u5220\u9664
-categoryLabel=\u5206\u7c7b
+categoryLabel=\u5206\u7C7B
-noticeBoard1Label=\u516c\u544a\uff1a
+noticeBoard1Label=\u516C\u544A\uFF1A
-noticeBoardLabel=\u516c\u544a
+noticeBoardLabel=\u516C\u544A
-htmlhead1Label=HTML head\uff1a
+htmlhead1Label=HTML head\uFF1A
-indexTagDisplayCnt1Label= \u9996\u9875\u6807\u7b7e\u663e\u793a\u6570\uff1a
+indexTagDisplayCnt1Label= \u9996\u9875\u6807\u7B7E\u663E\u793A\u6570\uFF1A
-indexRecentArticleDisplayCnt1Label=\u6700\u65b0\u6587\u7ae0\u663e\u793a\u6570\u76ee\uff1a
+indexRecentArticleDisplayCnt1Label=\u6700\u65B0\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A
-indexRecentCommentDisplayCnt1Label=\u6700\u65b0\u8bc4\u8bba\u663e\u793a\u6570\u76ee\uff1a
+indexRecentCommentDisplayCnt1Label=\u6700\u65B0\u8BC4\u8BBA\u663E\u793A\u6570\u76EE\uFF1A
-indexMostCommentArticleDisplayCnt1Label=\u8bc4\u8bba\u6700\u591a\u6587\u7ae0\u663e\u793a\u6570\u76ee\uff1a
+indexMostCommentArticleDisplayCnt1Label=\u8BC4\u8BBA\u6700\u591A\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A
-indexMostViewArticleDisplayCnt1Label=\u8bbf\u95ee\u6700\u591a\u6700\u591a\u6587\u7ae0\u663e\u793a\u6570\u76ee\uff1a
+indexMostViewArticleDisplayCnt1Label=\u8BBF\u95EE\u6700\u591A\u6700\u591A\u6587\u7AE0\u663E\u793A\u6570\u76EE\uFF1A
-relevantArticlesDisplayCnt1Label=\u76f8\u5173\u9605\u8bfb\u663e\u793a\u6570\u76ee\uff1a
+relevantArticlesDisplayCnt1Label=\u76F8\u5173\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A
-randomArticlesDisplayCnt1Label=\u968f\u673a\u9605\u8bfb\u663e\u793a\u6570\u76ee\uff1a
+randomArticlesDisplayCnt1Label=\u968F\u673A\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A
-externalRelevantArticlesDisplayCnt1Label=\u7ad9\u5916\u76f8\u5173\u9605\u8bfb\u663e\u793a\u6570\u76ee\uff1a
+externalRelevantArticlesDisplayCnt1Label=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB\u663E\u793A\u6570\u76EE\uFF1A
-windowSize1Label=\u5206\u9875\u9875\u7801\u6700\u5927\u5bbd\u5ea6\uff1a
+windowSize1Label=\u5206\u9875\u9875\u7801\u6700\u5927\u5BBD\u5EA6\uFF1A
-pageSize1Label=\u5206\u9875\u6bcf\u9875\u663e\u793a\u6587\u7ae0\u6570\uff1a
+pageSize1Label=\u5206\u9875\u6BCF\u9875\u663E\u793A\u6587\u7AE0\u6570\uFF1A
-blogTitle1Label=\u535a\u5ba2\u6807\u9898\uff1a
+blogTitle1Label=\u535A\u5BA2\u6807\u9898\uFF1A
-blogSubtitle1Label=\u535a\u5ba2\u5b50\u6807\u9898\uff1a
+blogSubtitle1Label=\u535A\u5BA2\u5B50\u6807\u9898\uFF1A
-blogHost1Label=\u535a\u5ba2\u5730\u5740\uff1a
+blogHost1Label=\u535A\u5BA2\u5730\u5740\uFF1A
-submmitCommentLabel=\u63d0\u4ea4\u8bc4\u8bba
+submmitCommentLabel=\u63D0\u4EA4\u8BC4\u8BBA
-saveLabel=\u4fdd\u5b58
+saveLabel=\u4FDD\u5B58
-tagLabel=\u6807\u7b7e
+tagLabel=\u6807\u7B7E
-tagsLabel=\u6807\u7b7e
+tagsLabel=\u6807\u7B7E
-importedLabel=\u5df2\u5bfc\u5165
+importedLabel=\u5DF2\u5BFC\u5165
-captcha1Label=\u9a8c\u8bc1\u7801\uff1a
+captcha1Label=\u9A8C\u8BC1\u7801\uFF1A
-captchaLabel=\u9a8c\u8bc1\u7801
+captchaLabel=\u9A8C\u8BC1\u7801
 indexLabel=\u9996\u9875
-nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
+nextArticle1Label=\u65B0\u4E00\u7BC7\uFF1A
-previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
+previousArticle1Label=\u65E7\u4E00\u7BC7\uFF1A
-updatedLabel=\u6709\u66f4\u65b0\uff01
+updatedLabel=\u6709\u66F4\u65B0\uFF01
-topArticleLabel=\u7f6e\u9876\uff01
+topArticleLabel=\u7F6E\u9876\uFF01
-CSDNBlogLabel=CSDN \u535a\u5ba2
+CSDNBlogLabel=CSDN \u535A\u5BA2
 BlogJavaLabel=BlogJava
-CnBlogsLabel=\u535a\u5ba2\u56ed
+CnBlogsLabel=\u535A\u5BA2\u56ED
-previousPageLabel=\u4e0a\u4e00\u9875
+previousPageLabel=\u4E0A\u4E00\u9875
-nextPagePabel=\u4e0b\u4e00\u9875
+nextPagePabel=\u4E0B\u4E00\u9875
-firstPageLabel=\u7b2c\u4e00\u9875
+firstPageLabel=\u7B2C\u4E00\u9875
-lastPageLabel=\u6700\u540e\u4e00\u9875
+lastPageLabel=\u6700\u540E\u4E00\u9875
-returnTo1Label=\u8fd4\u56de\uff1a
+returnTo1Label=\u8FD4\u56DE\uFF1A
-tencentLabel=\u817e\u8baf
+tencentLabel=\u817E\u8BAF
 appKey1Label=App Key:
 appSecret1Label=App Secret:
-postToTencentMicroblogWhilePublishArticleLabel=\u53d1\u6587\u7ae0\u65f6\u540c\u6b65\u5230\u817e\u8baf\u5fae\u535a\uff1a
+postToTencentMicroblogWhilePublishArticleLabel=\u53D1\u6587\u7AE0\u65F6\u540C\u6B65\u5230\u817E\u8BAF\u5FAE\u535A\uFF1A
-postToCommunityLabel=\u53d1\u5e03\u5230\u793e\u533a\uff1a
+postToCommunityLabel=\u53D1\u5E03\u5230\u793E\u533A\uFF1A
-authorizeTencentMicroblog1Label=\u70b9\u51fb\u56fe\u6807\u8fdb\u884c\u6388\u6743:
+authorizeTencentMicroblog1Label=\u70B9\u51FB\u56FE\u6807\u8FDB\u884C\u6388\u6743:
 googleLabel=Google
-OAuthConsumerSecret1Label=OAuth Consumer Secret\uff1a
+OAuthConsumerSecret1Label=OAuth Consumer Secret\uFF1A
 atomLabel=Atom
-relevantArticles1Label=\u76f8\u5173\u9605\u8bfb\uff1a
+relevantArticles1Label=\u76F8\u5173\u9605\u8BFB\uFF1A
-randomArticles1Label=\u968f\u673a\u9605\u8bfb\uff1a
+randomArticles1Label=\u968F\u673A\u9605\u8BFB\uFF1A
-externalRelevantArticles1Label=\u7ad9\u5916\u76f8\u5173\u9605\u8bfb\uff1a
+externalRelevantArticles1Label=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB\uFF1A
 metaKeywords1Label=Meta Keywords:
 metaDescription1Label=Meta Description:
-removeUnusedTagsLabel=\u79fb\u9664\u672a\u4f7f\u7528\u6807\u7b7e
+removeUnusedTagsLabel=\u79FB\u9664\u672A\u4F7F\u7528\u6807\u7B7E
-goTopLabel=\u9876\u90e8
+goTopLabel=\u9876\u90E8
-permalink1Label=\u94fe\u63a5\uff1a
+permalink1Label=\u94FE\u63A5\uFF1A
-permalinkLabel=\u94fe\u63a5
+permalinkLabel=\u94FE\u63A5
-welcomeToSoloLabel=\u6b22\u8fce\u4f7f\u7528 B3log Solo\uff01
+welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 B3log Solo\uFF01
 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>
-readmoreLabel=\u9605\u8bfb\u66f4\u591a\u00bb
+readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB
-readmore2Label=\u9605\u8bfb\u66f4\u591a
+readmore2Label=\u9605\u8BFB\u66F4\u591A
-replyLabel=\u56de\u590d\u00bb
+replyLabel=\u56DE\u590D\u00BB
 homeLabel=\u9996\u9875
-enableArticleUpdateHint1Label=\u542f\u7528\u6587\u7ae0\u66f4\u65b0\u63d0\u793a\uff1a
+enableArticleUpdateHint1Label=\u542F\u7528\u6587\u7AE0\u66F4\u65B0\u63D0\u793A\uFF1A
-allowVisitDraftViaPermalink1Label=\u5141\u8bb8\u901a\u8fc7\u94fe\u63a5\u8bbf\u95ee\u8349\u7a3f\uff1a
+allowVisitDraftViaPermalink1Label=\u5141\u8BB8\u901A\u8FC7\u94FE\u63A5\u8BBF\u95EE\u8349\u7A3F\uFF1A
-author1Label=\u4f5c\u8005\uff1a
+author1Label=\u4F5C\u8005\uFF1A
-authorLabel=\u4f5c\u8005
+authorLabel=\u4F5C\u8005
-keyOfSolo1Label=Solo Key\uff1a
+keyOfSolo1Label=Solo Key\uFF1A
-articleLabel=\u6587\u7ae0
+articleLabel=\u6587\u7AE0
-tagArticlesLabel=\u6807\u7b7e\u6587\u7ae0\u5217\u8868
+tagArticlesLabel=\u6807\u7B7E\u6587\u7AE0\u5217\u8868
-dateArticlesLabel=\u5b58\u6863\u6587\u7ae0\u5217\u8868
+dateArticlesLabel=\u5B58\u6863\u6587\u7AE0\u5217\u8868
-authorArticlesLabel=\u4f5c\u8005\u6587\u7ae0\u5217\u8868
+authorArticlesLabel=\u4F5C\u8005\u6587\u7AE0\u5217\u8868
-indexArticleLabel=\u9996\u9875\u6587\u7ae0\u5217\u8868
+indexArticleLabel=\u9996\u9875\u6587\u7AE0\u5217\u8868
-allTagsLabel=\u6807\u7b7e\u5899
+allTagsLabel=\u6807\u7B7E\u5899
-customizedPageLabel=\u81ea\u5b9a\u4e49\u9875\u9762
+customizedPageLabel=\u81EA\u5B9A\u4E49\u9875\u9762
 killBrowserPageLabel=Kill Browser Page
-pageNumLabel=\u9875\u53f7
+pageNumLabel=\u9875\u53F7
 ####
-forbiddenLabel=\u64cd\u4f5c\u88ab\u7981\u6b62\uff01
+forbiddenLabel=\u64CD\u4F5C\u88AB\u7981\u6B62\uFF01
-sorryLabel=\u5bf9\u4e0d\u8d77\uff01
+sorryLabel=\u5BF9\u4E0D\u8D77\uFF01
-notFoundLabel=\u627e\u4e0d\u5230\uff01
+notFoundLabel=\u627E\u4E0D\u5230\uFF01
-unPulbishSuccLabel=\u53d6\u6d88\u53d1\u5e03\u6210\u529f
+unPulbishSuccLabel=\u53D6\u6D88\u53D1\u5E03\u6210\u529F
-unPulbishFailLabel=\u53d6\u6d88\u53d1\u5e03\u5931\u8d25
+unPulbishFailLabel=\u53D6\u6D88\u53D1\u5E03\u5931\u8D25
-removeSuccLabel=\u5220\u9664\u6210\u529f
+removeSuccLabel=\u5220\u9664\u6210\u529F
-removeFailLabel=\u5220\u9664\u5931\u8d25
+removeFailLabel=\u5220\u9664\u5931\u8D25
-removeUserFailSkinNeedMulUsersLabel=\u5220\u9664\u5931\u8d25\uff0c\u5f53\u524d\u4f7f\u7528\u7684\u76ae\u80a4\u9700\u8981\u591a\u7528\u6237\u652f\u6301
+removeUserFailSkinNeedMulUsersLabel=\u5220\u9664\u5931\u8D25\uFF0C\u5F53\u524D\u4F7F\u7528\u7684\u76AE\u80A4\u9700\u8981\u591A\u7528\u6237\u652F\u6301
-putTopSuccLabel=\u7f6e\u9876\u6210\u529f
+putTopSuccLabel=\u7F6E\u9876\u6210\u529F
-putTopFailLabel=\u7f6e\u9876\u5931\u8d25
+putTopFailLabel=\u7F6E\u9876\u5931\u8D25
-cancelTopSuccLabel=\u53d6\u6d88\u7f6e\u9876\u6210\u529f
+cancelTopSuccLabel=\u53D6\u6D88\u7F6E\u9876\u6210\u529F
-cancelTopFailLabel=\u53d6\u6d88\u7f6e\u9876\u5931\u8d25
+cancelTopFailLabel=\u53D6\u6D88\u7F6E\u9876\u5931\u8D25
-addSuccLabel=\u6dfb\u52a0\u6210\u529f
+addSuccLabel=\u6DFB\u52A0\u6210\u529F
-addFailLabel=\u6dfb\u52a0\u5931\u8d25
+addFailLabel=\u6DFB\u52A0\u5931\u8D25
-updateSuccLabel=\u66f4\u65b0\u6210\u529f
+updateSuccLabel=\u66F4\u65B0\u6210\u529F
-updateFailLabel=\u66f4\u65b0\u5931\u8d25
+updateFailLabel=\u66F4\u65B0\u5931\u8D25
-updatePreferenceFailLabel=\u66f4\u65b0\u5931\u8d25\uff0c\u8bf7\u4ed4\u7ec6\u68c0\u67e5\u201c\u535a\u5ba2\u5730\u5740\u201d\u7684\u914d\u7f6e\u662f\u5426\u6b63\u786e
+updatePreferenceFailLabel=\u66F4\u65B0\u5931\u8D25\uFF0C\u8BF7\u4ED4\u7EC6\u68C0\u67E5\u201C\u535A\u5BA2\u5730\u5740\u201D\u7684\u914D\u7F6E\u662F\u5426\u6B63\u786E
-updatePreferenceFailNeedMulUsersLabel=\u66f4\u65b0\u5931\u8d25\uff0c\u9700\u8981\u591a\u7528\u6237\u624d\u80fd\u4f7f\u7528\u9009\u62e9\u7684\u76ae\u80a4
+updatePreferenceFailNeedMulUsersLabel=\u66F4\u65B0\u5931\u8D25\uFF0C\u9700\u8981\u591A\u7528\u6237\u624D\u80FD\u4F7F\u7528\u9009\u62E9\u7684\u76AE\u80A4
-setFailLabel=\u8bbe\u7f6e\u5931\u8d25
+setFailLabel=\u8BBE\u7F6E\u5931\u8D25
-setSuccLabel=\u8bbe\u7f6e\u6210\u529f
+setSuccLabel=\u8BBE\u7F6E\u6210\u529F
-getFailLabel=\u83b7\u53d6\u5931\u8d25
+getFailLabel=\u83B7\u53D6\u5931\u8D25
-noSettingLabel=\u8be5\u535a\u5ba2\u65e0\u8d26\u53f7\uff0c\u8bf7\u6dfb\u52a0
+noSettingLabel=\u8BE5\u535A\u5BA2\u65E0\u8D26\u53F7\uFF0C\u8BF7\u6DFB\u52A0
-getSuccLabel=\u83b7\u53d6\u6210\u529f
+getSuccLabel=\u83B7\u53D6\u6210\u529F
-importSuccLabel=\u5bfc\u5165\u6210\u529f :-)
+importSuccLabel=\u5BFC\u5165\u6210\u529F :-)
-importFailLabel=\u90e8\u5206\u5bfc\u5165\u5931\u8d25 %>_<%
+importFailLabel=\u90E8\u5206\u5BFC\u5165\u5931\u8D25 %>_<%
-noCommentLabel=\u6682\u65e0\u8bc4\u8bba
+noCommentLabel=\u6682\u65E0\u8BC4\u8BBA
-captchaErrorLabel=\u9a8c\u8bc1\u7801\u9519\u8bef
+captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF
-inputErrorLabel=\u8f93\u5165\u9519\u8bef\uff01
+inputErrorLabel=\u8F93\u5165\u9519\u8BEF\uFF01
-gotoLabel=\u8df3\u8f6c
+gotoLabel=\u8DF3\u8F6C
-nameEmptyLabel=\u59d3\u540d\u4e0d\u80fd\u4e3a\u7a7a\uff01
+nameEmptyLabel=\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-passwordEmptyLabel=\u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
+passwordEmptyLabel=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-blogEmptyLabel=\u8bf7\u9009\u62e9\u535a\u5ba2\u670d\u52a1\uff01
+blogEmptyLabel=\u8BF7\u9009\u62E9\u535A\u5BA2\u670D\u52A1\uFF01
-blogArticleEmptyLabel=\u8bf7\u9009\u62e9\u9700\u8981\u5bfc\u5165\u7684\u6587\u7ae0
+blogArticleEmptyLabel=\u8BF7\u9009\u62E9\u9700\u8981\u5BFC\u5165\u7684\u6587\u7AE0
-nameTooLongLabel=\u59d3\u540d\u53ea\u80fd\u4e3a 2 \u5230 20 \u4e2a\u5b57\u7b26\uff01
+nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01
-mailCannotEmptyLabel=\u90ae\u7bb1\u4e0d\u80fd\u4e3a\u7a7a\uff01
+mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-mailInvalidLabel=\u90ae\u7bb1\u683c\u5f0f\u4e0d\u6b63\u786e\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
+commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01
-captchaCannotEmptyLabel=\u9a8c\u8bc1\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
+captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-loadingLabel=\u8f7d\u5165\u4e2d....
+loadingLabel=\u8F7D\u5165\u4E2D....
-titleEmptyLabel=\u6807\u9898\u4e0d\u80fd\u4e3a\u7a7a\uff01
+titleEmptyLabel=\u6807\u9898\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-contentEmptyLabel=\u5185\u5bb9\u4e0d\u80fd\u4e3a\u7a7a\uff01
+contentEmptyLabel=\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-orderEmptyLabel=\u5e8f\u53f7\u4e0d\u80fd\u4e3a\u7a7a\uff01
+orderEmptyLabel=\u5E8F\u53F7\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-abstractEmptyLabel=\u6458\u8981\u4e0d\u80fd\u4e3a\u7a7a\uff01
+abstractEmptyLabel=\u6458\u8981\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-tagsEmptyLabel=\u6807\u7b7e\u4e0d\u80fd\u4e3a\u7a7a\uff01
+tagsEmptyLabel=\u6807\u7B7E\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-addressEmptyLabel=\u5730\u5740\u4e0d\u80fd\u4e3a\u7a7a\uff01
+addressEmptyLabel=\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-noAuthorizationURLLabel=\u4ece Google \u83b7\u53d6\u6388\u6743\u5730\u5740\u5931\u8d25\uff0c\u8bf7\u786e\u8ba4\u60a8\u8f93\u5165\u7684 \
+noAuthorizationURLLabel=\u4ECE Google \u83B7\u53D6\u6388\u6743\u5730\u5740\u5931\u8D25\uFF0C\u8BF7\u786E\u8BA4\u60A8\u8F93\u5165\u7684 \
-<em>Consumer Secret</em> \u662f\u6b63\u786e\u7684\uff0c\u7136\u540e\u8fdb\u884c\u91cd\u8bd5\u3002
+<em>Consumer Secret</em> \u662F\u6B63\u786E\u7684\uFF0C\u7136\u540E\u8FDB\u884C\u91CD\u8BD5\u3002
-exceedMaxUploadSizeLabel=\u76ee\u524d\u53ea\u80fd\u4e0a\u4f20\u5c0f\u4e8e 1M \u7684\u6587\u4ef6 :-(
+exceedMaxUploadSizeLabel=\u76EE\u524D\u53EA\u80FD\u4E0A\u4F20\u5C0F\u4E8E 1M \u7684\u6587\u4EF6 :-(
-uploadFailLabel=\u4e0a\u4f20\u5931\u8d25\uff01
+uploadFailLabel=\u4E0A\u4F20\u5931\u8D25\uFF01
-fileEmptyLabel=\u6587\u4ef6\u4e3a\u7a7a\uff01
+fileEmptyLabel=\u6587\u4EF6\u4E3A\u7A7A\uFF01
-duplicatedPermalinkLabel=\u94fe\u63a5\u91cd\u590d\uff01
+duplicatedPermalinkLabel=\u94FE\u63A5\u91CD\u590D\uFF01
-invalidPermalinkFormatLabel=\u975e\u6cd5\u7684\u94fe\u63a5\u683c\u5f0f\uff01
+invalidPermalinkFormatLabel=\u975E\u6CD5\u7684\u94FE\u63A5\u683C\u5F0F\uFF01
-duplicatedEmailLabel=\u90ae\u4ef6\u5730\u5740\u91cd\u590d\uff01
+duplicatedEmailLabel=\u90AE\u4EF6\u5730\u5740\u91CD\u590D\uFF01
-canntBeLocalhostOnProductionLabel=GAE \u73af\u5883\u4e0a\u8bf7\u52ff\u6307\u5b9a\u535a\u5ba2\u5730\u5740\u4e3a localhost\uff01
+canntBeLocalhostOnProductionLabel=GAE \u73AF\u5883\u4E0A\u8BF7\u52FF\u6307\u5B9A\u535A\u5BA2\u5730\u5740\u4E3A localhost\uFF01
-refreshAndRetryLabel=\u8bf7\u5237\u65b0\u91cd\u8bd5\uff01
+refreshAndRetryLabel=\u8BF7\u5237\u65B0\u91CD\u8BD5\uFF01
-noDataLable=\u65e0\u6570\u636e
+noDataLable=\u65E0\u6570\u636E
-editorLeaveLabel=\u7f16\u8f91\u5668\u4e2d\u8fd8\u6709\u5185\u5bb9\uff0c\u662f\u5426\u79bb\u5f00\uff1f
+editorLeaveLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u79BB\u5F00\uFF1F
-editorPostLabel=\u7f16\u8f91\u5668\u4e2d\u8fd8\u6709\u5185\u5bb9\uff0c\u662f\u5426\u6e05\u7a7a\uff1f
+editorPostLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u6E05\u7A7A\uFF1F
 ####
-confirmRemoveLabel=\u786e\u5b9a\u5220\u9664\uff1f
+confirmRemoveLabel=\u786E\u5B9A\u5220\u9664\uFF1F
-confirmInitLabel=\u786e\u5b9a\u8fdb\u884c\u521d\u59cb\u5316\u5417\uff1f
+confirmInitLabel=\u786E\u5B9A\u8FDB\u884C\u521D\u59CB\u5316\u5417\uFF1F

andrea/macro-comments.ftl

@@ -2,37 +2,7 @@
 <h2 class="comment-label">${commentLabel}</h2>
 <div id="comments">
     <#list commentList as comment>
-    <div id="${comment.oId}"
+    <#include "common-comment.ftl"/>
-         class="comment-body <#if comment_index % 2 == 0>comment-even<#else>comment-odd</#if>">
-        <div class="comment-panel">
-            <div class="left comment-author">
-                <img alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
-            </div>
-            <div class="left comment-info">
-                <#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>
-                &nbsp;${comment.commentDate?string("yyyy-MM-dd HH:mm:ss")}
-                <div class="comment-content">
-                    ${comment.commentContent}
-                </div>
-                <#if article.commentable>
-                <div>
-                    <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
-                </div>
-                </#if>
-            </div>
-            <div class="clear"></div>
-        </div>
-    </div>
     </#list>
 </div>
 <#if article.commentable>
@@ -134,36 +104,6 @@
         "externalRelevantArticles1Label": "${externalRelevantArticles1Label}"
     });
 
-    var addComment = function (result, state) {
-        var oddEven = "";
-        if ($("#comments div").first().hasClass("comment-even")) {
-            oddEven = "comment-odd";
-        } else {
-            oddEven = "comment-even";
-        }
-
-        var commentHTML = '<div id="' + result.oId
-            + '" class="comment-body ' + oddEven + '"><div class="comment-panel"><div class="left comment-author">'
-            + '<img alt="' + result.userName + '" src="' + result.commentThumbnailURL
-            + '"/></div><div class="left comment-info">' + result.replyNameHTML;
-
-        if (state !== "") {
-            var commentOriginalCommentName = $("#" + page.currentCommentId).find(".comment-info 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 += '&nbsp;' + result.commentDate + '<div class="comment-content">'
-            + Util.replaceEmString($("#comment" + state).val())
-            + '</div><div><a rel="nofollow" href="javascript:replyTo(\''
-            + result.oId + '\');">${replyLabel}</a>'
-            +'</div></div><div class="clear"></div></div>';
-        return commentHTML;
-    }
-
     var replyTo = function (id) {
         var commentFormHTML = "<table class='comment-form' id='replyForm' cellpadding='0' cellspacing='0'>";
                 

bruce/common-comment.ftl

@@ -0,0 +1,24 @@
+<div class="row comment" id="${comment.oId}">
+    <img class="col-sm-1" title="${comment.commentName}"
+         alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
+    <div class="col-sm-11">
+        <div class="row">
+        <#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 class="gray">• ${comment.commentDate2?string("yy-MM-dd HH:mm")} • <#if article.commentable>
+                <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">Reply</a>
+            </#if></span>
+
+        </div>
+        <div class="row code-highlight">${comment.commentContent}</div>
+    </div>
+</div>

bruce/css/bruce.css

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

bruce/css/bruce.min.css

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@charset "utf-8";.article-date,.article-tags,.article-title,.footer{text-align:center}.footer,.header{background-color:#f9f9f9}body,button,input,select,textarea{font:400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;letter-spacing:.01rem}.site{padding:0 2em;margin:0 auto;font-size:16px}h4,h5,h6{font-weight:700}.article{margin-bottom:90px}.article-tags{font-size:14px}.article-date{font-size:12px;margin-top:6px;margin-bottom:12px}.article-content{font-size:1.1em}.article-content img{max-width:100%}.header{border-bottom:1px solid #ddd;margin-bottom:20px}.nav-item{position:relative;display:inline-block;padding:10px;font-weight:500}.comment{margin-bottom:32px}.comment p{margin-bottom:0}#captcha,#captchaReply,#emotions span,#emotionsReply span,.form-control{margin-top:15px}.cmtFromSym{font-size:12px;color:#ccc;margin-bottom:1em}.cmtForm{margin-top:24px}.gray{color:#ccc}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{cursor:pointer;background-image:url(../images/emotions/emotions.png);float:left;height:24px;margin-right:5px;width:24px;transition:all .2s ease-out;-webkit-transition:all .2s ease-out;-moz-transition:all .2s ease-out}#emotions span:hover{transform:scale(1.2) rotate(360deg);-webkit-transform:scale(1.2) rotate(360deg);-moz-transform:scale(1.2) rotate(360deg)}.em01{background-position:-24px 0}.em02{background-position:-48px 0}.em03{background-position:-72px 0}.em04{background-position:-96px 1px}.em05{background-position:0 -24px}.em06{background-position:-24px -24px}.em07{background-position:-48px -24px}.em08{background-position:-72px -24px}.em09{background-position:-96px -24px}.em10{background-position:0 -48px}.em11{background-position:-24px -48px}.em12{background-position:-48px -48px}.em13{background-position:-72px -48px}.em14{background-position:-96px -48px}.footer{padding:40px 0;margin-top:20px;color:#999;border-top:1px solid #e5e5e5}.article-relative{margin-top:48px}.right{float:right}
+@charset "utf-8";.article-date,.article-tags,.article-title,.footer{text-align:center}.footer,.header{background-color:#f9f9f9}body,button,input,select,textarea{font:400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;letter-spacing:.01rem}.site{padding:0 2em;margin:0 auto;font-size:16px}h4,h5,h6{font-weight:700}.article{margin-bottom:90px}.article-tags{font-size:14px}.article-date{font-size:12px;margin-top:6px;margin-bottom:12px}.article-content{font-size:1.1em}.article-content img{max-width:100%}.header{border-bottom:1px solid #ddd;margin-bottom:20px}.nav-item{position:relative;display:inline-block;padding:10px;font-weight:500}.comment{margin-bottom:32px}.comment p{margin-bottom:0}#captcha,#captchaReply,#emotions span,#emotionsReply span,.form-control{margin-top:15px}.cmtFromSym{font-size:12px;color:#ccc;margin-bottom:1em}.cmtForm{margin-top:24px}.gray{color:#ccc}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{cursor:pointer;background-image:url(../../../images/emotions/emotions.png);background-size:120px;float:left;height:24px;margin-right:5px;width:24px;transition:all .2s ease-out;-webkit-transition:all .2s ease-out;-moz-transition:all .2s ease-out}#emotions span:hover{transform:scale(1.2) rotate(360deg);-webkit-transform:scale(1.2) rotate(360deg);-moz-transform:scale(1.2) rotate(360deg)}.em01{background-position:-24px 0}.em02{background-position:-48px 0}.em03{background-position:-72px 0}.em04{background-position:-96px 1px}.em05{background-position:0 -24px}.em06{background-position:-24px -24px}.em07{background-position:-48px -24px}.em08{background-position:-72px -24px}.em09{background-position:-96px -24px}.em10{background-position:0 -48px}.em11{background-position:-24px -48px}.em12{background-position:-48px -48px}.em13{background-position:-72px -48px}.em14{background-position:-96px -48px}.footer{padding:40px 0;margin-top:20px;color:#999;border-top:1px solid #e5e5e5}.article-relative{margin-top:48px}.right{float:right}

bruce/macro-comments.ftl

@@ -1,30 +1,7 @@
 <#macro comments commentList article>
 <div class="row" id="comments">
     <#list commentList as comment>
-    <div class="row comment" id="${comment.oId}">
+    <#include "common-comment.ftl"/>
-        <img class="col-sm-1" title="${comment.commentName}"
-             alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
-        <div class="col-sm-11">
-            <div class="row">
-                <#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 class="gray">• ${comment.commentDate?string("yy-MM-dd HH:mm")} • <#if article.commentable>
-                    <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">Reply</a>
-                    </#if></span>
-
-            </div>
-            <div class="row code-highlight">${comment.commentContent}</div>
-        </div>
-    </div>
     </#list>
 </div>
 
@@ -134,32 +111,6 @@
                             "externalRelevantArticles1Label": "${externalRelevantArticlesLabel}"
                         });
 
-                        var addComment = function (result, state) {
-                            var commentHTML = '<div class="row comment" id="' + result.oId + '"><img class="col-sm-1" \
-                                    title="' + result.userName + '" alt="' + result.userName +
-                                    '" src="' + result.commentThumbnailURL
-                                    + '"/><div class="col-sm-11"><div class="row">' + result.replyNameHTML;
-
-
-
-//                            if (state !== "") {
-//                                var commentOriginalCommentName = $("#" + page.currentCommentId
-//                                        + " .comment-panel>.left 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 class="gray"> • ' + result.commentDate.substring(2, 16)
-                                    + ' • <a rel="nofollow" href="javascript:replyTo('
-                                    + result.oId + ');">Reply</a></span></div><div class="row">' +
-                            Util.replaceEmString($("#comment" + state).val()) + '</div>';
-
-                            return commentHTML;
-                        };
-
                         var replyTo = function (id) {
                             var commentFormHTML = "<table class='cmtReplyForm col-sm-12 form-horizontal' id='replyForm'>";
                             page.addReplyForm(id, commentFormHTML);

classic/common-comment.ftl

@@ -0,0 +1,35 @@
+<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.commentDate2?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>

classic/lang/lang_en_US.properties

@@ -58,21 +58,6 @@ recentCommentsLabel=Recent Comments
 postCommentsLabel=Post Comment
 mostCommentArticlesLabel=Most Comment Articles
 mostViewCountArticlesLabel=Most View Articles
-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
 linkLabel=Friend Links
 sumLabel=
 pageLabel=Page

classic/lang/lang_zh_CN.properties

@@ -58,21 +58,6 @@ recentCommentsLabel=\u6700\u65B0\u8BC4\u8BBA
 postCommentsLabel=\u53D1\u8868\u8BC4\u8BBA
 mostCommentArticlesLabel=\u8BC4\u8BBA\u6700\u591A\u7684\u6587\u7AE0
 mostViewCountArticlesLabel=\u8BBF\u95EE\u6700\u591A\u7684\u6587\u7AE0
-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
 linkLabel=\u53CB\u60C5\u94FE\u63A5
 sumLabel=\u5171
 pageLabel=\u9875

classic/macro-comments.ftl

@@ -5,41 +5,7 @@
     ${noCommentLabel}
     </#if>
     <#list commentList as comment>
-    <div id="${comment.oId}">
+    <#include "common-comment.ftl"/>
-        <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>
     </#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);

community/common-comment.ftl

@@ -0,0 +1,30 @@
+<div id="${comment.oId}">
+    <img class="left" alt="${comment.commentName}" src="${comment.commentThumbnailURL}"/>
+    <div class="comment-panel left">
+        <div class="comment-top">
+        <#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}', 11);"
+               onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">
+            ${comment.commentOriginalCommentName}</a>
+        </#if>
+        ${comment.commentDate2?string("yyyy-MM-dd HH:mm:ss")}
+        </div>
+        <div class="comment-content">
+        ${comment.commentContent}
+        </div>
+        <div class="clear"></div>
+    <#if article.commentable>
+        <div class="reply">
+            <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
+        </div>
+    </#if>
+    </div>
+    <div class="clear"></div>
+</div>

community/css/community.css

@@ -436,7 +436,8 @@ a.header-title {
 }
 
 .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 {
-    background-image: url("../../community/images/emotions/emotions-black.png");
+    background-image: url("../../../images/emotions/emotions.png");
+    background-size: 120px;
     margin: 0 12px;
 }
 /* footer secondary */

community/lang/lang_en_US.properties

@@ -55,21 +55,6 @@ recentCommentsLabel=Recent Comments
 postCommentsLabel=Post Comment
 mostCommentArticlesLabel=Most Comment Articles
 mostViewCountArticlesLabel=Most View Articles
-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
 linkLabel=Friend Links
 sumLabel=
 pageLabel=Page
@@ -203,9 +188,9 @@ permalinkLabel=Permalink
 welcomeToSoloLabel=Welcome to B3log Solo!
 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>Let's kill outdated and insecure browser!</h2><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</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">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul>
-readmoreLabel=Read more\u00bb
+readmoreLabel=Read more\u00BB
 readmore2Label=Read more
-replyLabel=Reply\u00bb
+replyLabel=Reply\u00BB
 homeLabel=Home
 enableArticleUpdateHint1Label=Enable Article Update Hint:
 allowVisitDraftViaPermalink1Label=Allow Visit Draft Via Link:
@@ -278,8 +263,8 @@ duplicatedEmailLabel=Duplicated email!
 canntBeLocalhostOnProductionLabel=Can not set host as localhost on production!
 refreshAndRetryLabel=Please refresh and try again!
 noDataLable=NO Data
-editorLeaveLabel=Content is not null, Do you leave\uff1f
+editorLeaveLabel=Content is not null, Do you leave\uFF1F
-editorPostLabel=Content is not null, Do you clear\uff1f
+editorPostLabel=Content is not null, Do you clear\uFF1F
 ####
 confirmRemoveLabel=Are You Sure?
 confirmInitLabel=Are You Sure?