Skip to content

S
solo-1
Commit f61bd1d3 authored by D's avatar D Committed by GitHub
Browse files
Options

Merge pull request #12129 from b3log/1.5.0-dev 

1.5.0 dev
parents 0473873a ee5f2d0d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3471 additions and 1324 deletions
pom.xml
View file @ f61bd1d3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.11.1.22, Jun 28, 2016 Version: 3.11.1.23, Jul 7, 2016
Author: <a href="http://88250.b3log.org">Liang Ding</a> Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a> Author: <a href="http://www.annpeter.cn">Ann Peter</a>
--> -->
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.b3log.latke.version>2.0.4</org.b3log.latke.version> <org.b3log.latke.version>2.2.6</org.b3log.latke.version>
<servlet.version>3.1.0</servlet.version> <servlet.version>3.1.0</servlet.version>
<slf4j.version>1.7.5</slf4j.version> <slf4j.version>1.7.5</slf4j.version>
......
src/main/webapp/js/common.js
View file @ f61bd1d3
...@@ -203,7 +203,7 @@ var Util = { ...@@ -203,7 +203,7 @@ var Util = {
} }
} }
// 按字母或者中文拼音进行排序 // 按字母或者中文拼音进行排序
$("#" + id).html($("#" + id + " li").get().sort(function(a, b) { $("#" + id).html($("#" + id + " li").get().sort(function(a, b) {
var valA = $(a).find("span").text().toLowerCase(); var valA = $(a).find("span").text().toLowerCase();
var valB = $(b).find("span").text().toLowerCase(); var valB = $(b).find("span").text().toLowerCase();
......
src/main/webapp/skins/next/archive-articles.ftl deleted 100644 → 0
View file @ 0473873a
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<h2 class="classify-name">
${archive1Label}
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount})
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount})
</#if>
</h2>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/next/archives.ftl
View file @ f61bd1d3
...@@ -8,36 +8,37 @@ ...@@ -8,36 +8,37 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <#include "header.ftl">
<main class="classify"> <main class="main wrapper">
<article> <div class="content page-archive">
<header> <section class="posts-collapse">
<h2> <span class="archive-move-on"></span>
<a rel="archive" href="${servePath}/archives.html"> <span class="archive-page-counter">
${archiveLabel} 嗯..! 目前共计 ${statistic.statisticPublishedBlogArticleCount} 篇日志。 继续努力。
</a> </span>
</h2> <#if 0 != archiveDates?size>
</header>
<#if 0 != archiveDates?size>
<ul class="tags fn-clear">
<#list archiveDates as archiveDate> <#list archiveDates as archiveDate>
<li> <article>
<#if "en" == localeString?substring(0, 2)> <header class="post-header">
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}" <h1>
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})"> <#if "en" == localeString?substring(0, 2)>
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})</a> <a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
<#else> ${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}" </a>
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})"> <#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a> <a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
</#if> ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
</li> </a>
</#if>
</h1>
</header>
</article>
</#list> </#list>
</ul> </#if>
</#if> </section>
</article> </div>
<#include "side.ftl">
<#include "footer.ftl">
</main> </main>
<#include "footer.ftl">
</body> </body>
</html> </html>
src/main/webapp/skins/next/article-list.ftl
View file @ f61bd1d3
<#list articles as article> <section class="posts-expand">
<article> <#list articles as article>
<header> <article class="post-item">
<h2> <header>
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <h1>
${article.articleTitle} <a class="post-title-link" rel="bookmark" href="${servePath}${article.articlePermalink}">
</a> ${article.articleTitle}
<#if article.articlePutTop> </a>
<sup> <#if article.articlePutTop>
${topArticleLabel} <sup>
</sup> ${topArticleLabel}
</#if> </sup>
<#if article.hasUpdated> </#if>
<sup> <#if article.hasUpdated>
${updatedLabel} <sup>
</sup> ${updatedLabel}
</#if> </sup>
</h2> </#if>
</h1>
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time> <div class="post-meta">
</header> <span>
<section class="abstract"> 发表于
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
</time>
</span>
<span>
&nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments">
${article.articleCommentCount}条评论</a>
</span>
&nbsp; | &nbsp;热度 ${article.articleViewCount}°C
</div>
</header>
${article.articleAbstract} ${article.articleAbstract}
</section> <div class="post-more-link">
<footer class="tags"> <a href="${servePath}${article.articlePermalink}/#more" rel="contents">
<span class="icon-tag"></span> &nbsp; 阅读全文 &raquo;
<#list article.articleTags?split(",") as articleTag> </a>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}"> </div>
${articleTag}</a> </article>
</#list> </#list>
</section>
<a rel="nofollow" href="${servePath}/authors/${article.authorId}">
<img class="avatar" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/>
</a>
</footer>
</article>
</#list>
<#if 0 != paginationPageCount> <#if 0 != paginationPageCount>
<nav class="pagination"> <nav class="pagination">
<#if 1 != paginationPageNums?first> <#if 1 != paginationPageNums?first>
<a href="${servePath}${path}/${paginationPreviousPageNum}" class="extend">${previousPageLabel}</a> <a href="${servePath}${path}/${paginationPreviousPageNum}" class="extend next"><<</a>
<a class="page-num" href="${servePath}${path}/1">1</a> ... <a class="page-number" href="${servePath}${path}/1">1</a> ...
</#if> </#if>
<#list paginationPageNums as paginationPageNum> <#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum> <#if paginationPageNum == paginationCurrentPageNum>
<span class="current page-num">${paginationPageNum}</span> <span class="page-number current">${paginationPageNum}</span>
<#else> <#else>
<a class="page-num" href="${servePath}${path}/${paginationPageNum}">${paginationPageNum}</a> <a class="page-number" href="${servePath}${path}/${paginationPageNum}">${paginationPageNum}</a>
</#if> </#if>
</#list> </#list>
<#if paginationPageNums?last != paginationPageCount> ... <#if paginationPageNums?last != paginationPageCount> ...
<a href="${servePath}${path}/${paginationPageCount}" class="page-num">${paginationPageCount}</a> <a href="${servePath}${path}/${paginationPageCount}" class="page-number">${paginationPageCount}</a>
<a href="${servePath}${path}/${paginationNextPageNum}" class="extend">${nextPagePabel}</a> <a href="${servePath}${path}/${paginationNextPageNum}" class="extend next">>></a>
</#if> </#if>
</nav> </nav>
</#if> </#if>
\ No newline at end of file \ No newline at end of file
src/main/webapp/skins/next/article.ftl
View file @ f61bd1d3
...@@ -9,80 +9,82 @@ ...@@ -9,80 +9,82 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <#include "header.ftl">
<main> <main class="main wrapper">
<article class="post article-body"> <div class="content">
<header> <article class="posts-expand">
<h2> <header class="post-header">
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <h1 class="post-title">
${article.articleTitle} ${article.articleTitle}
</a> <#if article.articlePutTop>
<#if article.articlePutTop> <sup>
<sup> ${topArticleLabel}
${topArticleLabel} </sup>
</sup> </#if>
</#if> <#if article.hasUpdated>
<#if article.hasUpdated> <sup>
<sup> ${updatedLabel}
${updatedLabel} </sup>
</sup> </#if>
</#if> </h1>
</h2> <div class="post-meta">
<time><span class="icon-date"></span> ${article.articleCreateDate?string("yyyy-MM-dd")}</time> <span class="post-time">
发表于
<section class="tags"> <time>
<span class="icon-tag"></span> &nbsp; ${article.articleCreateDate?string("yyyy-MM-dd")}
<#list article.articleTags?split(",") as articleTag> </time>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}"> </span>
${articleTag}</a> <span class="post-comments-count">
</#list> &nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments">
<a rel="nofollow" href="${servePath}/authors/${article.authorId}"> ${article.articleCommentCount}条评论</a>
<img class="avatar" title="${article.authorName}" alt="${article.authorName}" src="${article.authorThumbnailURL}"/> </span>
</a> &nbsp; | &nbsp;热度
</section> ${article.articleViewCount}°C
</header> </div>
<section class="abstract"> </header>
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
<#if nextArticlePermalink?? || previousArticlePermalink??> <div class="post-body">
<aside class="fn-clear"> ${article.articleContent}
<#if previousArticlePermalink??> <#if "" != article.articleSign.signHTML?trim>
<a class="fn-left" rel="prev" href="${servePath}${previousArticlePermalink}"> <div>
<strong>&lt;</strong> ${previousArticleTitle} ${article.articleSign.signHTML}
</a> </div>
</#if> </#if>
<#if nextArticlePermalink??>
<a class="fn-right" rel="next" href="${servePath}${nextArticlePermalink}">
${nextArticleTitle} <strong>&gt;</strong>
</a>
</#if>
</aside>
</#if>
</section>
<footer class="fn-clear share">
<div class="fn-right">
<span class="icon icon-t-weibo" data-type="tencent"></span>
<span class="icon icon-weibo" data-type="weibo"></span>
<span class="icon icon-twitter" data-type="twitter"></span>
<span class="icon icon-gplus" data-type="google"></span>
</div> </div>
</footer> <footer>
</article> <div class="post-tags">
<#list article.articleTags?split(",") as articleTag>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a>
</#list>
</div>
<div class="post-nav fn-clear">
<#if previousArticlePermalink??>
<div class="post-nav-prev post-nav-item fn-left">
<a href="${servePath}${previousArticlePermalink}" rel="next" title="${previousArticleTitle}">
< ${previousArticleTitle}
</a>
</div>
</#if>
<#if nextArticlePermalink??>
<div class="post-nav-next post-nav-item fn-right">
<a href="${servePath}${nextArticlePermalink}" rel="prev" title="${nextArticleTitle}">
${nextArticleTitle} >
</a>
</div>
</#if>
</div>
</footer>
</article>
</div>
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
<#include "side.ftl">
<#include "footer.ftl">
<@comment_script oId=article.oId>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
</@comment_script>
</main> </main>
<#include "footer.ftl">
<@comment_script oId=article.oId>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
</@comment_script>
</body> </body>
</html> </html>
src/main/webapp/skins/next/author-articles.ftl deleted 100644 → 0
View file @ 0473873a
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${authorName} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${authorName}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<h2 class="classify-name">
${author1Label}${authorName}
</h2>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/next/css/fonts/icomoon.eot 100644 → 100755
View file @ f61bd1d3
No preview for this file type
src/main/webapp/skins/next/css/fonts/icomoon.svg 100644 → 100755
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/css/fonts/icomoon.ttf 100644 → 100755
View file @ f61bd1d3
No preview for this file type
src/main/webapp/skins/next/css/fonts/icomoon.woff 100644 → 100755
View file @ f61bd1d3
No preview for this file type
src/main/webapp/skins/next/css/fonts/selection.json 100644 → 100755
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/css/main.css 0 → 100644
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/css/next.css
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/dynamic.ftl
View file @ f61bd1d3
...@@ -8,86 +8,38 @@ ...@@ -8,86 +8,38 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <#include "header.ftl">
<main class="dynamic"> <main class="main wrapper">
<#if 0 != recentComments?size> <div class="content">
<ul class="comments"> <#if 0 != recentComments?size>
<#list recentComments as comment> <ul class="comments" id="comments">
<#if comment_index < 6> <#list recentComments as comment>
<li> <li class="fn-clear">
<img class="avatar" title="${comment.commentName}" <img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
alt="${comment.commentName}" src="${comment.commentThumbnailURL}"> <div class="comment-body">
<div class="content"> <div class="fn-clear comment-meta">
<div class="fn-clear post-meta"> <span class="fn-left">
<span class="fn-left"> <#if "http://" == comment.commentURL>
<#if "http://" == comment.commentURL> <span>${comment.commentName}</span>
<span>${comment.commentName}</span> <#else>
<#else> <a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a> </#if>
</#if> <time>${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
<time>${comment.commentDate?string("yy-MM-dd HH")}</time> </span>
</span> <a class="fn-right" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a>
<a class="fn-right" href="${servePath}${comment.commentSharpURL}">${viewLabel}»</a> </div>
<div class="comment-content">
${comment.commentContent}
</div>
</div> </div>
<div class="comment-content">
${comment.commentContent}
</div>
</div>
</li>
</#if>
</#list>
</ul>
</#if>
<#if 0 != mostCommentArticles?size || 0 != mostViewCountArticles?size>
<#if 0 != mostCommentArticles?size>
<article>
<header>
<h2>
${mostCommentArticlesLabel}
</h2>
</header>
<ul>
<#list mostCommentArticles as article>
<li>
<a href="${servePath}${article.articlePermalink}" title="${article.articleTitle}" rel="nofollow">
${article.articleTitle}
</a>
<span data-ico="&#xe14e;">
${article.articleCommentCount}
</span>
</li> </li>
</#list> </#list>
</ul> </ul>
</article> </#if>
</#if> </div>
<#if 0 != mostViewCountArticles?size> <#include "side.ftl">
<article>
<header>
<h2>
${mostViewCountArticlesLabel}
</h2>
</header>
<ul>
<#list mostViewCountArticles as article>
<li>
<a href="${servePath}${article.articlePermalink}" title="${article.articleTitle}" rel="nofollow">
${article.articleTitle}
</a>
<span data-ico="&#xe185;">
${article.articleViewCount}
</span>
</li>
</#list>
</ul>
</article>
</#if>
</#if>
<#include "footer.ftl">
</main> </main>
<#include "footer.ftl">
<script> <script>
var $commentContents = $(".comments .comment-content"); var $commentContents = $(".comments .comment-content");
......
src/main/webapp/skins/next/footer.ftl
View file @ f61bd1d3
<footer class="footer"> <footer class="footer">
<div class="fn-clear"> <div class="wrapper">
<span class="fn-right"> <a href="${servePath}">${blogTitle}</a> •
${viewCount1Label}${statistic.statisticBlogViewCount} ${onlineVisitor1Label}${onlineVisitorCnt} <br/>
&nbsp;
${articleCount1Label}${statistic.statisticPublishedBlogArticleCount}
&nbsp;
${commentCount1Label}${statistic.statisticPublishedBlogCommentCount}
&nbsp;
${onlineVisitor1Label}${onlineVisitorCnt}
</span>
</div>
<div class="fn-clear">
<a href="${servePath}">${blogTitle}</a>
&copy; ${year} &copy; ${year}
${footerContent} ${footerContent}
<span class="fn-right"> Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> •
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}
<a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}
</span>
</div> </div>
<span onclick="Util.goTop()" class="icon-goup"></span>
</footer> </footer>
<div class="back-to-top" onclick="Util.goTop()"></div>
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script> <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script> <script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
......
src/main/webapp/skins/next/header.ftl 0 → 100644
View file @ f61bd1d3
<header class="header">
<div class="header-line"></div>
<div class="fn-clear wrapper">
<div class="logo-wrap">
<a href="${servePath}" rel="start">
<span class="logo-line-before"><i></i></span>
<span class="site-title">${blogTitle}</span>
<span class="logo-line-after"><i></i></span>
</a>
</div>
<div class="site-nav-toggle fn-right" onclick="$('.header-line').toggle();$('nav').children('.menu').slideToggle();">
<span class="btn-bar"></span>
<span class="btn-bar"></span>
<span class="btn-bar"></span>
</div>
<nav>
<ul class="menu">
<#list pageNavigations as page>
<li class="menu-item">
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}" rel="section">
${page.pageTitle}
</a>
</li>
</#list>
<li class="menu-item">
<a href="${servePath}/dynamic.html" rel="section">
${dynamicLabel}
</a>
</li>
<li class="menu-item">
<a href="${servePath}/tags.html" rel="section">
${allTagsLabel}
</a>
</li>
<li class="menu-item">
<a href="${servePath}/archives.html">
${archiveLabel}
</a>
</li>
<li class="menu-item">
<a rel="alternate" href="${servePath}/blog-articles-rss.do" rel="section">
RSS
</a>
</li>
</ul>
<div class="site-search">
<form target="_blank" action="http://zhannei.baidu.com/cse/site">
<input placeholder="${searchLabel}" id="search" type="text" name="q"/>
<input type="submit" value="" class="fn-none" />
<input type="hidden" name="cc" value="${serverHost}">
</form>
</div>
</nav>
</div>
</header>
\ No newline at end of file
src/main/webapp/skins/next/index.ftl
View file @ f61bd1d3
...@@ -12,10 +12,13 @@ ...@@ -12,10 +12,13 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <#include "header.ftl">
<main> <main class="main wrapper">
<#include "article-list.ftl"> <div class="content">
<#include "footer.ftl"> <#include "article-list.ftl">
</div>
<#include "side.ftl">
</main> </main>
<#include "footer.ftl">
</body> </body>
</html> </html>
src/main/webapp/skins/next/js/next.js
View file @ f61bd1d3
...@@ -24,57 +24,65 @@ ...@@ -24,57 +24,65 @@
* @description next 皮肤脚本 * @description next 皮肤脚本
* @static * @static
*/ */
var Yilia = { var NexT = {
/**
* @description 页面初始化
*/
init: function () { init: function () {
Util.killIE(); $('.sidebar-toggle').click(function () {
this.resetTags(); var $sidebar = $('.sidebar');
if ($(this).hasClass('sidebar-active')) {
$(window).scroll(function () { $(this).removeClass('sidebar-active');
if ($("article").length > 0 && $("article.post").length === 0) {
$("article:not(.show)").each(function () {
if ($(this).offset().top <= $(window).scrollTop() + $(window).height() - $(this).height() / 7) {
$(this).addClass("show");
}
});
}
if ($(window).scrollTop() > $(window).height()) { $('body').animate({
$(".icon-goup").show(); 'padding-right': 0
});
$sidebar.animate({
right: -320
});
} else { } else {
$(".icon-goup").hide(); $(this).addClass('sidebar-active');
$('body').animate({
'padding-right': 320
});
$sidebar.animate({
right: 0
});
} }
});
if ($("article.post").length === 1) { $('.site-nav-toggle').click(function () {
$("article.post").addClass('show'); $('.site-nav').slideToggle();
}
}); });
$(window).scroll(); $(document).ready(function () {
}, setTimeout(function () {
resetTags: function () { $('.logo-wrap').css('opacity', 1);
$("a.tag").each(function (i) { $('.logo-line-before i').animate({
$(this).addClass("color" + Math.ceil(Math.random() * 4)); 'left': '0'
}, function () {
$('.site-title').css('opacity', 1).animate({
'top': 0
}, function () {
$('.menu').css('opacity', 1).animate({
'margin-top': '15px'
});
$('.main').css('opacity', 1).animate({
'top': '0'
});
});
});
$('.logo-line-after i').animate({
'right': '0'
});
}, 500);
}); });
}, },
share: function () { initArticle: function () {
$(".share span").click(function () { if ($('.b3-solo-list li').length > 0) {
var key = $(this).data("type"); $('.sidebar').html($('.b3-solo-list'));
var title = encodeURIComponent($("title").text()), $('.sidebar-toggle').click();
url = $(".post-title a").attr('href') ? $(".post-title a").attr('href') : location, }
pic = $(".post-content img:eq(0)").attr("src");
var urls = {};
urls.tencent = "http://share.v.t.qq.com/index.php?c=share&a=index&title=" + title +
"&url=" + url + "&pic=" + pic;
urls.weibo = "http://v.t.sina.com.cn/share/share.php?title=" +
title + "&url=" + url + "&pic=" + pic;
urls.google = "https://plus.google.com/share?url=" + url;
urls.twitter = "https://twitter.com/intent/tweet?status=" + title + " " + url;
window.open(urls[key], "_blank", "top=100,left=200,width=648,height=618");
});
} }
}; };
NexT.init();
Yilia.init(); \ No newline at end of file
\ No newline at end of file
src/main/webapp/skins/next/lang/lang_zh_CN.properties
View file @ f61bd1d3
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
# #
# Description: B3log Solo default language configurations(zh_CN). # Description: B3log Solo default language configurations(zh_CN).
# Version: 1.0.0.1, Jun 19, 2015 # Version: 0.1.0.0, Jun 29, 2016
# Author: Liyuan Li # Author: Liyuan Li
# #
searchLabel=\u641c\u7d22
subscribeLabel=\u8ba2\u9605 subscribeLabel=\u8ba2\u9605
dynamicLabel=\u52a8\u6001 dynamicLabel=\u52a8\u6001
adminConsoleLabel=\u540e\u53f0\u7ba1\u7406 adminConsoleLabel=\u540e\u53f0\u7ba1\u7406
......
src/main/webapp/skins/next/links.ftl deleted 100644 → 0
View file @ 0473873a
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${linkLabel}"/>
<meta name="description" content="${metaDescription},${linkLabel}"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/links.html">
${linkLabel}
</a>
</h2>
</header>
<#if 0 != links?size>
<ul class="tags fn-clear">
<#list links as link>
<li>
<a rel="friend" href="${link.linkAddress}" class="tag"
title="${link.linkDescription}" target="_blank">
<img src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>" width="16" height="16" />
${link.linkTitle}
</a>
</li>
</#list>
</ul>
</#if>
</article>
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/next/macro-comments.ftl
View file @ f61bd1d3
<#macro comments commentList article> <#macro comments commentList article>
<ul class="comments" id="comments"> <ul class="comments" id="comments">
<#list commentList as comment> <#list commentList as comment>
<li id="${comment.oId}"> <li id="${comment.oId}" class="fn-clear">
<img class="avatar" title="${comment.commentName}" src="${comment.commentThumbnailURL}"> <img class="avatar-48" title="${comment.commentName}" src="${comment.commentThumbnailURL}">
<div class="content"> <div class="comment-body">
<div class="fn-clear post-meta"> <div class="fn-clear comment-meta">
<span class="fn-left"> <span class="fn-left">
<#if "http://" == comment.commentURL> <#if "http://" == comment.commentURL>
<span>${comment.commentName}</span> <a>${comment.commentName}</a>
<#else> <#else>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a> <a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
</#if> </#if>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
onmouseout="page.hideComment('${comment.commentOriginalCommentId}')" onmouseout="page.hideComment('${comment.commentOriginalCommentId}')"
>${comment.commentOriginalCommentName}</a> >${comment.commentOriginalCommentName}</a>
</#if> </#if>
<time>${comment.commentDate?string("yyyy-MM-dd")}</time> <time>${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
</span> </span>
<#if article.commentable> <#if article.commentable>
<a class="fn-right" href="javascript:replyTo('${comment.oId}')">${replyLabel}</a> <a class="fn-right" href="javascript:replyTo('${comment.oId}')">${replyLabel}</a>
...@@ -114,18 +114,20 @@ ...@@ -114,18 +114,20 @@
}); });
var addComment = function (result, state) { var addComment = function (result, state) {
var commentable = $("#commentForm").length === 0 ? false : true; var commentable = $("#commentForm").length === 0 ? false : true;
var commentHTML = '<li id="' + result.oId + var commentHTML = '<li class="fn-clear" id="' + result.oId +
'"><img class="avatar" title="' '"><img class="avatar-48" title="'
+ result.userName + '" src="' + result.commentThumbnailURL + '"><div class="content">' + result.userName + '" src="' + result.commentThumbnailURL + '"><div class="comment-body">'
+ '<div class="fn-clear post-meta"><span class="fn-left">' + result.replyNameHTML; + '<div class="fn-clear comment-meta"><span class="fn-left">' + result.replyNameHTML;
if (state !== "") { if (state !== "") {
var commentOriginalCommentName = $("#" + page.currentCommentId).find(".post-meta a").first().text(); var commentOriginalCommentName = $("#" + page.currentCommentId).find(".comment-meta a").first().text();
commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"' commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
+ 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 23);"' + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 23);"'
+ 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>'; + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
} }
commentHTML += ' <time>' + result.commentDate
commentHTML += '<time>' + result.commentDate
+ '</time></span>'; + '</time></span>';
if (commentable) { if (commentable) {
commentHTML += '<a class="fn-right" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>'; commentHTML += '<a class="fn-right" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>';
...@@ -140,10 +142,10 @@ ...@@ -140,10 +142,10 @@
page.addReplyForm(id, commentFormHTML); page.addReplyForm(id, commentFormHTML);
}; };
(function () { (function () {
Yilia.share();
page.load(); page.load();
NexT.initArticle();
// emotions // emotions
page.replaceCommentsEm(".comments .comment-content"); page.replaceCommentsEm("#comments .comment-content");
<#nested> <#nested>
})(); })();
</script> </script>
......
src/main/webapp/skins/next/macro-head.ftl
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/page.ftl
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/side.ftl
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/skin.properties
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/tag-articles.ftl
View file @ f61bd1d3
This diff is collapsed.
src/main/webapp/skins/next/tags.ftl
View file @ f61bd1d3
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment