about #299

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}",

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:

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

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>