From 6fb93d6a473eeabb72090fd9b7e2cbb0864f4dae Mon Sep 17 00:00:00 2001
From: Van <lly219@gmail.com>
Date: Fri, 18 Oct 2013 14:54:04 +0800
Subject: [PATCH] about #299

---
 andrea/footer.ftl                     | 2 --
 andrea/lang/lang_en_US.properties     | 2 --
 andrea/lang/lang_zh_CN.properties     | 2 --
 andrea/macro-comments.ftl             | 4 ++++
 classic/lang/lang_en_US.properties    | 2 --
 classic/lang/lang_zh_CN.properties    | 2 --
 classic/macro-comments.ftl            | 4 ++++
 community/footer.ftl                  | 2 --
 community/lang/lang_en_US.properties  | 2 --
 community/lang/lang_zh_CN.properties  | 2 --
 community/macro-comments.ftl          | 4 ++++
 favourite/footer.ftl                  | 2 --
 favourite/lang/lang_en_US.properties  | 2 --
 favourite/lang/lang_zh_CN.properties  | 2 --
 favourite/macro-comments.ftl          | 4 ++++
 i-nove/footer.ftl                     | 2 --
 i-nove/lang/lang_en_US.properties     | 2 --
 i-nove/lang/lang_zh_CN.properties     | 2 --
 i-nove/macro-comments.ftl             | 4 ++++
 mobile/macro-comments.ftl             | 6 ++++--
 neoease/footer.ftl                    | 2 --
 neoease/lang/lang_en_US.properties    | 2 --
 neoease/lang/lang_zh_CN.properties    | 2 --
 neoease/macro-comments.ftl            | 4 ++++
 owmx-3.0/footer.ftl                   | 2 --
 owmx-3.0/lang/lang_en_US.properties   | 2 --
 owmx-3.0/lang/lang_zh_CN.properties   | 2 --
 owmx-3.0/macro-comments.ftl           | 4 ++++
 timeline/footer.ftl                   | 2 --
 timeline/lang/lang_en_US.properties   | 2 --
 timeline/lang/lang_zh_CN.properties   | 2 --
 timeline/macro-comments.ftl           | 4 ++++
 tree-house/footer.ftl                 | 2 --
 tree-house/lang/lang_en_US.properties | 2 --
 tree-house/lang/lang_zh_CN.properties | 2 --
 tree-house/macro-comments.ftl         | 4 ++++
 36 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/andrea/footer.ftl b/andrea/footer.ftl
index e83e343..f754099 100644
--- a/andrea/footer.ftl
+++ b/andrea/footer.ftl
@@ -15,8 +15,6 @@
     };
     
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",
diff --git a/andrea/lang/lang_en_US.properties b/andrea/lang/lang_en_US.properties
index 2860965..8a1ab4f 100644
--- a/andrea/lang/lang_en_US.properties
+++ b/andrea/lang/lang_en_US.properties
@@ -169,8 +169,6 @@ tagsLabel=Tags
 importedLabel=Imported
 captcha1Label=Captcha:
 captchaLabel=Captcha
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
diff --git a/andrea/lang/lang_zh_CN.properties b/andrea/lang/lang_zh_CN.properties
index 0cedee0..2d1c583 100644
--- a/andrea/lang/lang_zh_CN.properties
+++ b/andrea/lang/lang_zh_CN.properties
@@ -169,8 +169,6 @@ tagsLabel=\u6807\u7b7e
 importedLabel=\u5df2\u5bfc\u5165
 captcha1Label=\u9a8c\u8bc1\u7801\uff1a
 captchaLabel=\u9a8c\u8bc1\u7801
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
 previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
diff --git a/andrea/macro-comments.ftl b/andrea/macro-comments.ftl
index be7373b..9808efd 100644
--- a/andrea/macro-comments.ftl
+++ b/andrea/macro-comments.ftl
@@ -38,6 +38,7 @@
 <#if article.commentable>
 <table id="commentForm" class="comment-form" cellpadding="0" cellspacing="0">
     <tbody>
+        <#if !isLoggedIn>
         <tr>
             <th width="115px">
                 ${commentNameLabel}
@@ -62,6 +63,7 @@
                 <input type="text" id="commentURL"/>
             </td>
         </tr>
+        </#if>
         <tr>
             <th>
                 ${commentEmotionsLabel}
@@ -92,6 +94,7 @@
                 <textarea rows="10" id="comment"></textarea>
             </td>
         </tr>
+        <#if !isLoggedIn>
         <tr>
             <th>
                 ${captchaLabel}
@@ -101,6 +104,7 @@
                 <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
             </td>
         </tr>
+        </#if>
         <tr>
             <td colspan="2" align="right">
                 <button class="right" id="submitCommentButton" onclick="page.submitComment();">${submmitCommentLabel}</button>
diff --git a/classic/lang/lang_en_US.properties b/classic/lang/lang_en_US.properties
index 8a33020..8c4e838 100644
--- a/classic/lang/lang_en_US.properties
+++ b/classic/lang/lang_en_US.properties
@@ -164,8 +164,6 @@ tagsLabel=Tags
 importedLabel=Imported
 captcha1Label=Captcha:
 captchaLabel=Captcha
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
diff --git a/classic/lang/lang_zh_CN.properties b/classic/lang/lang_zh_CN.properties
index d5ccf2b..96c8551 100644
--- a/classic/lang/lang_zh_CN.properties
+++ b/classic/lang/lang_zh_CN.properties
@@ -170,8 +170,6 @@ tagsLabel=\u6807\u7b7e
 importedLabel=\u5df2\u5bfc\u5165
 captcha1Label=\u9a8c\u8bc1\u7801\uff1a
 captchaLabel=\u9a8c\u8bc1\u7801
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
 previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
diff --git a/classic/macro-comments.ftl b/classic/macro-comments.ftl
index 0f16a18..c4555b5 100644
--- a/classic/macro-comments.ftl
+++ b/classic/macro-comments.ftl
@@ -49,6 +49,7 @@
 <div class="comment-body">
     <table id="commentForm" class="form">
         <tbody>
+            <#if !isLoggedIn>
             <tr>
                 <th>
                     ${commentName1Label}
@@ -73,6 +74,7 @@
                     <input type="text" id="commentURL"/>
                 </td>
             </tr>
+            </#if>
             <tr>
                 <th>
                     ${commentEmotions1Label}
@@ -103,6 +105,7 @@
                     <textarea rows="10" cols="96" id="comment"></textarea>
                 </td>
             </tr>
+            <#if !isLoggedIn>
             <tr>
                 <th>
                     ${captcha1Label}
@@ -112,6 +115,7 @@
                     <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
                 </td>
             </tr>
+            </#if>
             <tr>
                 <td colspan="2" align="right">
                     <span style="line-height: 28px;" class="error-msg" id="commentErrorTip"></span>
diff --git a/community/footer.ftl b/community/footer.ftl
index 047c202..68a9f5e 100644
--- a/community/footer.ftl
+++ b/community/footer.ftl
@@ -41,8 +41,6 @@
     };
     
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",
diff --git a/community/lang/lang_en_US.properties b/community/lang/lang_en_US.properties
index 2860965..8a1ab4f 100644
--- a/community/lang/lang_en_US.properties
+++ b/community/lang/lang_en_US.properties
@@ -169,8 +169,6 @@ tagsLabel=Tags
 importedLabel=Imported
 captcha1Label=Captcha:
 captchaLabel=Captcha
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
diff --git a/community/lang/lang_zh_CN.properties b/community/lang/lang_zh_CN.properties
index 0cedee0..2d1c583 100644
--- a/community/lang/lang_zh_CN.properties
+++ b/community/lang/lang_zh_CN.properties
@@ -169,8 +169,6 @@ tagsLabel=\u6807\u7b7e
 importedLabel=\u5df2\u5bfc\u5165
 captcha1Label=\u9a8c\u8bc1\u7801\uff1a
 captchaLabel=\u9a8c\u8bc1\u7801
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
 previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
diff --git a/community/macro-comments.ftl b/community/macro-comments.ftl
index f5702ca..360def9 100644
--- a/community/macro-comments.ftl
+++ b/community/macro-comments.ftl
@@ -39,6 +39,7 @@
 </div>
 <table id="commentForm" class="comment" cellpadding="0" cellspacing="0" width="100%">
     <tbody>
+        <#if !isLoggedIn>
         <tr>
             <th width="200px">
                 <span class="comment-label">
@@ -72,6 +73,7 @@
                 <input type="text" id="commentURL"/>
             </td>
         </tr>
+        </#if>
         <tr>
             <th>
                 <span class="comment-label">
@@ -108,6 +110,7 @@
                 <textarea rows="10" id="comment"></textarea>
             </td>
         </tr>
+        <#if !isLoggedIn>
         <tr>
             <th>
                 <span class="comment-label">
@@ -120,6 +123,7 @@
                 <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
             </td>
         </tr>
+        </#if>
         <tr>
             <td colspan="2">
                 <span style="margin-top: 20px;" class="right error-msg" id="commentErrorTip"></span>
diff --git a/favourite/footer.ftl b/favourite/footer.ftl
index d9c285b..2296617 100644
--- a/favourite/footer.ftl
+++ b/favourite/footer.ftl
@@ -21,8 +21,6 @@
     };
     
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",
diff --git a/favourite/lang/lang_en_US.properties b/favourite/lang/lang_en_US.properties
index 2860965..8a1ab4f 100644
--- a/favourite/lang/lang_en_US.properties
+++ b/favourite/lang/lang_en_US.properties
@@ -169,8 +169,6 @@ tagsLabel=Tags
 importedLabel=Imported
 captcha1Label=Captcha:
 captchaLabel=Captcha
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
diff --git a/favourite/lang/lang_zh_CN.properties b/favourite/lang/lang_zh_CN.properties
index 0cedee0..2d1c583 100644
--- a/favourite/lang/lang_zh_CN.properties
+++ b/favourite/lang/lang_zh_CN.properties
@@ -169,8 +169,6 @@ tagsLabel=\u6807\u7b7e
 importedLabel=\u5df2\u5bfc\u5165
 captcha1Label=\u9a8c\u8bc1\u7801\uff1a
 captchaLabel=\u9a8c\u8bc1\u7801
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
 previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
diff --git a/favourite/macro-comments.ftl b/favourite/macro-comments.ftl
index 875408d..2de85cb 100644
--- a/favourite/macro-comments.ftl
+++ b/favourite/macro-comments.ftl
@@ -43,6 +43,7 @@
 <#if article.commentable>
 <table id="commentForm" class="comment-form">
     <tbody>
+        <#if !isLoggedIn>
         <tr>
             <td width="208px">
                 <input type="text" class="normalInput" id="commentName"/>
@@ -67,6 +68,7 @@
                 ${commentURLLabel}
             </td>
         </tr>
+        </#if>
         <tr>
             <td id="emotions" colspan="2">
                 <span class="em00" title="${em00Label}"></span>
@@ -91,6 +93,7 @@
                 <textarea rows="10" cols="96" id="comment"></textarea>
             </td>
         </tr>
+        <#if !isLoggedIn>
         <tr>
             <td>
                 <input type="text" class="normalInput" id="commentValidate"/>
@@ -99,6 +102,7 @@
                 <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
             </td>
         </tr>
+        </#if>
         <tr>
             <td colspan="2" align="right">
                 <span style="line-height: 22px;" class="error-msg" id="commentErrorTip"></span>
diff --git a/i-nove/footer.ftl b/i-nove/footer.ftl
index 6325403..8db1215 100644
--- a/i-nove/footer.ftl
+++ b/i-nove/footer.ftl
@@ -19,8 +19,6 @@
     };
     
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",
diff --git a/i-nove/lang/lang_en_US.properties b/i-nove/lang/lang_en_US.properties
index 2860965..8a1ab4f 100644
--- a/i-nove/lang/lang_en_US.properties
+++ b/i-nove/lang/lang_en_US.properties
@@ -169,8 +169,6 @@ tagsLabel=Tags
 importedLabel=Imported
 captcha1Label=Captcha:
 captchaLabel=Captcha
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
diff --git a/i-nove/lang/lang_zh_CN.properties b/i-nove/lang/lang_zh_CN.properties
index 0cedee0..2d1c583 100644
--- a/i-nove/lang/lang_zh_CN.properties
+++ b/i-nove/lang/lang_zh_CN.properties
@@ -169,8 +169,6 @@ tagsLabel=\u6807\u7b7e
 importedLabel=\u5df2\u5bfc\u5165
 captcha1Label=\u9a8c\u8bc1\u7801\uff1a
 captchaLabel=\u9a8c\u8bc1\u7801
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
 previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
diff --git a/i-nove/macro-comments.ftl b/i-nove/macro-comments.ftl
index 01f3bbb..145fdef 100644
--- a/i-nove/macro-comments.ftl
+++ b/i-nove/macro-comments.ftl
@@ -41,6 +41,7 @@
 <#if article.commentable>
 <table id="commentForm" class="comment-form">
     <tbody>
+        <#if !isLoggedIn>
         <tr>
             <td width="208px">
                 <input type="text" class="normalInput" id="commentName"/>
@@ -65,6 +66,7 @@
                 ${commentURLLabel}
             </td>
         </tr>
+        </#if>
         <tr>
             <td id="emotions" colspan="2">
                 <span class="em00" title="${em00Label}"></span>
@@ -89,6 +91,7 @@
                 <textarea rows="10" cols="96" id="comment"></textarea>
             </td>
         </tr>
+        <#if !isLoggedIn>
         <tr>
             <td>
                 <input type="text" class="normalInput" id="commentValidate"/>
@@ -97,6 +100,7 @@
                 <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
             </td>
         </tr>
+        </#if>
         <tr>
             <td colspan="2" align="right">
                 <span class="error-msg" id="commentErrorTip"></span>
diff --git a/mobile/macro-comments.ftl b/mobile/macro-comments.ftl
index 9c345a2..e9441cf 100644
--- a/mobile/macro-comments.ftl
+++ b/mobile/macro-comments.ftl
@@ -48,6 +48,7 @@
         </div>
         <div id="commentForm">
             <h3 id="respond">${postCommentsLabel}</h3>
+            <#if !isLoggedIn>
             <p>
                 <input type="text" id="commentName" size="22" tabindex="1"/>
                 <label for="author">${commentNameLabel} *</label>
@@ -62,17 +63,18 @@
                 <input type="text" id="commentURL" size="22" tabindex="3" />
                 <label for="url">${commentURLLabel}</label>
             </p>
-
+            </#if>
             <p>
                 <span id="commentErrorTip" style="display:none;"></span>
             </p>
             <p><textarea id="comment" tabindex="4"></textarea></p>
-
+            <#if !isLoggedIn>
             <p>
                 <input type="text" id="commentValidate" tabindex="5" />
                 <label for="url">${captchaLabel}</label>
                 <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
             </p>
+            </#if>
             <p>
                 <input class="reply-button" id="submitCommentButton" type="submit" onclick="page.submitComment();" value="${submmitCommentLabel}"  tabindex="6" />
             <div id="loading" style="display:none">
diff --git a/neoease/footer.ftl b/neoease/footer.ftl
index c505637..48ecd59 100644
--- a/neoease/footer.ftl
+++ b/neoease/footer.ftl
@@ -26,8 +26,6 @@
     };
     
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",
diff --git a/neoease/lang/lang_en_US.properties b/neoease/lang/lang_en_US.properties
index 5e48e09..c454373 100644
--- a/neoease/lang/lang_en_US.properties
+++ b/neoease/lang/lang_en_US.properties
@@ -37,8 +37,6 @@ linkLabel=Friend Links
 indexLabel=Home
 sumLabel=
 pageLabel=Page
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 adminLabel=Admin
 logoutLabel=Logout
 loginLabel=Login
diff --git a/neoease/lang/lang_zh_CN.properties b/neoease/lang/lang_zh_CN.properties
index c6c85ff..dd3f690 100644
--- a/neoease/lang/lang_zh_CN.properties
+++ b/neoease/lang/lang_zh_CN.properties
@@ -38,8 +38,6 @@ linkLabel=\u53cb\u60c5\u94fe\u63a5
 indexLabel=\u9996\u9875
 sumLabel=\u5171
 pageLabel=\u9875
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 adminLabel=\u7ba1\u7406
 logoutLabel=\u767b\u51fa
 loginLabel=\u767b\u5f55
diff --git a/neoease/macro-comments.ftl b/neoease/macro-comments.ftl
index e0b3e2d..507196c 100644
--- a/neoease/macro-comments.ftl
+++ b/neoease/macro-comments.ftl
@@ -42,6 +42,7 @@
     <h4>${postCommentsLabel}</h4>
     <table id="commentForm">
         <tbody>
+            <#if !isLoggedIn>
             <tr>
                 <td>
                     <input type="text" class="normalInput" id="commentName"/>
@@ -60,6 +61,7 @@
                     <label for="commentURL">${commentURLLabel}</label>
                 </td>
             </tr>
+            </#if>
             <tr>
                 <td id="emotions">
                     <span class="em00" title="${em00Label}"></span>
@@ -84,12 +86,14 @@
                     <textarea rows="10" cols="96" id="comment"></textarea>
                 </td>
             </tr>
+            <#if !isLoggedIn>
             <tr>
                 <td>
                     <input type="text" class="normalInput" id="commentValidate"/>
                     <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
                 </td>
             </tr>
+            </#if>
             <tr>
                 <td align="right">
                     <span class="tip" id="commentErrorTip"></span>
diff --git a/owmx-3.0/footer.ftl b/owmx-3.0/footer.ftl
index 70ac801..7b66efa 100644
--- a/owmx-3.0/footer.ftl
+++ b/owmx-3.0/footer.ftl
@@ -18,8 +18,6 @@
     };
     
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",
diff --git a/owmx-3.0/lang/lang_en_US.properties b/owmx-3.0/lang/lang_en_US.properties
index 2860965..8a1ab4f 100644
--- a/owmx-3.0/lang/lang_en_US.properties
+++ b/owmx-3.0/lang/lang_en_US.properties
@@ -169,8 +169,6 @@ tagsLabel=Tags
 importedLabel=Imported
 captcha1Label=Captcha:
 captchaLabel=Captcha
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
diff --git a/owmx-3.0/lang/lang_zh_CN.properties b/owmx-3.0/lang/lang_zh_CN.properties
index 0cedee0..2d1c583 100644
--- a/owmx-3.0/lang/lang_zh_CN.properties
+++ b/owmx-3.0/lang/lang_zh_CN.properties
@@ -169,8 +169,6 @@ tagsLabel=\u6807\u7b7e
 importedLabel=\u5df2\u5bfc\u5165
 captcha1Label=\u9a8c\u8bc1\u7801\uff1a
 captchaLabel=\u9a8c\u8bc1\u7801
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
 previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
diff --git a/owmx-3.0/macro-comments.ftl b/owmx-3.0/macro-comments.ftl
index 0200eb7..b4791e9 100644
--- a/owmx-3.0/macro-comments.ftl
+++ b/owmx-3.0/macro-comments.ftl
@@ -44,6 +44,7 @@
 <#if article.commentable>
 <table id="commentForm" class="comment-form">
     <tbody>
+        <#if !isLoggedIn>
         <tr>
             <td width="208px">
                 <input type="text" class="normalInput" id="commentName"/>
@@ -68,6 +69,7 @@
                 ${commentURLLabel}
             </td>
         </tr>
+        </#if>
         <tr>
             <td id="emotions" colspan="2">
                 <span class="em00" title="${em00Label}"></span>
@@ -92,6 +94,7 @@
                 <textarea rows="10" cols="96" id="comment"></textarea>
             </td>
         </tr>
+        <#if !isLoggedIn>
         <tr>
             <td>
                 <input type="text" class="normalInput" id="commentValidate"/>
@@ -100,6 +103,7 @@
                 <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
             </td>
         </tr>
+        </#if>
         <tr>
             <td colspan="2" align="right">
                 <span class="error-msg" id="commentErrorTip"></span>
diff --git a/timeline/footer.ftl b/timeline/footer.ftl
index 2d296e4..e173d56 100644
--- a/timeline/footer.ftl
+++ b/timeline/footer.ftl
@@ -47,8 +47,6 @@
                     "updatedLabel": "${updatedLabel}",
                     "contentLabel": "${contentLabel}",
                     "abstractLabel": "${abstractLabel}",
-                    "clearAllCacheLabel": "${clearAllCacheLabel}",
-                    "clearCacheLabel": "${clearCacheLabel}",
                     "moreLabel": "${moreLabel}",
                     "adminLabel": "${adminLabel}",
                     "logoutLabel": "${logoutLabel}",
diff --git a/timeline/lang/lang_en_US.properties b/timeline/lang/lang_en_US.properties
index e17a7ee..62f8e8a 100644
--- a/timeline/lang/lang_en_US.properties
+++ b/timeline/lang/lang_en_US.properties
@@ -40,8 +40,6 @@ linkLabel=Friend Links
 indexLabel=Home
 sumLabel=
 pageLabel=Page
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 adminLabel=Admin
 logoutLabel=Logout
 loginLabel=Login
diff --git a/timeline/lang/lang_zh_CN.properties b/timeline/lang/lang_zh_CN.properties
index 78ef41b..2b05a8c 100644
--- a/timeline/lang/lang_zh_CN.properties
+++ b/timeline/lang/lang_zh_CN.properties
@@ -42,8 +42,6 @@ linkLabel=\u53cb\u60c5\u94fe\u63a5
 indexLabel=\u9996\u9875
 sumLabel=\u5171
 pageLabel=\u9875
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 adminLabel=\u7ba1\u7406
 logoutLabel=\u767b\u51fa
 loginLabel=\u767b\u5f55
diff --git a/timeline/macro-comments.ftl b/timeline/macro-comments.ftl
index 0c39f0a..4a63513 100644
--- a/timeline/macro-comments.ftl
+++ b/timeline/macro-comments.ftl
@@ -32,6 +32,7 @@
 <h3>${commentLabel}</h3>
 <table class="comment-form" id="commentForm">
     <tbody>
+        <#if !isLoggedIn>
         <tr>
             <td>
                 <label for="commentName"> * ${commentNameLabel}</label>
@@ -50,6 +51,7 @@
                 <input type="text" id="commentURL"/>
             </td>
         </tr>
+        </#if>
         <tr>
             <td id="emotions">
                 <span class="em00" title="${em00Label}"></span>
@@ -74,12 +76,14 @@
                 <textarea style="width:96%" rows="10"  id="comment"></textarea>
             </td>
         </tr>
+        <#if !isLoggedIn>
         <tr>
             <td>
                 <input type="text" id="commentValidate"/>
                 <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
             </td>
         </tr>
+        </#if>
         <tr>
             <td>
                 <button id="submitCommentButton" onclick="page.submitComment();">${submmitCommentLabel}</button>
diff --git a/tree-house/footer.ftl b/tree-house/footer.ftl
index b837dea..9ab716d 100644
--- a/tree-house/footer.ftl
+++ b/tree-house/footer.ftl
@@ -16,8 +16,6 @@ Theme by <a rel="friend" href="http://www.thepixel.com/blog" target="_blank">Pix
     };
         
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",
diff --git a/tree-house/lang/lang_en_US.properties b/tree-house/lang/lang_en_US.properties
index 2860965..8a1ab4f 100644
--- a/tree-house/lang/lang_en_US.properties
+++ b/tree-house/lang/lang_en_US.properties
@@ -169,8 +169,6 @@ tagsLabel=Tags
 importedLabel=Imported
 captcha1Label=Captcha:
 captchaLabel=Captcha
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
diff --git a/tree-house/lang/lang_zh_CN.properties b/tree-house/lang/lang_zh_CN.properties
index 0cedee0..2d1c583 100644
--- a/tree-house/lang/lang_zh_CN.properties
+++ b/tree-house/lang/lang_zh_CN.properties
@@ -169,8 +169,6 @@ tagsLabel=\u6807\u7b7e
 importedLabel=\u5df2\u5bfc\u5165
 captcha1Label=\u9a8c\u8bc1\u7801\uff1a
 captchaLabel=\u9a8c\u8bc1\u7801
-clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58
-clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a
 previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a
diff --git a/tree-house/macro-comments.ftl b/tree-house/macro-comments.ftl
index 20ae0b5..9c9c684 100644
--- a/tree-house/macro-comments.ftl
+++ b/tree-house/macro-comments.ftl
@@ -50,6 +50,7 @@
         </div>
         <table id="commentForm" class="form">
             <tbody>
+                <#if !isLoggedIn>
                 <tr>
                     <th>
                         ${commentName1Label}
@@ -74,6 +75,7 @@
                         <input type="text" id="commentURL"/>
                     </td>
                 </tr>
+                </#if>
                 <tr>
                     <td id="emotions" colspan="2">
                         <span class="em00" title="${em00Label}"></span>
@@ -101,6 +103,7 @@
                         <textarea rows="10" cols="96" id="comment"></textarea>
                     </td>
                 </tr>
+                <#if !isLoggedIn>
                 <tr>
                     <th valign="top">
                         ${captcha1Label}
@@ -110,6 +113,7 @@
                         <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
                     </td>
                 </tr>
+                </#if>
                 <tr>
                     <td colspan="2" align="right">
                         <span class="error-msg" id="commentErrorTip"></span>