From 5734a8aa028c021e9f4b1661159fc84e6dd7fa4b Mon Sep 17 00:00:00 2001 From: wangdx Date: Mon, 5 May 2014 12:02:14 +0400 Subject: [PATCH 1/4] change owmx skin's info --- owmx-3.0/css/owmx-3.0.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/owmx-3.0/css/owmx-3.0.css b/owmx-3.0/css/owmx-3.0.css index 63ab10a..139b775 100644 --- a/owmx-3.0/css/owmx-3.0.css +++ b/owmx-3.0/css/owmx-3.0.css @@ -22,7 +22,7 @@ Date: 2010-09-13 Editor: Jonas Jacek License: CC Attribution-Share Alike 3.0 Unported Update: Dongxu Wang 2011-02-24 - @ http://lightdian.b3log.org/ + @ http://dx.b3log.org/ ==================================================*/ /* * skin owmx-3.0 style @@ -553,4 +553,4 @@ nav ul ul { } ::-webkit-scrollbar-thumb:hover { background-color: #888; -} \ No newline at end of file +} From 93cd483a2c05e2e490518d1bd3f176ff7cd952a0 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 29 May 2014 09:38:28 +0800 Subject: [PATCH 2/4] Fix #11975 --- community/article.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/article.ftl b/community/article.ftl index 8a6296d..00a6ec8 100644 --- a/community/article.ftl +++ b/community/article.ftl @@ -30,7 +30,7 @@ by  - + ${article.authorName} From 6495ae1cbf597c01ed39d7bbdc433b46a257bd89 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 3 Jun 2014 11:30:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ease=20=E7=9A=AE=E8=82=A4=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ease/css/ease.css | 8 +++++--- ease/css/ease.min.css | 4 ++-- ease/js/ease.js | 30 ++++-------------------------- ease/js/ease.min.js | 5 +++-- ease/macro-comments.ftl | 1 - ease/skin.properties | 2 +- 6 files changed, 15 insertions(+), 35 deletions(-) diff --git a/ease/css/ease.css b/ease/css/ease.css index 1d32ede..dd1a734 100644 --- a/ease/css/ease.css +++ b/ease/css/ease.css @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, B3log Team * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /* -* skin ease style +* Skin ease style. * * @author Liyuan Li -* @version 1.0.1.8, Aug 6, 2012 +* @version 1.0.2.8, Jun 3, 2014 */ /* start base */ html, body, div, ul, li { @@ -378,6 +379,7 @@ sup { .article-body ol, .article-body ul { margin-left: 40px; + padding-left: 0; } .article-body a { diff --git a/ease/css/ease.min.css b/ease/css/ease.min.css index 2d5fee9..8a6c15a 100644 --- a/ease/css/ease.min.css +++ b/ease/css/ease.min.css @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, B3log Team * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none} .article{border-bottom:1px solid #f6f6f6;padding:30px 50px} .article:hover{border-bottom-color:#ddd;box-shadow:0 0 1px #f6f6f6 inset;background-color:#fcfcfc} .article-body{line-height:145%;overflow:hidden;word-wrap:break-word;margin-bottom:10px;font-size:14px} -.article-body ol,.article-body ul{margin-left:40px} +.article-body ol,.article-body ul{margin-left:40px;padding-left:0} .article-body a{color:#808080;text-decoration:underline} .article-body a:vidited{color:#9a9a9a} .article-body a:hover{color:#676767} diff --git a/ease/js/ease.js b/ease/js/ease.js index 5f21457..f1543d8 100644 --- a/ease/js/ease.js +++ b/ease/js/ease.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, B3log Team * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ * @fileoverview ease js. * * @author Liyuan Li - * @version 1.0.1.5, Jan 29, 2013 + * @version 1.0.1.6, Nov 28, 2013 */ var goTranslate = function () { window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href); @@ -147,7 +147,7 @@ var ease = { setNavCurrent: function () { $(".nav ul a").each(function () { var $this = $(this); - if ($this.attr("href") === latkeConfig.servePath + location.pathname) { + if ($this.attr("href") === location.href) { $this.addClass("current"); } else if (/\/[0-9]+$/.test(location.pathname)) { $(".nav ul li")[0].className = "current"; @@ -237,20 +237,7 @@ var ease = { scrollEvent: function () { var _it = this; $(window).scroll(function () { - var y = $(window).scrollTop(), - topH = 0; - if ($("#top").css("display") === "block") { - topH = $("#top").height(); - } - - // header event - if (y >= _it.headerH + topH) { - _it.$nav.css("position", "fixed"); - _it.$body.css("marginTop", "55px"); - } else { - _it.$nav.css("position" ,"inherit"); - _it.$body.css("marginTop", "0"); - } + var y = $(window).scrollTop(); // go top icon show or hide if (y > _it.headerH) { @@ -293,15 +280,6 @@ var ease = { $(".article-body").each(function () { this.innerHTML = Util.replaceEmString($(this).html()); }); - }, - - /** - * @description 纠正评论滚动位置偏差 - */ - scrollToCmt: function () { - if ($(window.location.hash).length == 1) { - $(window).scrollTop($(window.location.hash).offset().top - 60); - } } }; diff --git a/ease/js/ease.min.js b/ease/js/ease.min.js index 3d10e04..a994197 100644 --- a/ease/js/ease.min.js +++ b/ease/js/ease.min.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, B3log Team * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,4 +13,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -var goTranslate=function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)};var getNextPage=function(){var $more=$(".article-next");currentPage+=1;var path="/articles/";if($("#tag").length===1){var pathnames=location.pathname.split("/");path="/articles/tags/"+pathnames[pathnames.length-1]+"/"}else if($("#archive").length===1){var pathnames=location.pathname.split("/");path="/articles/archives/"+pathnames[pathnames.length-2]+"/"+pathnames[pathnames.length-1]+"/"}else if($("#author").length===1){var pathnames=location.pathname.split("/");path="/articles/authors/"+pathnames[pathnames.length-1]+"/"}$.ajax({url:latkeConfig.servePath+path+currentPage,type:"GET",beforeSend:function(){$more.css("background","url("+latkeConfig.staticServePath+"/skins/ease/images/ajax-loader.gif) no-repeat scroll center center #fefefe")},success:function(result,textStatus){if(!result.sc){return}var articlesHTML="",pagination=result.rslts.pagination;for(var i=0;i'+'
'+"

"+''+article.articleTitle+"";if(article.hasUpdated){articlesHTML+=""+Label.updatedLabel+""}if(article.articlePutTop){articlesHTML+=""+Label.topArticleLabel+""}articlesHTML+="

"+'
'+''+ +article.articleCommentCount+"  "+Label.commentLabel+"  "+''+article.articleViewCount+"  "+Label.viewLabel+""+"
"+'
'+"
"+'
'+'
'+article.articleAbstract+"
"+'
'+"
"+'
';if(article.hasUpdated){articlesHTML+=Util.toDate(article.articleUpdateTime,"yy-MM-dd HH:mm")}else{articlesHTML+=Util.toDate(article.articleCreateTime,"yy-MM-dd HH:mm")}articlesHTML+=' '+article.authorName+""+"
"+'
'+Label.tag1Label+" ";var articleTags=article.articleTags.split(",");for(var j=0;j
'+""}$(".article-last").removeClass("article-last");$(".main>.wrapper>ul").append(articlesHTML);if(pagination.paginationPageCount===currentPage){$more.remove()}else{$more.css("background","none")}}})};var ease={$header:$(".header"),headerH:103,$body:$(".main > .wrapper"),$nav:$(".nav"),getCurrentPage:function(){var $next=$(".article-next");if($next.length>0){window.currentPage=$next.data("page")}},setNavCurrent:function(){$(".nav ul a").each(function(){var $this=$(this);if($this.attr("href")===latkeConfig.servePath+location.pathname){$this.addClass("current")}else if(/\/[0-9]+$/.test(location.pathname)){$(".nav ul li")[0].className="current"}})},initCommon:function(){Util.init();Util.replaceSideEm($(".recent-comments-content"));Util.buildTags("tagsSide")},initArchives:function(){var $archives=$(".archives");if($archives.length<1){return}$(".footer").css("marginTop","30px");var years=[],$archiveList=$archives.find("span").each(function(){var year=$(this).data("year"),tag=true;for(var i=0;i

"+years[j]+"

"+monthsHTML+""}$archives.html(yearsHTML);var $items=$(".archives>div"),line=0,top=0,heights=[];for(var m=0;m<$items.length;m++){for(var n=0;n<3;n++){if(m>=$items.length){break}$items[m].style.left=n*310+"px";if(line>0){if($items[m-3].style.top!==""){top=parseInt($items[m-3].style.top)}$items[m].style.top=$($items[m-3]).height()+60+top+"px";heights[n]=parseInt($items[m].style.top)+$($items[m]).height()+60}else{heights[n]=$($items[m]).height()+60}if(n<2){m+=1}}line+=1}$archives.height(heights.sort()[heights.length-1])},scrollEvent:function(){var _it=this;$(window).scroll(function(){var y=$(window).scrollTop(),topH=0;if($("#top").css("display")==="block"){topH=$("#top").height()}if(y>=_it.headerH+topH){_it.$nav.css("position","fixed");_it.$body.css("marginTop","55px")}else{_it.$nav.css("position","inherit");_it.$body.css("marginTop","0")}if(y>_it.headerH){var bodyH=$(window).height();var top=y+bodyH-21;if($("body").height()-58<=y+bodyH){top=$(".footer").offset().top-21}$("#goTop").fadeIn("slow").css("top",top)}else{$("#goTop").hide()}})},setDynamic:function(){var $dynamic=$(".dynamic");if($(".dynamic").length<1){return}var $comments=$dynamic.find(".side-comments"),$tags=$dynamic.find(".side-tags"),$mostComment=$dynamic.find(".side-most-comment"),$mostView=$dynamic.find(".side-most-view");if($comments.height()>$tags.height()){$tags.height($comments.height())}else{$comments.height($tags.height())}if($mostComment.height()>$mostView.height()){$mostView.height($mostComment.height())}else{$mostComment.height($mostView.height())}$(".article-body").each(function(){this.innerHTML=Util.replaceEmString($(this).html())})},scrollToCmt:function(){if($(window.location.hash).length==1){$(window).scrollTop($(window.location.hash).offset().top-60)}}};!function(){ease.getCurrentPage();ease.initCommon();ease.scrollEvent();ease.setNavCurrent();ease.initArchives();ease.setDynamic()}(); \ No newline at end of file +var goTranslate=function(){window.open("http://translate.google.com/translate?sl=auto&tl=auto&u="+location.href)};var getNextPage=function(){var $more=$(".article-next");currentPage+=1;var path="/articles/";if($("#tag").length===1){var pathnames=location.pathname.split("/");path="/articles/tags/"+pathnames[pathnames.length-1]+"/"}else{if($("#archive").length===1){var pathnames=location.pathname.split("/");path="/articles/archives/"+pathnames[pathnames.length-2]+"/"+pathnames[pathnames.length-1]+"/"}else{if($("#author").length===1){var pathnames=location.pathname.split("/");path="/articles/authors/"+pathnames[pathnames.length-1]+"/"}}}$.ajax({url:latkeConfig.servePath+path+currentPage,type:"GET",beforeSend:function(){$more.css("background","url("+latkeConfig.staticServePath+"/skins/ease/images/ajax-loader.gif) no-repeat scroll center center #fefefe")},success:function(result,textStatus){if(!result.sc){return}var articlesHTML="",pagination=result.rslts.pagination;for(var i=0;i'+'
'+"

"+''+article.articleTitle+"";if(article.hasUpdated){articlesHTML+=""+Label.updatedLabel+""}if(article.articlePutTop){articlesHTML+=""+Label.topArticleLabel+""}articlesHTML+="

"+'
'+''+ +article.articleCommentCount+"  "+Label.commentLabel+"  "+''+article.articleViewCount+"  "+Label.viewLabel+""+"
"+'
'+"
"+'
'+'
'+article.articleAbstract+"
"+'
'+"
"+'
';if(article.hasUpdated){articlesHTML+=Util.toDate(article.articleUpdateTime,"yy-MM-dd HH:mm")}else{articlesHTML+=Util.toDate(article.articleCreateTime,"yy-MM-dd HH:mm")}articlesHTML+=' '+article.authorName+""+"
"+'
'+Label.tag1Label+" ";var articleTags=article.articleTags.split(",");for(var j=0;j
'+""}$(".article-last").removeClass("article-last");$(".main>.wrapper>ul").append(articlesHTML);if(pagination.paginationPageCount===currentPage){$more.remove()}else{$more.css("background","none")}}})};var ease={$header:$(".header"),headerH:103,$body:$(".main > .wrapper"),$nav:$(".nav"),getCurrentPage:function(){var $next=$(".article-next");if($next.length>0){window.currentPage=$next.data("page")}},setNavCurrent:function(){$(".nav ul a").each(function(){var $this=$(this);if($this.attr("href")===location.href){$this.addClass("current")}else{if(/\/[0-9]+$/.test(location.pathname)){$(".nav ul li")[0].className="current"}}})},initCommon:function(){Util.init();Util.replaceSideEm($(".recent-comments-content"));Util.buildTags("tagsSide")},initArchives:function(){var $archives=$(".archives");if($archives.length<1){return}$(".footer").css("marginTop","30px");var years=[],$archiveList=$archives.find("span").each(function(){var year=$(this).data("year"),tag=true;for(var i=0;i

"+years[j]+"

"+monthsHTML+""}$archives.html(yearsHTML);var $items=$(".archives>div"),line=0,top=0,heights=[];for(var m=0;m<$items.length;m++){for(var n=0;n<3;n++){if(m>=$items.length){break}$items[m].style.left=(n*310)+"px";if(line>0){if($items[m-3].style.top!==""){top=parseInt($items[m-3].style.top)}$items[m].style.top=$($items[m-3]).height()+60+top+"px";heights[n]=parseInt($items[m].style.top)+$($items[m]).height()+60}else{heights[n]=$($items[m]).height()+60}if(n<2){m+=1}}line+=1}$archives.height(heights.sort()[heights.length-1])},scrollEvent:function(){var _it=this;$(window).scroll(function(){var y=$(window).scrollTop();if(y>_it.headerH){var bodyH=$(window).height();var top=y+bodyH-21;if($("body").height()-58<=y+bodyH){top=$(".footer").offset().top-21}$("#goTop").fadeIn("slow").css("top",top)}else{$("#goTop").hide()}})},setDynamic:function(){var $dynamic=$(".dynamic");if($(".dynamic").length<1){return +}var $comments=$dynamic.find(".side-comments"),$tags=$dynamic.find(".side-tags"),$mostComment=$dynamic.find(".side-most-comment"),$mostView=$dynamic.find(".side-most-view");if($comments.height()>$tags.height()){$tags.height($comments.height())}else{$comments.height($tags.height())}if($mostComment.height()>$mostView.height()){$mostView.height($mostComment.height())}else{$mostComment.height($mostView.height())}$(".article-body").each(function(){this.innerHTML=Util.replaceEmString($(this).html())})}};(function(){ease.getCurrentPage();ease.initCommon();ease.scrollEvent();ease.setNavCurrent();ease.initArchives();ease.setDynamic()})(); \ No newline at end of file diff --git a/ease/macro-comments.ftl b/ease/macro-comments.ftl index da73886..78facac 100644 --- a/ease/macro-comments.ftl +++ b/ease/macro-comments.ftl @@ -158,7 +158,6 @@ $(document).ready(function() { page.load(); - ease.scrollToCmt(); // emotions page.replaceCommentsEm("#comments .article-body"); <#nested> diff --git a/ease/skin.properties b/ease/skin.properties index 3f63644..6a95b2f 100644 --- a/ease/skin.properties +++ b/ease/skin.properties @@ -16,7 +16,7 @@ # # Description: ease skin. -# Version: 1.0.0.5, Apr 26, 2013 +# Version: 1.0.0.7, Apr 24, 2014 # Author: Liyuan Li # Author: Liang Ding # From eb96e8240fba6d720104e2b5a7c216713dbd4a7c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 17 Jun 2014 17:00:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20community=20=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E8=AF=84=E8=AE=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- community/macro-comments.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/macro-comments.ftl b/community/macro-comments.ftl index f4a421f..a5e4c90 100644 --- a/community/macro-comments.ftl +++ b/community/macro-comments.ftl @@ -136,7 +136,7 @@ <#macro comment_script oId> - +