This commit is contained in:
Van
parent
3ca8f083f2
commit
60a8e6df33
|
|
@ -21,29 +21,35 @@
|
|||
<div class="side">
|
||||
<div class="fn-clear">
|
||||
<#if !isArticle>
|
||||
<form action="${servePath}/search">
|
||||
<input placeholder="Search" id="search" type="text" name="keyword" /><span onclick="$(this).parent().submit()" data-ico="g"></span>
|
||||
<input type="submit" value="" class="fn-none" />
|
||||
</form>
|
||||
<form action="${servePath}/search">
|
||||
<input placeholder="Search" id="search" type="text" name="keyword" /><span onclick="$(this).parent().submit()" data-ico="g"></span>
|
||||
<input type="submit" value="" class="fn-none" />
|
||||
</form>
|
||||
|
||||
<#if "" != noticeBoard>
|
||||
<div class="notice-board side-tile">
|
||||
<div class="title">
|
||||
${noticeBoard}
|
||||
<#if "" != noticeBoard>
|
||||
<div class="notice-board side-tile">
|
||||
<div class="title">
|
||||
${noticeBoard}
|
||||
</div>
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
<div class="online-count side-tile">
|
||||
<span data-ico=""></span>
|
||||
<div class="text">
|
||||
${viewCount1Label}
|
||||
${statistic.statisticBlogViewCount}<br/>
|
||||
${articleCount1Label}
|
||||
${statistic.statisticPublishedBlogArticleCount}<br/>
|
||||
${commentCount1Label}
|
||||
${statistic.statisticPublishedBlogCommentCount}<br/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
<div class="online-count side-tile">
|
||||
<span data-ico=""></span>
|
||||
<div class="text">
|
||||
${viewCount1Label}
|
||||
${statistic.statisticBlogViewCount}<br/>
|
||||
${articleCount1Label}
|
||||
${statistic.statisticPublishedBlogArticleCount}<br/>
|
||||
${commentCount1Label}
|
||||
${statistic.statisticPublishedBlogCommentCount}<br/>
|
||||
</div>
|
||||
<#if article?? && article.articleToC?? && article.articleToC?size > 0>
|
||||
<div class="vditor-reset" style="margin-top: 20px">
|
||||
<#include "../../common-template/toc.ftl"/>
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<#include "../../common-template/macro-comment_script.ftl">
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<head>
|
||||
<@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
|
||||
<link rel="stylesheet"
|
||||
href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
||||
|
|
@ -33,26 +33,28 @@
|
|||
<link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
|
||||
</#if>
|
||||
</@head>
|
||||
</head>
|
||||
<body>
|
||||
${topBarReplacement}
|
||||
</head>
|
||||
<body>
|
||||
${topBarReplacement}
|
||||
<#include "header.ftl">
|
||||
<div class="wrapper">
|
||||
<div class="container">
|
||||
<div class="wrapper">
|
||||
<div class="container">
|
||||
<div class="fn-clear">
|
||||
<div<#if article?? && article.articleToC?? && article.articleToC?size > 0> class="dynamic-l"</#if>>
|
||||
<div class="module">
|
||||
<article class="article">
|
||||
<time class="article-time">
|
||||
<span>
|
||||
<#if article.hasUpdated>
|
||||
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
|
||||
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
|
||||
<#else>
|
||||
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
|
||||
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
|
||||
</#if>
|
||||
</span>
|
||||
</time>
|
||||
<h2 class="article-title">
|
||||
<a href="${servePath}${article.articlePermalink}">
|
||||
${article.articleTitle}
|
||||
${article.articleTitle}
|
||||
</a>
|
||||
<#if article.hasUpdated>
|
||||
<sup>
|
||||
|
|
@ -66,7 +68,7 @@
|
|||
</#if>
|
||||
</h2>
|
||||
<div class="vditor-reset">
|
||||
${article.articleContent}
|
||||
${article.articleContent}
|
||||
</div>
|
||||
<#if "" != article.articleSign.signHTML?trim>
|
||||
<p>
|
||||
|
|
@ -74,7 +76,11 @@
|
|||
</p>
|
||||
</#if>
|
||||
<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 class="ico-author ico" title="${authorLabel}">
|
||||
<a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a>
|
||||
|
|
@ -83,15 +89,15 @@
|
|||
|
||||
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments">
|
||||
<#if article.articleCommentCount == 0>
|
||||
${noCommentLabel}
|
||||
${noCommentLabel}
|
||||
<#else>
|
||||
${article.articleCommentCount}
|
||||
${article.articleCommentCount}
|
||||
</#if>
|
||||
</a>
|
||||
</span>
|
||||
<span class="ico-view ico" title="${viewLabel}">
|
||||
<a rel="nofollow" href="${servePath}${article.articlePermalink}">
|
||||
${article.articleViewCount}
|
||||
${article.articleViewCount}
|
||||
</a>
|
||||
</span>
|
||||
</article>
|
||||
|
|
@ -103,13 +109,13 @@
|
|||
<span class="ft-pre">${nextArticleTitle}</span>
|
||||
</a>
|
||||
</div>
|
||||
</#if>
|
||||
</#if>
|
||||
<#if previousArticlePermalink??>
|
||||
<div class="right">
|
||||
<a href="${servePath}${previousArticlePermalink}">
|
||||
<span class="left ft-next">${previousArticleTitle}</span>
|
||||
<span class="ico-next">»</span>
|
||||
</a>
|
||||
</a>
|
||||
</div>
|
||||
</#if>
|
||||
</div>
|
||||
|
|
@ -125,19 +131,29 @@
|
|||
<@comments commentList=articleComments article=article></@comments>
|
||||
</div>
|
||||
</div>
|
||||
<#if article?? && article.articleToC?? && article.articleToC?size > 0>
|
||||
<div class="dynamic-r">
|
||||
<div class="module">
|
||||
<h3 class="title">${tocLabel}</h3>
|
||||
<#include "../../common-template/toc.ftl"/>
|
||||
</div>
|
||||
</div>
|
||||
</#if>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<#include "footer.ftl">
|
||||
<@comment_script oId=article.oId commentable=article.commentable>
|
||||
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>");
|
||||
</#if>
|
||||
<#if 0 != randomArticlesDisplayCount>
|
||||
</#if>
|
||||
<#if 0 != randomArticlesDisplayCount>
|
||||
page.loadRandomArticles();
|
||||
</#if>
|
||||
<#if 0 != relevantArticlesDisplayCount>
|
||||
</#if>
|
||||
<#if 0 != relevantArticlesDisplayCount>
|
||||
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
|
||||
</#if>
|
||||
</@comment_script>
|
||||
</body>
|
||||
</#if>
|
||||
</@comment_script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
|
|
@ -19,6 +19,10 @@
|
|||
-->
|
||||
<div class="footer">
|
||||
<div class="container fn-clear">
|
||||
<#include "../../common-template/macro-user_site.ftl"/>
|
||||
<div class="ft__center">
|
||||
<@userSite dir="ne"/>
|
||||
</div>
|
||||
<div class="left">
|
||||
<span>© ${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}
|
||||
|
|
|
|||
|
|
@ -206,12 +206,15 @@ var timeline = {
|
|||
path = "/articles/";
|
||||
if ($("#tag").length === 1) {
|
||||
var pathnames = location.pathname.split("/");
|
||||
path = "/articles/tags/" + pathnames[pathnames.length - 1] + "/";
|
||||
path = "/articles/tags/" + pathnames[pathnames.length - 1];
|
||||
} else if ($("#author").length === 1) {
|
||||
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) {
|
||||
path = "/articles/archives/" + archive + "/";
|
||||
path = "/articles/archives/" + archive;
|
||||
}
|
||||
$.ajax({
|
||||
url: Label.servePath + path + '?p=' + currentPage,
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<#if article.commentable>
|
||||
<h3>${commentLabel}</h3>
|
||||
<div class="comment-form">
|
||||
<textarea style="width:96%" rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
|
||||
<textarea rows="3" placeholder="${postCommentsLabel}" id="comment"></textarea>
|
||||
</div>
|
||||
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
|
||||
<div id="externalRelevantArticles"></div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue