about #320

2013-10-18 14:49:02 +08:00 · 2013-10-18 14:49:02 +08:00 · 33193cce0d
commit 33193cce0d
parent 1361e228e6
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>
--- a/metro-hot/css/metro-hot-responsive.css
+++ b/metro-hot/css/metro-hot-responsive.css
@ -115,7 +115,6 @@

    .online-count, 
    .user, 
-    .clear, 
    .notice-board,
    .share,
    .article-relative {
--- a/metro-hot/css/metro-hot-responsive.min.css
+++ b/metro-hot/css/metro-hot-responsive.min.css
@ -1 +1,16 @@
+/**
+ * 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.
+ */
@media (max-width:860px) and (min-width:460px){.wrapper{width:720px} .main{width:460px} .form{width:auto} .form input{width:395px} .form textarea{width:434px} .em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{margin-right:4px} #comments .article-body{width:340px} #dynamic #comments .article-body{width:283px} .most-comment,.most-view{width:300px;margin-bottom:20px;margin-top:40px} .most-comment .text,.most-view .text{width:195px} .tags-tile,.links-tile,.archives-tile{width:670px} .tags-tile .text,.links-tile .text,.archives-tile .text{width:580px} .links-tile,.tags-tile{margin-left:0}}@media (max-width:460px){.side,.top-info,.header>.fn-left,.comment-main{float:none} .wrapper,.article-list>div,.main,.side{width:300px} .sub-nav>.pagination,.footer,#comments>div>img,#emotions{display:none} #search{width:237px} .side-tile{width:94px} .online-count,.user,.clear,.notice-board,.share,.article-relative{width:249px} .main .pagination,.main>.article-body,.comment-disabled,#comments>div{margin-right:0} .side>div,#comments .article-body{position:static !important;width:auto !important} .share div.text{left:173px} .form{width:auto} .form input{width:240px} .form textarea{width:285px;height:150px} #dynamic .main{margin-bottom:20px} .tags-tile{margin-bottom:50px} .article-title{width:280px} .archives{margin-right:0} .article-info>a{padding:3px;font-size:12px} #dynamic #comments{padding-left:15px} .tags-tile .title,.links-tile .title,.most-comment .title,.most-view .title{float:right;font-size:15px;font-weight:bold;margin:20px 0 0 40px} .most-comment,.most-view{width:249px;margin-left:0} .most-comment .text,.most-view .text{margin-right:0;width:274px;font-size:12px;font-weight:normal} .tags-tile,.links-tile{width:249px;margin-left:0} .tags-tile .text,.links-tile .text{width:249px}}
--- a/metro-hot/css/metro-hot.css
+++ b/metro-hot/css/metro-hot.css
@ -241,7 +241,6 @@ textarea {
 }

 .footer a:hover,
-.clear a:hover,
 .article-relative a:hover,
 .article-abstract .article-title a:hover,
 .article-abstract .article-tags a:hover,
@ -574,7 +573,6 @@ textarea {

 .online-count,
 .user,
-.clear,
 .notice-board,
 .share,
 .article-relative {
@ -603,7 +601,6 @@ textarea {
    background-color: #7B4F9D;
 }

-.clear,
 .next,
 .prev {
    background-color: #E61E1E;
--- a/metro-hot/css/metro-hot.min.css
+++ b/metro-hot/css/metro-hot.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.
+ */
@charset "utf-8";
@font-face{font-family:'IcoMoon';src:url('font/IcoMoon.eot');src:url('font/IcoMoon.eot?#iefix') format('embedded-opentype'),url('font/IcoMoon.svg#IcoMoon') format('svg'),url('font/IcoMoon.woff') format('woff'),url('font/IcoMoon.ttf') format('truetype');font-weight:normal;font-style:normal}[data-ico]:before{font-family:'IcoMoon';content:attr(data-ico);speak:none;cursor:pointer}
 html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}
--- a/metro-hot/footer.ftl
+++ b/metro-hot/footer.ftl
@ -12,8 +12,6 @@
        "updatedLabel": "${updatedLabel}",
        "contentLabel": "${contentLabel}",
        "abstractLabel": "${abstractLabel}",
-        "clearAllCacheLabel": "${clearAllCacheLabel}",
-        "clearCacheLabel": "${clearCacheLabel}",
        "adminLabel": "${adminLabel}",
        "logoutLabel": "${logoutLabel}",
        "skinDirName": "${skinDirName}",
--- a/metro-hot/js/metro-hot.min.js
+++ b/metro-hot/js/metro-hot.min.js
--- a/metro-hot/macro-comments.ftl
+++ b/metro-hot/macro-comments.ftl
@ -6,6 +6,7 @@

 <table id="commentForm" class="form">
    <tbody>
+        <#if !isLoggedIn>
        <tr>
            <td colspan="2">
                <input type="text" id="commentName"/>
@ -24,6 +25,7 @@
                <label for="commentURL">${commentURLLabel}</label>
            </td>
        </tr>
+        </#if>
        <tr>
            <td id="emotions" colspan="2">
                <span class="em00" title="${em00Label}"></span>
@ -49,12 +51,14 @@
                <textarea rows="10" cols="96" id="comment"></textarea>
            </td>
        </tr>
+        <#if !isLoggedIn>
        <tr>
            <td colspan="2">
                <input type="text" id="commentValidate"/>
                <img id="captcha" alt="validate" src="${servePath}/captcha.do" />
            </td>
        </tr>
+        </#if>
        <tr>
            <td>
                <span id="commentErrorTip" class="tip"></span>
--- a/metro-hot/macro-side.ftl
+++ b/metro-hot/macro-side.ftl
@ -155,18 +155,6 @@
            <div class="text"></div>
        </div>

-        <div class="clear side-tile">
-            <span data-ico="&#xe003;"></span>
-            <div class="title">
-                ${clearCachePageLabel}
-            </div>
-            <div class="text">
-                <a href="javascript:Util.clearCache();">${clearCacheLabel}</a>
-                <br />
-                <a href="javascript:Util.clearCache('all');">${clearAllCacheLabel}</a>
-            </div>
-        </div>
-
        <a href="${servePath}/admin-index.do#main" class="settings side-tile">
            <span data-ico="&#x0070;"></span>
            <div class="title">
--- a/mobile/lang/lang_en_US.properties
+++ b/mobile/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:
--- a/mobile/lang/lang_zh_CN.properties
+++ b/mobile/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