about #299

andrea/footer.ftl

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

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:

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

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>

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>

community/footer.ftl

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

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:

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

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>

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>

i-nove/footer.ftl

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

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:

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

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>

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

neoease/footer.ftl

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

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

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

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>

owmx-3.0/footer.ftl

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

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:

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

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>

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>

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>