Merge pull request #2 from noday/master

增加5style和idream预览图片

5styles/css/5styles.css

@@ -554,7 +554,7 @@ cursor: hand;
 	width:157px;
 }
 .em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14 {
-	background-image:url("../images/emotions.png");
+	background-image:url("../images/emotions/emotions-ease.png");
 	float:left;
 	height:24px;
 	margin-right:5px;

5styles/lang/lang_en_US.properties

@@ -55,21 +55,21 @@ recentCommentsLabel=Recent Comments
 postCommentsLabel=Post Comment
 mostCommentArticlesLabel=Most Comment Articles
 mostViewCountArticlesLabel=Most View Articles
-em00Label=Cheeky
-em01Label=Daze
-em02Label=Shy
-em03Label=Cute
-em04Label=Bared teeth
-em05Label=Dizzy
-em06Label=No Comments
-em07Label=Grin
-em08Label=Contempt
-em09Label=Pull the nose
-em10Label=Lucky
-em11Label=Sad
-em12Label=Surprise
-em13Label=Cry
-em14Label=Scare
+em00Label=Smile
+em01Label=Laughter
+em02Label=Happy
+em03Label=Sad
+em04Label=Cry
+em05Label=No Comments
+em06Label=Fidget
+em07Label=Angry
+em08Label=Look Around
+em09Label=Surprise
+em10Label=Cool
+em11Label=Cheeky
+em12Label=Heart
+em13Label=Heart Broken
+em14Label=Devil
 linkLabel=Friend Links
 sumLabel=
 pageLabel=Page

5styles/lang/lang_zh_CN.properties

@@ -33,21 +33,21 @@ recentCommentsLabel=\u6700\u65b0\u8bc4\u8bba
 postCommentsLabel=\u53d1\u8868\u8bc4\u8bba
 mostCommentArticlesLabel=\u8bc4\u8bba\u6700\u591a\u7684\u6587\u7ae0
 mostViewCountArticlesLabel=\u8bbf\u95ee\u6700\u591a\u7684\u6587\u7ae0
-em00Label=\u987d\u76ae
-em01Label=\u53d1\u5446
-em02Label=\u5bb3\u7f9e
-em03Label=\u53ef\u7231
-em04Label=\u5472\u7259
-em05Label=\u6655
-em06Label=\u65e0\u8bed
-em07Label=\u574f\u7b11
-em08Label=\u9119\u89c6
-em09Label=\u62a0\u9f3b
-em10Label=\u5077\u7b11
-em11Label=\u96be\u8fc7
-em12Label=\u60ca\u8bb6
-em13Label=\u6d41\u6cea
-em14Label=\u5413
+em00Label=\u5fae\u7b11
+em01Label=\u5927\u7b11
+em02Label=\u9ad8\u5174
+em03Label=\u60b2\u4f24
+em04Label=\u54ed\u6ce3
+em05Label=\u65e0\u8bed
+em06Label=\u70e6\u8e81
+em07Label=\u751f\u6c14
+em08Label=\u6211\u7785
+em09Label=\u60ca\u8bb6
+em10Label=\u9177
+em11Label=\u987d\u76ae
+em12Label=\u7231\u5fc3
+em13Label=\u5fc3\u788e
+em14Label=\u9b54\u9b3c
 linkLabel=\u53cb\u60c5\u94fe\u63a5
 sumLabel=\u5171
 pageLabel=\u9875

5styles/readme.txt

@@ -1,5 +1,5 @@
 # http://www.noday.net/
-# 最新代码地址:http://code.google.com/p/noday/
+# 最新代码地址:https://github.com/noday/b3log-solo-third-skins
 # 注:最新代码可能会修复一些bug、增加功能或修改了样式.
 #
 #

idream/css/idream.css

@@ -741,7 +741,7 @@ div.copyr {
 	width: 162px;
 }
 .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 {
-	background-image: url("/images/emotions-black.png");
+	background-image: url("../images/emotions/emotions-black.png");
 }
 .error-msg {
 	color: #3366CC;

idream/footer.ftl

@@ -45,7 +45,8 @@
     };
     $(document).ready(function () {
     	//Util.goTop();Util.goBottom();
-    	Util.init();Util.replaceSideEm($(".side-navi .navi-comments li div.left"));
+    	Util.init();Util.replaceSideEm($("#newcomment li"));
+
     });
     
     // set selected navi

idream/macro-comments.ftl

@@ -25,7 +25,7 @@
                 </div>
                 <div class="right">
                 	<#if article.commentable>
-                    <a class="no-underline" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
+                    <a rel="nofollow" class="no-underline" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
                     </#if>
                 </div>
                 <div class="clear"></div>
@@ -135,26 +135,19 @@
             + '<div><img alt="' + $("#commentName" + state).val() + '" src="' +
             result.commentThumbnailURL + '"/></div>' + result.replyNameHTML;
 
-        <#--if ($("#commentURL" + state).val().replace(/\s/g, "") === "") {
-            commentHTML += '<a>' + $("#commentName" + state).val() + '</a>';
-        } else {
-            commentHTML += '<a href="http://' + $("#commentURL" + state).val() + '" target="_blank">' + 
-                $("#commentName" + state).val() + '</a>';
-        }-->
         commentHTML += '</div><div class="left comment-info"><div class="left">' + result.commentDate;
         if (state !== "") {
             var commentOriginalCommentName = $("#" + page.currentCommentId).find(".comment-author a").text();
-            commentHTML += '&nbsp;@&nbsp;<a href="' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
-                + 'onmouseover="showComment(this, \'' + page.currentCommentId + '\');"'
+            commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
+                + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 3);"'
                 + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
         }
-        commentHTML += '</div><div class="right"> <a class="no-underline" href="javascript:replyTo(\''
+        commentHTML += '</div><div class="right"> <a rel="nofollow" class="no-underline" href="javascript:replyTo(\''
             + result.oId + '\');">${replyLabel}</a>'
             +'</div><div class="clear"></div><div class="comment-content">'
             + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
             + '</div></div><div class="clear"></div></div></div>';
 
-        <#--page.addCommentAjax(commentHTML, state);-->
         $("#comments").addClass("comments");
         return commentHTML;
     }
@@ -162,20 +155,7 @@
     var replyTo = function (id) {
         var commentFormHTML = "<table class='marginTop12 comment-form' id='replyForm'>";
         page.addReplyForm(id, commentFormHTML);
-    }
-
-    // var showComment = function (it, id) {
-    //     if ( $("#commentRef" + id).length > 0) {
-    //         $("#commentRef" + id).show();
-    //     } else {
-    //         var $refComment = $("#" + id + " .comment-panel").clone();
-    //         $refComment.removeClass().addClass("comment-body-ref").attr("id", "commentRef" + id);
-    //         $("#comments").append($refComment);
-    //     }
-    //     var position =  $(it).position();
-    //     $("#commentRef" + id).css("top", (position.top + 18) + "px");
-    // };
-
+    };
     (function () {
         page.load();
         // emotions

idream/readme.txt

@@ -1,5 +1,5 @@
 # http://www.noday.net/
-# 最新代码地址:http://code.google.com/p/noday/
+# 最新代码地址:https://github.com/noday/b3log-solo-third-skins
 # 注:最新代码可能会修复一些bug、增加功能或修改了样式.
 #
 #