This commit is contained in:
Van
2019-08-27 18:30:49 +08:00
parent cfceead292
commit 8acd61e237
21 changed files with 315 additions and 315 deletions

View File

@@ -19,70 +19,73 @@
-->
<section class="posts-expand">
<#list articles as article>
<article class="post-item">
<header>
<h2>
<a class="post-title-link" rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
<a class="post__sup" href="${servePath}${article.articlePermalink}">
${updatedLabel}
</a>
</sup>
</#if>
</h2>
<article class="post-item">
<header>
<h2>
<a class="post-title-link" rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
<a class="post__sup" href="${servePath}${article.articlePermalink}">
${updatedLabel}
</a>
</sup>
</#if>
</h2>
<div class="post-meta">
<div class="post-meta">
<span>
${article.articleCreateDate?string("yyyy-MM-dd")}
${postTimeLabel}
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateTimeLabel}
<#else>
${postTimeLabel}
</#if>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
</span>
<span>
<span>
&nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments">
${article.articleCommentCount} ${cmtLabel}</a>
</span>
&nbsp; | &nbsp;${viewsLabel} ${article.articleViewCount}°C
&nbsp; | &nbsp;${viewsLabel} ${article.articleViewCount}°C
</div>
</header>
<div class="vditor-reset">
${article.articleAbstract}
</div>
</header>
<div class="vditor-reset">
${article.articleAbstract}
</div>
<div class="post-more-link">
<a href="${servePath}${article.articlePermalink}#more" rel="contents">
${readLabel} &raquo;
</a>
</div>
</article>
<div class="post-more-link">
<a href="${servePath}${article.articlePermalink}#more" rel="contents">
${readLabel} &raquo;
</a>
</div>
</article>
</#list>
</section>
<#if 0 != paginationPageCount>
<nav class="pagination">
<#if 1 != paginationPageNums?first>
<a href="${servePath}${path}?p=${paginationPreviousPageNum}" class="extend next"><<</a>
<a class="page-number" href="${servePath}${path}">1</a> ...
</#if>
<#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum>
<span class="page-number current">${paginationPageNum}</span>
<#else>
<a class="page-number" href="${servePath}${path}?p=${paginationPageNum}">${paginationPageNum}</a>
</#if>
</#list>
<#if paginationPageNums?last != paginationPageCount> ...
<a href="${servePath}${path}?p=${paginationPageCount}" class="page-number">${paginationPageCount}</a>
<a href="${servePath}${path}?p=${paginationNextPageNum}" class="extend next">>></a>
</#if>
</nav>
<nav class="pagination">
<#if 1 != paginationPageNums?first>
<a href="${servePath}${path}?p=${paginationPreviousPageNum}" class="extend next"><<</a>
<a class="page-number" href="${servePath}${path}">1</a> ...
</#if>
<#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum>
<span class="page-number current">${paginationPageNum}</span>
<#else>
<a class="page-number" href="${servePath}${path}?p=${paginationPageNum}">${paginationPageNum}</a>
</#if>
</#list>
<#if paginationPageNums?last != paginationPageCount> ...
<a href="${servePath}${path}?p=${paginationPageCount}" class="page-number">${paginationPageCount}</a>
<a href="${servePath}${path}?p=${paginationNextPageNum}" class="extend next">>></a>
</#if>
</nav>
</#if>

View File

@@ -22,110 +22,115 @@
<#include "../../common-template/macro-comment_script.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
<link rel="stylesheet"
href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
<head>
<@head title="${article.articleTitle} - ${blogTitle}" description="${article.articleAbstract?html}">
<link rel="stylesheet"
href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
<#if previousArticlePermalink??>
<link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
</#if>
<#if nextArticlePermalink??>
<link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
</#if>
</@head>
</head>
<body>
<#include "header.ftl">
<main class="main">
<div class="wrapper">
<div class="content">
<article class="posts-expand">
<header class="post-header">
<h2 class="post-title">
${article.articleTitle}
<#if article.articlePutTop>
</@head>
</head>
<body>
<#include "header.ftl">
<main class="main">
<div class="wrapper">
<div class="content">
<article class="posts-expand">
<header class="post-header">
<h2 class="post-title">
${article.articleTitle}
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
</h2>
<div class="post-meta">
</#if>
</h2>
<div class="post-meta">
<span class="post-time">
${postTimeLabel}
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateTimeLabel}
<#else>
${postTimeLabel}
</#if>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
</span>
<span class="post-comments-count">
<span class="post-comments-count">
&nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments">
${article.articleCommentCount} ${cmtLabel}</a>
</span>
&nbsp; | &nbsp; ${viewsLabel}
${article.articleViewCount}°C
</div>
</header>
&nbsp; | &nbsp; ${viewsLabel}
${article.articleViewCount}°C
</div>
</header>
<div class="post-body post-body--article vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div class="post-body post-body--article vditor-reset">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div>
${article.articleSign.signHTML}
</div>
</#if>
</div>
<footer>
<div class="post-tags">
<#list article.articleTags?split(",") as articleTag>
</#if>
</div>
<footer>
<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??>
</#list>
</div>
<div class="post-nav fn-clear">
<#if previousArticlePermalink??>
<div class="post-nav-prev post-nav-item fn-right">
<a href="${servePath}${previousArticlePermalink}" rel="prev" title="${previousArticleTitle}">
<a href="${servePath}${previousArticlePermalink}" rel="prev"
title="${previousArticleTitle}">
${previousArticleTitle} >
</a>
</div>
</#if>
<#if nextArticlePermalink??>
</#if>
<#if nextArticlePermalink??>
<div class="post-nav-next post-nav-item fn-left">
<a href="${servePath}${nextArticlePermalink}" rel="next" title="${nextArticleTitle}">
< ${nextArticleTitle}
< ${nextArticleTitle}
</a>
</div>
</#if>
</div>
</footer>
</article>
</div>
<@comments commentList=articleComments article=article></@comments>
<#if 0 != relevantArticlesDisplayCount>
</#if>
</div>
</footer>
</article>
</div>
<@comments commentList=articleComments article=article></@comments>
<#if 0 != relevantArticlesDisplayCount>
<div id="relevantArticles"></div>
</#if>
<#if 0 != randomArticlesDisplayCount>
<div id="randomArticles"></div>
</#if>
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles"></div>
</#if>
<#include "side.ftl">
</div>
</main>
<#include "footer.ftl">
<@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
</#if>
<#if 0 != randomArticlesDisplayCount>
<div id="randomArticles"></div>
</#if>
<#if externalRelevantArticlesDisplayCount?? && 0 != externalRelevantArticlesDisplayCount>
<div id="externalRelevantArticles"></div>
</#if>
<#include "side.ftl">
</div>
</main>
<#include "footer.ftl">
<@comment_script oId=article.oId commentable=article.commentable>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
<#if 0 != externalRelevantArticlesDisplayCount>
page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,</#if></#list>");
</#if>
<#if 0 != randomArticlesDisplayCount>
page.loadRandomArticles();
</#if>
<#if 0 != relevantArticlesDisplayCount>
</#if>
<#if 0 != relevantArticlesDisplayCount>
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
</#if>
NexT.initArticle()
</@comment_script>
</body>
</#if>
NexT.initArticle()
</@comment_script>
</body>
</html>

View File

@@ -18,10 +18,11 @@
#
# Description: Solo language configurations(en_US).
# Version: 2.0.0.0, Feb 23, 2019
# Version: 2.1.0.0, Aug 27, 2019
# Author: Liyuan Li
#
updateTimeLabel=Update At
tocLabel=Article ToC
siteViewLabel=Site
viewsLabel=Heat

View File

@@ -18,10 +18,11 @@
#
# Description: Solo default language configurations(zh_CN).
# Version: 2.0.0.0, Feb 23, 2019
# Version: 2.1.0.0, Aug 27, 2019
# Author: Liyuan Li
#
updateTimeLabel=\u66F4\u65B0\u4E8E
tocLabel=\u6587\u7AE0\u76EE\u5F55
siteViewLabel=\u7AD9\u70B9\u6982\u89C8
viewsLabel=\u70ED\u5EA6