about #299

timeline/footer.ftl

@@ -47,8 +47,6 @@
                     "updatedLabel": "${updatedLabel}",
                     "contentLabel": "${contentLabel}",
                     "abstractLabel": "${abstractLabel}",
-                    "clearAllCacheLabel": "${clearAllCacheLabel}",
-                    "clearCacheLabel": "${clearCacheLabel}",
                     "moreLabel": "${moreLabel}",
                     "adminLabel": "${adminLabel}",
                     "logoutLabel": "${logoutLabel}",

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

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

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>