about #320

2013-10-18 14:49:02 +08:00
parent 1361e228e6
commit 33193cce0d
16 changed files with 130 additions and 75 deletions
--- a/ease/css/ease.min.css
+++ b/ease/css/ease.min.css
@@ -1,3 +1,18 @@
+/**
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 html,body,div,ul,li{margin:0;padding:0}
 body{font-family:Verdana,arial,'\5fae\8f6f\96c5\9ed1';font-size:12px;background-color:#fcfcfc}
 ::selection{background-color:#d5d5d5;color:#fcfcfc}
--- a/ease/footer.ftl
+++ b/ease/footer.ftl
@@ -47,8 +47,6 @@
        "updatedLabel": "${updatedLabel}",
        "contentLabel": "${contentLabel}",
        "abstractLabel": "${abstractLabel}",
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
        "adminLabel": "${adminLabel}",
        "logoutLabel": "${logoutLabel}",
        "skinDirName": "${skinDirName}",
--- a/ease/js/ease.min.js
+++ b/ease/js/ease.min.js
--- a/ease/lang/lang_en_US.properties
+++ b/ease/lang/lang_en_US.properties
@@ -39,8 +39,6 @@ linkLabel=Friend Links
 indexLabel=Home
 sumLabel=
 pageLabel=Page
-clearAllCacheLabel=Clear all cache
-clearCacheLabel=Clear cache
 adminLabel=Admin
 logoutLabel=Logout
 loginLabel=Login
--- a/ease/lang/lang_zh_CN.properties
+++ b/ease/lang/lang_zh_CN.properties
@@ -41,8 +41,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
--- a/ease/macro-comments.ftl
+++ b/ease/macro-comments.ftl
@@ -34,6 +34,7 @@
 <div class="form">
    <table id="commentForm">
        <tbody>
+            <#if !isLoggedIn>
            <tr>
                <td colspan="2">
                    <input type="text" class="normalInput" id="commentName"/>
@@ -52,6 +53,7 @@
                    <label for="commentURL">${commentURLLabel}</label>
                </td>
            </tr>
+            </#if>
            <tr>
                <td id="emotions" colspan="2">
                    <span class="em00" title="${em00Label}"></span>
@@ -76,12 +78,14 @@
                    <textarea rows="10" cols="96" id="comment"></textarea>
                </td>
            </tr>
+            <#if !isLoggedIn>
            <tr>
                <td colspan="2">
                    <input type="text" class="normalInput" id="commentValidate"/>
                    <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
                </td>
            </tr>
+            </#if>
            <tr>
                <td>
                    <span class="ft-gray" id="commentErrorTip"></span>
@@ -103,57 +107,57 @@
 <#macro comment_script oId>
 <script type="text/javascript" src="${staticServePath}/js/page${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
 <script type="text/javascript">
-    var page = new Page({
-        "nameTooLongLabel": "${nameTooLongLabel}",
-        "mailCannotEmptyLabel": "${mailCannotEmptyLabel}",
-        "mailInvalidLabel": "${mailInvalidLabel}",
-        "commentContentCannotEmptyLabel": "${commentContentCannotEmptyLabel}",
-        "captchaCannotEmptyLabel": "${captchaCannotEmptyLabel}",
-        "captchaErrorLabel": "${captchaErrorLabel}",
-        "loadingLabel": "${loadingLabel}",
-        "oId": "${oId}",
-        "skinDirName": "${skinDirName}",
-        "blogHost": "${blogHost}",
-        "randomArticles1Label": "${randomArticlesLabel}",
-        "externalRelevantArticles1Label": "${externalRelevantArticlesLabel}"
-    });
+                       var page = new Page({
+                           "nameTooLongLabel": "${nameTooLongLabel}",
+                           "mailCannotEmptyLabel": "${mailCannotEmptyLabel}",
+                           "mailInvalidLabel": "${mailInvalidLabel}",
+                           "commentContentCannotEmptyLabel": "${commentContentCannotEmptyLabel}",
+                           "captchaCannotEmptyLabel": "${captchaCannotEmptyLabel}",
+                           "captchaErrorLabel": "${captchaErrorLabel}",
+                           "loadingLabel": "${loadingLabel}",
+                           "oId": "${oId}",
+                           "skinDirName": "${skinDirName}",
+                           "blogHost": "${blogHost}",
+                           "randomArticles1Label": "${randomArticlesLabel}",
+                           "externalRelevantArticles1Label": "${externalRelevantArticlesLabel}"
+                       });

-    var addComment = function (result, state) {
-        var commentHTML = '<div id="' + result.oId + '"><img class="comment-header" \
-            title="' + $("#commentName" + state).val() + '" alt="' + $("#commentName" + state).val() + 
-            '" src="' + result.commentThumbnailURL + '"/><div class="comment-panel"><div class="left">' + result.replyNameHTML;
+                       var addComment = function(result, state) {
+                           var commentHTML = '<div id="' + result.oId + '"><img class="comment-header" \
+            title="' + $("#commentName" + state).val() + '" alt="' + $("#commentName" + state).val() +
+                                   '" src="' + result.commentThumbnailURL + '"/><div class="comment-panel"><div class="left">' + result.replyNameHTML;

-        if (state !== "") {
-            var commentOriginalCommentName = $("#" + page.currentCommentId + " .comment-panel>.left a").first().text();
-            commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
-                + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 20);"'
-                + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
-        }
-            
-        commentHTML += '</div><div class="right ft-gray">' +  result.commentDate.substring(2, 16)
-            + '&nbsp;<a rel="nofollow" href="javascript:replyTo(\'' + result.oId 
-            + '\');">${replyLabel}</a></div><span class="clear"></span><div class="article-body">' + 
-            Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
-            + '</div></div><span class="clear"></span></div>';
+                           if (state !== "") {
+                               var commentOriginalCommentName = $("#" + page.currentCommentId + " .comment-panel>.left a").first().text();
+                               commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
+                                       + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 20);"'
+                                       + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
+                           }

-        return commentHTML;
-    }
+                           commentHTML += '</div><div class="right ft-gray">' + result.commentDate.substring(2, 16)
+                                   + '&nbsp;<a rel="nofollow" href="javascript:replyTo(\'' + result.oId
+                                   + '\');">${replyLabel}</a></div><span class="clear"></span><div class="article-body">' +
+                                   Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br/>"))
+                                   + '</div></div><span class="clear"></span></div>';

-    var replyTo = function (id) {
-        var commentFormHTML = "<table class='form' id='replyForm'>";
-        page.addReplyForm(id, commentFormHTML);
-        $("#replyForm label").each(function () {
-            $this = $(this);
-            $this.attr("for", $this.attr("for") + "Reply");
-        });
-    };
+                           return commentHTML;
+                       }

-    $(document).ready(function () {
-        page.load();
-        ease.scrollToCmt();
-        // emotions
-        page.replaceCommentsEm("#comments .article-body");
-            <#nested>
-        });
+                       var replyTo = function(id) {
+                           var commentFormHTML = "<table class='form' id='replyForm'>";
+                           page.addReplyForm(id, commentFormHTML);
+                           $("#replyForm label").each(function() {
+                               $this = $(this);
+                               $this.attr("for", $this.attr("for") + "Reply");
+                           });
+                       };
+
+                       $(document).ready(function() {
+                           page.load();
+                           ease.scrollToCmt();
+                           // emotions
+                           page.replaceCommentsEm("#comments .article-body");
+                           <#nested>
+                       });
 </script>
 </#macro>