This commit is contained in:
Van 2019-08-27 18:30:49 +08:00
parent cfceead292
commit 8acd61e237
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
21 changed files with 315 additions and 315 deletions

View File

@ -40,7 +40,8 @@
</h2>
<div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
<span class="vditor-tooltipped vditor-tooltipped__n"
aria-label="<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>${updateDateLabel}<#else>${createDateLabel}</#if>">
<i class="icon-date"></i>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}

View File

@ -52,7 +52,7 @@
</#if>
</h2>
<div class="meta">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="${createDateLabel}">
<span class="vditor-tooltipped vditor-tooltipped__n" aria-label="<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>${updateDateLabel}<#else>${createDateLabel}</#if>">
<i class="icon-date"></i>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}

View File

@ -43,11 +43,7 @@
</#if>
</h2>
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy HH:mm:ss")}
</#if>
by
<a rel="nofollow" class="underline" title="${article.authorName}" href="${servePath}/authors/${article.authorId}">
${article.authorName}</a> |

View File

@ -38,7 +38,7 @@
<#setting locale=localeString>
</div>
<div class="row article-content">
<div class="row article-content vditor-reset">
<div class="col-sm-12" id="abstract${article.oId}">
${article.articleAbstract}
</div>

View File

@ -18,14 +18,10 @@
-->
<#list articles as article>
<div class="marginBottom40">
<div class="marginBottom40">
<div class="article-header">
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm")}
</#if>
</div>
<div class="arrow-right"></div>
<div class="clear"></div>
@ -34,7 +30,8 @@
<span class="left">
by&nbsp;
</span>
<a rel="nofollow" class="left" title="${article.authorName}" href="${servePath}/authors/${article.authorId}">
<a rel="nofollow" class="left" title="${article.authorName}"
href="${servePath}/authors/${article.authorId}">
${article.authorName}
</a>
<span class="clear"></span>
@ -93,16 +90,20 @@
</#list>
<li>
<a href="${servePath}${article.articlePermalink}">
${createDateLabel}:${article.articleCreateDate?string("yyyy-MM-dd HH:mm")}
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateDateLabel}
<#else>
${createDateLabel}
</#if>:${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
</a>
</li>
</ul>
</div>
<div class="clear"></div>
</div>
</div>
</#list>
<#if 0 != paginationPageCount>
<div class="pagination">
<div class="pagination">
<#if 1 != paginationPageNums?first>
<a href="${servePath}${path}">${firstPageLabel}</a>
<a id="previousPage" href="${servePath}${path}?p=${paginationPreviousPageNum}">${previousPageLabel}</a>
@ -119,5 +120,5 @@
<a href="${servePath}${path}?p=${paginationPageCount}">${lastPageLabel}</a>
</#if>
&nbsp;&nbsp;${sumLabel} ${paginationPageCount} ${pageLabel}
</div>
</div>
</#if>

View File

@ -43,7 +43,7 @@
<div class="marginBottom40">
<div class="article-header">
<div class="article-date">
${article.articleUpdateDate?string("yyyy-MM-dd HH")}
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
</div>
<div class="arrow-right"></div>
<div class="clear"></div>

View File

@ -30,18 +30,18 @@
<div class="item__slant"></div>
<div class="item__slant item__slant--white"></div>
<div class="item__main">
<span class="item__sup">
<#if article.articlePutTop>
<sup class="ft__red">
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
<a class="ft__red" href="${servePath}${article.articlePermalink}">
<sup class="ft__red">
${updatedLabel}
</a>
</sup>
</#if>
</span>
<h2 class="item__title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
@ -51,7 +51,8 @@
<#if articleTag_index == 0>
<div class="ico ico--${article_index % 10}"></div>
<#if article.category??>
<a class="item__tag" href="${servePath}/category/${article.category.categoryURI}">${article.category.categoryTitle}</a>
<a class="item__tag"
href="${servePath}/category/${article.category.categoryURI}">${article.category.categoryTitle}</a>
<#else>
<a rel="tag" class="item__tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}

View File

@ -50,7 +50,11 @@
</#if>
</h2>
<div class="ft__fade item__meta">
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
Updated on
<#else>
Published on
</#if>
<time>
<#setting locale="en_US">
${article.articleUpdateDate?string["MMM d, yyyy"]}
@ -137,7 +141,7 @@
</span>
</div>
</div>
<#if pjax><!---- pjax {#pjax} end ----></#if>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</main>
<#include "footer.ftl">

File diff suppressed because one or more lines are too long

View File

@ -318,6 +318,11 @@ a:active, a:focus, a:hover {
background-size: cover;
}
&__sup {
position: absolute;
top: 7px;
}
&__slant {
transform: rotate(-10deg) translate(10px, -10px);
opacity: .7;

View File

@ -38,18 +38,10 @@
</h2>
<div class="posttime-blue">
<div class="posttime-MY">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM")}
<#else>
${article.articleCreateDate?string("yyyy-MM")}
</#if>
</div>
<div class="posttime-D">
<#if article.hasUpdated>
${article.articleUpdateDate?string("dd")}
<#else>
${article.articleCreateDate?string("dd")}
</#if>
</div>
</div>
<div class="article-abstract">

View File

@ -44,11 +44,7 @@
</a>
<span class="dateIcon"></span>
<span class="left">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm:ss")}
</#if>
</span>
</div>
<div class="right">

View File

@ -24,11 +24,7 @@
<div class="article-abstract article-image">
<div class="fn-clear">
<div class="article-date" data-ico="&#xe200;">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
<#else>
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
</#if>
</div>
<div class="fn-right">
<a rel="nofollow" data-ico="&#xe14e;" href="${servePath}${article.articlePermalink}#comments">

View File

@ -41,8 +41,11 @@
<div class="post-meta">
<span>
${article.articleCreateDate?string("yyyy-MM-dd")}
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateTimeLabel}
<#else>
${postTimeLabel}
</#if>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
@ -68,7 +71,7 @@
</section>
<#if 0 != paginationPageCount>
<nav class="pagination">
<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> ...
@ -84,5 +87,5 @@
<a href="${servePath}${path}?p=${paginationPageCount}" class="page-number">${paginationPageCount}</a>
<a href="${servePath}${path}?p=${paginationNextPageNum}" class="extend next">>></a>
</#if>
</nav>
</nav>
</#if>

View File

@ -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,10 +33,10 @@
<link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
</#if>
</@head>
</head>
<body>
<#include "header.ftl">
<main class="main">
</head>
<body>
<#include "header.ftl">
<main class="main">
<div class="wrapper">
<div class="content">
<article class="posts-expand">
@ -51,7 +51,11 @@
</h2>
<div class="post-meta">
<span class="post-time">
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateTimeLabel}
<#else>
${postTimeLabel}
</#if>
<time>
${article.articleUpdateDate?string("yyyy-MM-dd")}
</time>
@ -84,7 +88,8 @@
<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>
@ -112,9 +117,9 @@
</#if>
<#include "side.ftl">
</div>
</main>
<#include "footer.ftl">
<@comment_script oId=article.oId commentable=article.commentable>
</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>");
@ -126,6 +131,6 @@
page.loadRelevantArticles('${article.oId}', '<h4>${relevantArticles1Label}</h4>');
</#if>
NexT.initArticle()
</@comment_script>
</body>
</@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

View File

@ -39,13 +39,11 @@
<section class="meta">
<p>
${author1Label}<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> |
<#if article.hasUpdated>
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateDateLabel}:
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
<#else>
${createDateLabel}:
${article.articleCreateDate?string("yyyy-MM-dd HH:mm")}
</#if> | ${viewCount1Label} <a rel="nofollow" href="${servePath}${article.articlePermalink}">
</#if> ${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")} | ${viewCount1Label} <a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span class="left article-browserIcon" title="${viewLabel}"></span>
${article.articleViewCount}
</a> | ${commentCount1Label}

View File

@ -51,7 +51,11 @@
<section class="meta">
<p>
${author1Label}<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> |
${updateDateLabel}:${article.articleUpdateDate?string("yyyy-MM-dd HH:mm:ss")}
<#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateDateLabel}:
<#else>
${createDateLabel}:
</#if>${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")} |
${viewCount1Label}<a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span class="left article-browserIcon" title="${viewLabel}"></span>
${article.articleViewCount}

View File

@ -62,7 +62,7 @@
<div class="arrow"></div>
<time class="article-time">
<span>
${article.articleCreateDate?string("yy-MM-dd HH:mm")}
${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
</span>
</time>
<h3 class="article-title">
@ -108,7 +108,7 @@
</div>
</article>
<#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount && !article_has_next>
<div class="article-more" onclick="timeline.getNextPage(this, '${article.articleCreateDate?string("yyyy/MM")}')" data-page="${paginationCurrentPageNum}">${moreLabel}</div>
<div class="article-more" onclick="timeline.getNextPage(this, '${article.articleUpdateDate?string("yyyy/MM")}')" data-page="${paginationCurrentPageNum}">${moreLabel}</div>
</#if>
</#if>
</#list>

View File

@ -38,11 +38,7 @@
</div>
<div class="left article-info">
<div class="article-date">
<#if article.hasUpdated>
${article.articleUpdateDate?string("yyyy-MM-dd")}<br>${article.articleUpdateDate?string("HH:mm:ss")}
<#else>
${article.articleCreateDate?string("yyyy-MM-dd")}<br>${article.articleCreateDate?string("HH:mm:ss")}
</#if>
</div>
<div class="article-comment">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments">