yexuejc/solo-skins
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

https://github.com/b3log/solo/issues/12720 timeline

Browse Source
This commit is contained in:
Van 2019-03-22 18:53:35 +08:00
parent 3ca8f083f2
commit 60a8e6df33
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
7 changed files with 636 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
metro-hot/macro-side.ftl
View File

@ -21,29 +21,35 @@
<div class="side"> <div class="side">
<div class="fn-clear"> <div class="fn-clear">
<#if !isArticle> <#if !isArticle>
<form action="${servePath}/search"> <form action="${servePath}/search">
<input placeholder="Search" id="search" type="text" name="keyword" /><span onclick="$(this).parent().submit()" data-ico="&#x0067;"></span> <input placeholder="Search" id="search" type="text" name="keyword" /><span onclick="$(this).parent().submit()" data-ico="&#x0067;"></span>
<input type="submit" value="" class="fn-none" /> <input type="submit" value="" class="fn-none" />
</form> </form>
<#if "" != noticeBoard> <#if "" != noticeBoard>
<div class="notice-board side-tile"> <div class="notice-board side-tile">
<div class="title"> <div class="title">
${noticeBoard} ${noticeBoard}
</div>
</div>
</#if>
<div class="online-count side-tile">
<span data-ico="&#xe037;"></span>
<div class="text">
${viewCount1Label}
${statistic.statisticBlogViewCount}<br/>
${articleCount1Label}
${statistic.statisticPublishedBlogArticleCount}<br/>
${commentCount1Label}
${statistic.statisticPublishedBlogCommentCount}<br/>
</div>
</div> </div>
</div>
</#if> </#if>
<div class="online-count side-tile"> <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<span data-ico="&#xe037;"></span> <div class="vditor-reset" style="margin-top: 20px">
<div class="text"> <#include "../../common-template/toc.ftl"/>
${viewCount1Label}
${statistic.statisticBlogViewCount}<br/>
${articleCount1Label}
${statistic.statisticPublishedBlogArticleCount}<br/>
${commentCount1Label}
${statistic.statisticPublishedBlogCommentCount}<br/>
</div>
</div> </div>
</#if> </#if>

64
timeline/article.ftl
View File

@ -22,7 +22,7 @@
<#include "../../common-template/macro-comment_script.ftl"> <#include "../../common-template/macro-comment_script.ftl">
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}"> <@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
<link rel="stylesheet" <link rel="stylesheet"
href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/> href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
@ -33,26 +33,28 @@
<link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}"> <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
</#if> </#if>
</@head> </@head>
</head> </head>
<body> <body>
${topBarReplacement} ${topBarReplacement}
<#include "header.ftl"> <#include "header.ftl">
<div class="wrapper"> <div class="wrapper">
<div class="container"> <div class="container">
<div class="fn-clear">
<div<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0> class="dynamic-l"</#if>>
<div class="module"> <div class="module">
<article class="article"> <article class="article">
<time class="article-time"> <time class="article-time">
<span> <span>
<#if article.hasUpdated> <#if article.hasUpdated>
${article.articleUpdateDate?string("yy-MM-dd HH:mm")} ${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
<#else> <#else>
${article.articleCreateDate?string("yy-MM-dd HH:mm")} ${article.articleCreateDate?string("yy-MM-dd HH:mm")}
</#if> </#if>
</span> </span>
</time> </time>
<h2 class="article-title"> <h2 class="article-title">
<a href="${servePath}${article.articlePermalink}"> <a href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
<#if article.hasUpdated> <#if article.hasUpdated>
<sup> <sup>
@ -66,7 +68,7 @@
</#if> </#if>
</h2> </h2>
<div class="vditor-reset"> <div class="vditor-reset">
${article.articleContent} ${article.articleContent}
</div> </div>
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<p> <p>
@ -74,7 +76,11 @@
</p> </p>
</#if> </#if>
<span class="ico-tags ico" title="${tagLabel}"> <span class="ico-tags ico" title="${tagLabel}">
<#list article.articleTags?split(",") as articleTag><a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if></#list> <#list article.articleTags?split(",") as articleTag>
<a rel="tag"
href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a>
<#if articleTag_has_next>,</#if>
</#list>
</span> </span>
<span class="ico-author ico" title="${authorLabel}"> <span class="ico-author ico" title="${authorLabel}">
<a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> <a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a>
@ -83,15 +89,15 @@
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#comments">
<#if article.articleCommentCount == 0> <#if article.articleCommentCount == 0>
${noCommentLabel} ${noCommentLabel}
<#else> <#else>
${article.articleCommentCount} ${article.articleCommentCount}
</#if> </#if>
</a> </a>
</span> </span>
<span class="ico-view ico" title="${viewLabel}"> <span class="ico-view ico" title="${viewLabel}">
<a rel="nofollow" href="${servePath}${article.articlePermalink}"> <a rel="nofollow" href="${servePath}${article.articlePermalink}">
${article.articleViewCount} ${article.articleViewCount}
</a> </a>
</span> </span>
</article> </article>
@ -103,13 +109,13 @@
<span class="ft-pre">${nextArticleTitle}</span> <span class="ft-pre">${nextArticleTitle}</span>
</a> </a>
</div> </div>
</#if> </#if>
<#if previousArticlePermalink??> <#if previousArticlePermalink??>
<div class="right"> <div class="right">
<a href="${servePath}${previousArticlePermalink}"> <a href="${servePath}${previousArticlePermalink}">
<span class="left ft-next">${previousArticleTitle}</span> <span class="left ft-next">${previousArticleTitle}</span>
<span class="ico-next">»</span> <span class="ico-next">»</span>
</a> </a>
</div> </div>
</#if> </#if>
</div> </div>
@ -125,19 +131,29 @@
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
</div> </div>
</div> </div>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<div class="dynamic-r">
<div class="module">
<h3 class="title">${tocLabel}</h3>
<#include "../../common-template/toc.ftl"/>
</div>
</div>
</#if>
</div> </div>
</div>
</div>
<#include "footer.ftl"> <#include "footer.ftl">
<@comment_script oId=article.oId commentable=article.commentable> <@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != externalRelevantArticlesDisplayCount> <#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>"); page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
</#if> </#if>
<#if 0 != randomArticlesDisplayCount> <#if 0 != randomArticlesDisplayCount>
page.loadRandomArticles(); page.loadRandomArticles();
</#if> </#if>
<#if 0 != relevantArticlesDisplayCount> <#if 0 != relevantArticlesDisplayCount>
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>'); page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
</#if> </#if>
</@comment_script> </@comment_script>
</body> </body>
</html> </html>

2
timeline/css/base.css
View File

File diff suppressed because one or more lines are too long

1086
timeline/css/base.scss
View File

File diff suppressed because it is too large Load Diff

4
timeline/footer.ftl
View File

@ -19,6 +19,10 @@
--> -->
<div class="footer"> <div class="footer">
<div class="container fn-clear"> <div class="container fn-clear">
<#include "../../common-template/macro-user_site.ftl"/>
<div class="ft__center">
<@userSite dir="ne"/>
</div>
<div class="left"> <div class="left">
<span>&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a>${footerContent} <span>&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a>${footerContent}
Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}&nbsp;&nbsp; Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}&nbsp;&nbsp;

9
timeline/js/timeline.js
View File

@ -206,12 +206,15 @@ var timeline = {
path = "/articles/"; path = "/articles/";
if ($("#tag").length === 1) { if ($("#tag").length === 1) {
var pathnames = location.pathname.split("/"); var pathnames = location.pathname.split("/");
path = "/articles/tags/" + pathnames[pathnames.length - 1] + "/"; path = "/articles/tags/" + pathnames[pathnames.length - 1];
} else if ($("#author").length === 1) { } else if ($("#author").length === 1) {
var pathnames = location.pathname.split("/"); var pathnames = location.pathname.split("/");
path = "/articles/authors/" + pathnames[pathnames.length - 1] + "/"; path = "/articles/authors/" + pathnames[pathnames.length - 1];
} else if ($("#category").length === 1) {
var pathnames = location.pathname.split("/");
path = "/articles/category/" + pathnames[pathnames.length - 1];
} else if (archive) { } else if (archive) {
path = "/articles/archives/" + archive + "/"; path = "/articles/archives/" + archive;
} }
$.ajax({ $.ajax({
url: Label.servePath + path + '?p=' + currentPage, url: Label.servePath + path + '?p=' + currentPage,

2
timeline/macro-comments.ftl
View File

@ -26,7 +26,7 @@
<#if article.commentable> <#if article.commentable>
<h3>${commentLabel}</h3> <h3>${commentLabel}</h3>
<div class="comment-form"> <div class="comment-form">
<textarea style="width:96%" rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea> <textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
</div> </div>
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount> <#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles"></div> <div id="externalRelevantArticles"></div>