✨ #18 集成社区评论组件

src/main/resources/skins/Andrea/article.ftl

@@ -106,10 +106,10 @@
                         </div>
                         <#if commentable>
                         <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                        </#if>
                         <div id="soloComments" style="display: none;">
                             <@comments commentList=articleComments article=article></@comments>
                         </div>
+                        </#if>
                     </div>
                     <div class="main-footer"></div>
                 </div>

src/main/resources/skins/Andrea/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <h2 class="comment-label">${commentLabel}</h2>
 <div id="comments">
     <#list commentList as comment>
@@ -30,5 +29,4 @@
     <textarea rows="3" style="width: 100%" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/Bruce/article.ftl

@@ -75,10 +75,10 @@
                         </div>
                         <#if commentable>
                         <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                        </#if>
                         <div id="soloComments" style="display: none;">
                             <@comments commentList=articleComments article=article></@comments>
                         </div>
+                        </#if>
                     </div>
                     <#if 0 != relevantArticlesDisplayCount>
                     <div id="relevantArticles"></div>

src/main/resources/skins/Bruce/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -30,5 +29,4 @@
         <textarea rows="3" placeholder="${postCommentsLabel}" id="comment" class="form-control"></textarea>
     </div>
     </#if>
-</#if>
 </#macro>

src/main/resources/skins/Bubble/article.ftl

@@ -86,10 +86,10 @@
     <div class="wrapper">
         <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
     </div>
-    </#if>
     <div id="soloComments" style="display: none;">
         <@comments commentList=articleComments article=article></@comments>
     </div>
+    </#if>
     <div class="article__bottom">
         <div class="wrapper">
             <div class="fn__flex">

src/main/resources/skins/Bubble/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comment">
     <div class="wrapper">
         <div class="comment__title">
@@ -35,5 +34,4 @@
         </ul>
     </div>
 </div>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/Casper/article.ftl

@@ -87,10 +87,10 @@
     </#if>
     <#if commentable>
     <div id="vcomment" class="wrapper" style="padding: 40px 0" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-    </#if>
     <div id="soloComments" style="display: none;">
         <@comments commentList=articleComments article=article></@comments>
     </div>
+    </#if>
     <div class="article__bottom">
         <div class="wrapper">
             <div class="fn__flex">

src/main/resources/skins/Casper/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comment">
     <div class="comment__wrapper wrapper">
         <div class="comment__title">
@@ -35,5 +34,4 @@
         </ul>
     </div>
 </div>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/Community/article.ftl

@@ -123,10 +123,10 @@
             </div>
             <#if commentable>
             <div id="vcomment" style="background-color: #ffffff; padding: 10px; margin-bottom: 40px" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-            </#if>
             <div id="soloComments" style="display: none;">
                 <@comments commentList=articleComments article=article></@comments>
             </div>
+            </#if>
         </div>
         <div>
             <#include "side.ftl">

src/main/resources/skins/Community/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -32,5 +31,4 @@
     <textarea rows="3" placeholder="${commentContentLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>

src/main/resources/skins/Finding/article.ftl

@@ -103,10 +103,10 @@
                 </#if>
                 <#if commentable>
                 <div id="vcomment" class="fn-wrap" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                </#if>
                 <div id="soloComments" style="display: none;">
                     <@comments commentList=articleComments article=article></@comments>
                 </div>
+                </#if>
             </main>
             <#if nextArticlePermalink?? || previousArticlePermalink??>
             <aside class="read-next">

src/main/resources/skins/Finding/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <ul class="comments fn-wrap" id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -29,5 +28,4 @@
     <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/Jane/article.ftl

@@ -103,10 +103,10 @@
     </div>
     <#if commentable>
     <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-    </#if>
     <div id="soloComments" style="display: none;">
         <@comments commentList=articleComments article=article></@comments>
     </div>
+    </#if>
     <#if 0 != relevantArticlesDisplayCount>
         <div id="relevantArticles" class="article__near"></div>
     </#if>

src/main/resources/skins/Jane/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comments__title">
     ${commentLabel}
 </div>
@@ -34,5 +33,4 @@
     <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/Medium/article.ftl

@@ -120,10 +120,10 @@
                 </div>
                 <#if commentable>
                 <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                </#if>
                 <div id="soloComments" style="display: none;">
                     <@comments commentList=articleComments article=article></@comments>
                 </div>
+                </#if>
             </div>
         </div>
 

src/main/resources/skins/Medium/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="article__comment">
     <div class="comment__title">${commentLabel}</div>
     <div id="comments">
@@ -31,5 +30,4 @@
                   class="comment__textarea"  id="comment"></textarea>
     </#if>
 </div>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/NeoEase/article.ftl

@@ -108,10 +108,10 @@
                     </div>
                     <#if commentable>
                     <div id="vcomment" style="padding: 10px 0;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                    </#if>
                     <div id="soloComments" style="display: none;">
                         <@comments commentList=articleComments article=article></@comments>
                     </div>
+                    </#if>
                 </div>
                 <#include "side.ftl">
                 <div class="clear"></div>

src/main/resources/skins/NeoEase/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="share">
     <a class="share-comment" href="#commentForm">
         ${commentList?size}&nbsp;&nbsp;${commentLabel}
@@ -36,5 +35,4 @@
     <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/Pinghsu/article.ftl

@@ -94,10 +94,10 @@
         <div class="wrapper comment">
             <#if commentable>
             <div id="vcomment" style="padding: 30px 0;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-            </#if>
             <div id="soloComments" style="display: none;">
                 <@comments commentList=articleComments article=article></@comments>
             </div>
+            </#if>
 
             <div class="post__list fn__flex">
                 <div class="fn__flex-1">

src/main/resources/skins/Pinghsu/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comment__title">
     Responses
 </div>
@@ -31,5 +30,4 @@
         <#include 'common-comment.ftl'/>
     </#list>
 </ul>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/favourite/article.ftl

@@ -121,10 +121,10 @@
                         </div>
                         <#if commentable>
                         <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                        </#if>
                         <div id="soloComments" style="display: none;">
                             <@comments commentList=articleComments article=article></@comments>
                         </div>
+                        </#if>
                     </div>
                     <div class="right">
                         <#include "side.ftl">

src/main/resources/skins/favourite/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comments" id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -29,5 +28,4 @@
     <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/i-nove/article.ftl

@@ -114,10 +114,10 @@
                             </div>
                             <#if commentable>
                             <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                            </#if>
                             <div id="soloComments" style="display: none;">
                                 <@comments commentList=articleComments article=article></@comments>
                             </div>
+                            </#if>
                         </div>
                         <div class="right">
                             <#include "side.ftl">

src/main/resources/skins/i-nove/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comments" id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -29,5 +28,4 @@
 <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/metro-hot/article.ftl

@@ -83,10 +83,10 @@
                     </div>
                     <#if commentable>
                     <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                    </#if>
                     <div id="soloComments" style="display: none;">
                         <@comments commentList=articleComments article=article></@comments>
                     </div>
+                    </#if>
                     <#include "copyright.ftl"/>
                 </div>
                 <@side isArticle=true />

src/main/resources/skins/metro-hot/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <#if article.commentable>
 <div class="comment-disabled">
     <h3>${postCommentsLabel}</h3>
@@ -47,5 +46,4 @@
 </#if>
 <span id="goTop" onclick="Util.goTop();" data-ico="&#xe042;" class="side-tile"></span>
 <span id="goCmt" onclick="MetroHot.goCmt();" data-ico="&#x005b;" class="side-tile"></span>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/next/article.ftl

@@ -109,10 +109,10 @@
         </div>
         <#if commentable>
         <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-        </#if>
         <div id="soloComments" style="display: none;">
             <@comments commentList=articleComments article=article></@comments>
         </div>
+        </#if>
         <#if 0 != relevantArticlesDisplayCount>
             <div id="relevantArticles"></div>
         </#if>

src/main/resources/skins/next/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <ul class="comments" id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -29,5 +28,4 @@
     <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/nijigen/article.ftl

@@ -136,10 +136,10 @@
             <div id="vcomment" class="module__content"
                  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>
             <div id="soloComments" class="fn__none">
                 <@comments commentList=articleComments article=article></@comments>
             </div>
+            </#if>
 
             <div class="fn__flex article__relevant">
                 <div class="fn__flex-1" id="externalRelevantArticlesWrap">

src/main/resources/skins/nijigen/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comments__item">
     <div class="comments__meta comments__meta--only">${commentLabel}</div>
 </div>
@@ -41,5 +40,4 @@
     </div>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/owmx-3.0/article.ftl

@@ -105,10 +105,10 @@ ${topBarReplacement}
             <div id="externalRelevantArticles"></div>
             <#if commentable>
             <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-            </#if>
             <div id="soloComments" style="display: none;">
                 <@comments commentList=articleComments article=article></@comments>
             </div>
+            </#if>
         </article>
         <#include "side.ftl">
         <div class="clear"></div>

src/main/resources/skins/owmx-3.0/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comments" id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -27,5 +26,4 @@
 <#if article.commentable>
 <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/timeline/article.ftl

@@ -123,10 +123,10 @@ ${topBarReplacement}
                     </#if>
                     <#if commentable>
                     <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                    </#if>
                     <div id="soloComments" style="display: none;">
                         <@comments commentList=articleComments article=article></@comments>
                     </div>
+                    </#if>
                 </div>
             </div>
             <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>

src/main/resources/skins/timeline/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <ul id="comments" class="comments list">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -33,5 +32,4 @@
 <div id="externalRelevantArticles"></div>
 </#if>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/tree-house/article.ftl

@@ -107,10 +107,10 @@
                             <div class="line right"></div>
                             <#if commentable>
                             <div id="vcomment" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-                            </#if>
                             <div id="soloComments" style="display: none;">
                                 <@comments commentList=articleComments article=article></@comments>
                             </div>
+                            </#if>
                         </div>
                         <div class="left side">
                             <#include "side.ftl">

src/main/resources/skins/tree-house/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <div class="comments-header"></div>
 <div class="comments marginTop12" id="comments">
     <#list commentList as comment>
@@ -37,5 +36,4 @@
     <div class="comment-bottom"></div>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file

src/main/resources/skins/yilia/article.ftl

@@ -135,10 +135,10 @@
     </article>
     <#if commentable>
     <div id="vcomment" style="padding: 30px 60px 30px 50px;" data-name="${article.authorName}" data-postId="${article.oId}"></div>
-    </#if>
     <div id="soloComments" style="display: none;">
         <@comments commentList=articleComments article=article></@comments>
     </div>
+    </#if>
 
     <#include "footer.ftl">
 

src/main/resources/skins/yilia/macro-comments.ftl

@@ -18,7 +18,6 @@
 
 -->
 <#macro comments commentList article>
-<#if commentable>
 <ul class="comments" id="comments">
     <#list commentList as comment>
     <#include "common-comment.ftl"/>
@@ -29,5 +28,4 @@
     <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
 </div>
 </#if>
-</#if>
 </#macro>
\ No newline at end of file