about #299

favourite/footer.ftl

@@ -21,8 +21,6 @@
     };
     
     var Label = {
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
         "adminLabel": "${adminLabel}",
         "logoutLabel": "${logoutLabel}",
         "skinDirName": "${skinDirName}",

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:

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

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>