✨ #18 集成社区评论组件

88250 · Jan 14, 2020 · 7f6fa34 · 7f6fa34
1 parent d585a1a
commit 7f6fa34
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 26 deletions.
diff --git a/src/main/resources/skins/9IPHP/article.ftl b/src/main/resources/skins/9IPHP/article.ftl
@@ -90,16 +90,6 @@
                             ${articleTag}</a>
                     </#list>
 
-                    <#-- div class="copyright">
-                        ${articleCP1Label}
-                        <a rel="bookmark" href="${servePath}${article.articlePermalink}">
-                            ${article.articleTitle}
-                        </a> -
-                        <a href="${servePath}">
-                            ${blogTitle}
-                        </a>
-                    </div -->
-
                     <div class="rel fn-clear ft__center">
                         <#if previousArticlePermalink??>
                             <a href="${servePath}${previousArticlePermalink}" rel="prev"
@@ -118,7 +108,10 @@
                         </#if>
                     </div>
                 </footer>
-                <@comments commentList=articleComments article=article></@comments>
+                <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                <div id="soloComments" class="fn__none">
+                    <@comments commentList=articleComments article=article></@comments>
+                </div>
                 <br>
                 <div id="externalRelevantArticles" class="list"></div>
                 <div id="relevantArticles" class="list"></div>

diff --git a/src/main/resources/skins/9IPHP/css/base.scss b/src/main/resources/skins/9IPHP/css/base.scss
@@ -609,15 +609,6 @@ aside {
   background: #999;
 }
 
-.post footer .copyright {
-  padding: 10px;
-  font-size: 14px;
-  line-height: 16px;
-  border: 1px solid #ff4d3a;
-  border-left-width: 20px;
-  margin: 20px 0;
-}
-
 .post .rel a {
   display: inline-block;
   padding: 5px 14px;

diff --git a/src/main/resources/skins/9IPHP/lang/lang_en_US.properties b/src/main/resources/skins/9IPHP/lang/lang_en_US.properties
@@ -29,5 +29,4 @@ tocLabel=Article ToC
 readLabel=Read More
 nextArticleLabel=Next
 previousArticleLabel=Previous
-articleCP1Label=Please indicate the source:
 viewCountLabel=View Count
diff --git a/src/main/resources/skins/9IPHP/lang/lang_zh_CN.properties b/src/main/resources/skins/9IPHP/lang/lang_zh_CN.properties
@@ -29,5 +29,4 @@ tocLabel=\u6587\u7AE0\u76EE\u5F55
 readLabel=\u9605\u8BFB\u5168\u6587
 nextArticleLabel=\u65B0\u4E00\u7BC7
 previousArticleLabel=\u65E7\u4E00\u7BC7
-articleCP1Label=\u8F6C\u8F7D\u8BF7\u6CE8\u660E\u6765\u6E90\uFF1A
 viewCountLabel=\u6D4F\u89C8\u6570
diff --git a/src/main/resources/skins/Andrea/article.ftl b/src/main/resources/skins/Andrea/article.ftl
@@ -104,7 +104,10 @@
                             <div class="clear"></div>
                             <div id="externalRelevantArticles" class="article-relative"></div>
                         </div>
-                        <@comments commentList=articleComments article=article></@comments>
+                        <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                        <div id="soloComments" style="display: none;">
+                            <@comments commentList=articleComments article=article></@comments>
+                        </div>
                     </div>
                     <div class="main-footer"></div>
                 </div>

diff --git a/src/main/resources/skins/Bruce/article.ftl b/src/main/resources/skins/Bruce/article.ftl
@@ -73,7 +73,10 @@
                                 </div>
                             </div>
                         </div>
-                        <@comments commentList=articleComments article=article></@comments>
+                        <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+                        <div id="soloComments" style="display: none;">
+                            <@comments commentList=articleComments article=article></@comments>
+                        </div>
                     </div>
                     <#if 0 != relevantArticlesDisplayCount>
                     <div id="relevantArticles"></div>

diff --git a/src/main/resources/skins/Bubble/article.ftl b/src/main/resources/skins/Bubble/article.ftl
@@ -82,7 +82,12 @@
             <#include "../../common-template/toc.ftl"/>
         </div>
     </#if>
-    <@comments commentList=articleComments article=article></@comments>
+    <div class="wrapper">
+        <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+    </div>
+    <div id="soloComments" style="display: none;">
+        <@comments commentList=articleComments article=article></@comments>
+    </div>
     <div class="article__bottom">
         <div class="wrapper">
             <div class="fn__flex">

diff --git a/src/main/resources/skins/Casper/article.ftl b/src/main/resources/skins/Casper/article.ftl
@@ -85,7 +85,10 @@
             <#include "../../common-template/toc.ftl"/>
         </div>
     </#if>
-    <@comments commentList=articleComments article=article></@comments>
+    <div id="vcomment" class="wrapper" style="padding: 40px 0" data-name="${article.authorName}" data-postId="${article.oId}"></div>
+    <div id="soloComments" style="display: none;">
+        <@comments commentList=articleComments article=article></@comments>
+    </div>
     <div class="article__bottom">
         <div class="wrapper">
             <div class="fn__flex">