about #299

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:

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

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>