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

📝 fix https://github.com/b3log/solo/issues/12868

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
9IPHP/article-list.ftl
View File

@ -40,7 +40,8 @@
</h2> </h2>
<div class="meta"> <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> <i class="icon-date"></i>
<time> <time>
${article.articleUpdateDate?string("yyyy-MM-dd")} ${article.articleUpdateDate?string("yyyy-MM-dd")}

2
9IPHP/article.ftl
View File

@ -52,7 +52,7 @@
</#if> </#if>
</h2> </h2>
<div class="meta"> <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> <i class="icon-date"></i>
<time> <time>
${article.articleUpdateDate?string("yyyy-MM-dd")} ${article.articleUpdateDate?string("yyyy-MM-dd")}

6
Andrea/article-list.ftl
View File

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

10
Bruce/article-list.ftl
View File

@ -38,7 +38,7 @@
<#setting locale=localeString> <#setting locale=localeString>
</div> </div>
<div class="row article-content"> <div class="row article-content vditor-reset">
<div class="col-sm-12" id="abstract${article.oId}"> <div class="col-sm-12" id="abstract${article.oId}">
${article.articleAbstract} ${article.articleAbstract}
</div> </div>
@ -48,20 +48,20 @@
<div class="row"> <div class="row">
<div class="col-sm-2"></div> <div class="col-sm-2"></div>
<div class="col-sm-4"> <div class="col-sm-4">
<#if 1 < paginationCurrentPageNum> <#if 1 < paginationCurrentPageNum>
<#assign prePage = paginationCurrentPageNum - 1> <#assign prePage = paginationCurrentPageNum - 1>
<a class="btn btn-success" href="${servePath}${path}?p=${prePage}">Newer</a> <a class="btn btn-success" href="${servePath}${path}?p=${prePage}">Newer</a>
</#if> </#if>
</div> </div>
<div class="col-sm-4 text-right"> <div class="col-sm-4 text-right">
<#if paginationCurrentPageNum < paginationPageCount> <#if paginationCurrentPageNum < paginationPageCount>
<#assign nextPage = paginationCurrentPageNum + 1> <#assign nextPage = paginationCurrentPageNum + 1>
<a class="btn btn-success" href="${servePath}${path}?p=${nextPage}">Older</a> <a class="btn btn-success" href="${servePath}${path}?p=${nextPage}">Older</a>
</#if> </#if>
</div> </div>
<div class="col-sm-2"></div> <div class="col-sm-2"></div>
</div> </div>

185
Community/article-list.ftl
View File

@ -18,106 +18,107 @@
--> -->
<#list articles as article> <#list articles as article>
<div class="marginBottom40"> <div class="marginBottom40">
<div class="article-header"> <div class="article-header">
<div class="article-date"> <div class="article-date">
<#if article.hasUpdated> ${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")}
${article.articleUpdateDate?string("yyyy-MM-dd HH:mm")} </div>
<#else> <div class="arrow-right"></div>
${article.articleCreateDate?string("yyyy-MM-dd HH:mm")} <div class="clear"></div>
</#if> <ul>
</div> <li>
<div class="arrow-right"></div>
<div class="clear"></div>
<ul>
<li>
<span class="left"> <span class="left">
by&nbsp; by&nbsp;
</span> </span>
<a rel="nofollow" class="left" title="${article.authorName}" href="${servePath}/authors/${article.authorId}"> <a rel="nofollow" class="left" title="${article.authorName}"
${article.authorName} href="${servePath}/authors/${article.authorId}">
</a> ${article.authorName}
<span class="clear"></span>
</li>
<li>
<a rel="nofollow" href="${servePath}${article.articlePermalink}" title="${viewLabel}">
${viewLabel} (${article.articleViewCount})
</a>
</li>
<li>
<a rel="nofollow" title="${commentLabel}" href="${servePath}${article.articlePermalink}#comments">
${commentLabel} (${article.articleCommentCount})
</a>
</li>
</ul>
</div>
<div class="article-main">
<h2 class="title">
<a rel="bookmark" class="no-underline" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
<#if article.articlePutTop>
<sup>
${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
<a href="${servePath}${article.articlePermalink}">
${updatedLabel}
</a> </a>
</sup> <span class="clear"></span>
</#if> </li>
</h2> <li>
<div class="vditor-reset"> <a rel="nofollow" href="${servePath}${article.articlePermalink}" title="${viewLabel}">
${article.articleAbstract} ${viewLabel} (${article.articleViewCount})
</a>
</li>
<li>
<a rel="nofollow" title="${commentLabel}" href="${servePath}${article.articlePermalink}#comments">
${commentLabel} (${article.articleCommentCount})
</a>
</li>
</ul>
</div> </div>
<div class="read-more"> <div class="article-main">
<a href="${servePath}${article.articlePermalink}"> <h2 class="title">
<span class="left">${readmore2Label}</span> <a rel="bookmark" class="no-underline" href="${servePath}${article.articlePermalink}">
<span class="read-more-icon"></span> ${article.articleTitle}
<span class="clear"></span>
</a>
<div class="clear"></div>
</div>
</div>
<div class="article-footer">
<h3>${tagsLabel}</h3>
<ul>
<#list article.articleTags?split(",") as articleTag>
<li>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}
</a> </a>
</li> <#if article.articlePutTop>
</#list> <sup>
<li> ${topArticleLabel}
</sup>
</#if>
<#if article.hasUpdated>
<sup>
<a href="${servePath}${article.articlePermalink}">
${updatedLabel}
</a>
</sup>
</#if>
</h2>
<div class="vditor-reset">
${article.articleAbstract}
</div>
<div class="read-more">
<a href="${servePath}${article.articlePermalink}"> <a href="${servePath}${article.articlePermalink}">
${createDateLabel}:${article.articleCreateDate?string("yyyy-MM-dd HH:mm")} <span class="left">${readmore2Label}</span>
<span class="read-more-icon"></span>
<span class="clear"></span>
</a> </a>
</li> <div class="clear"></div>
</ul> </div>
</div>
<div class="article-footer">
<h3>${tagsLabel}</h3>
<ul>
<#list article.articleTags?split(",") as articleTag>
<li>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}
</a>
</li>
</#list>
<li>
<a href="${servePath}${article.articlePermalink}">
<#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>
<div class="clear"></div>
</div>
</#list> </#list>
<#if 0 != paginationPageCount> <#if 0 != paginationPageCount>
<div class="pagination"> <div class="pagination">
<#if 1 != paginationPageNums?first> <#if 1 != paginationPageNums?first>
<a href="${servePath}${path}">${firstPageLabel}</a> <a href="${servePath}${path}">${firstPageLabel}</a>
<a id="previousPage" href="${servePath}${path}?p=${paginationPreviousPageNum}">${previousPageLabel}</a> <a id="previousPage" href="${servePath}${path}?p=${paginationPreviousPageNum}">${previousPageLabel}</a>
</#if> </#if>
<#list paginationPageNums as paginationPageNum> <#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum> <#if paginationPageNum == paginationCurrentPageNum>
<a href="${servePath}${path}?p=${paginationPageNum}" class="selected">${paginationPageNum}</a> <a href="${servePath}${path}?p=${paginationPageNum}" class="selected">${paginationPageNum}</a>
<#else> <#else>
<a href="${servePath}${path}?p=${paginationPageNum}">${paginationPageNum}</a> <a href="${servePath}${path}?p=${paginationPageNum}">${paginationPageNum}</a>
</#if> </#if>
</#list> </#list>
<#if paginationPageNums?last != paginationPageCount> <#if paginationPageNums?last != paginationPageCount>
<a id="nextPage" href="${servePath}${path}?p=${paginationNextPageNum}">${nextPagePabel}</a> <a id="nextPage" href="${servePath}${path}?p=${paginationNextPageNum}">${nextPagePabel}</a>
<a href="${servePath}${path}?p=${paginationPageCount}">${lastPageLabel}</a> <a href="${servePath}${path}?p=${paginationPageCount}">${lastPageLabel}</a>
</#if> </#if>
&nbsp;&nbsp;${sumLabel} ${paginationPageCount} ${pageLabel} &nbsp;&nbsp;${sumLabel} ${paginationPageCount} ${pageLabel}
</div> </div>
</#if> </#if>

2
Community/article.ftl
View File

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

53
Pinghsu/article-list.ftl
View File

@ -30,35 +30,36 @@
<div class="item__slant"></div> <div class="item__slant"></div>
<div class="item__slant item__slant--white"></div> <div class="item__slant item__slant--white"></div>
<div class="item__main"> <div class="item__main">
<#if article.articlePutTop> <span class="item__sup">
<sup class="ft__red"> <#if article.articlePutTop>
${topArticleLabel} <sup class="ft__red">
</sup> ${topArticleLabel}
</#if> </sup>
<#if article.hasUpdated> </#if>
<sup> <#if article.hasUpdated>
<a class="ft__red" href="${servePath}${article.articlePermalink}"> <sup class="ft__red">
${updatedLabel} ${updatedLabel}
</a> </sup>
</sup> </#if>
</#if> </span>
<h2 class="item__title"> <h2 class="item__title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
</h2> </h2>
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<#if articleTag_index == 0> <#if articleTag_index == 0>
<div class="ico ico--${article_index % 10}"></div> <div class="ico ico--${article_index % 10}"></div>
<#if article.category??> <#if article.category??>
<a class="item__tag" href="${servePath}/category/${article.category.categoryURI}">${article.category.categoryTitle}</a> <a class="item__tag"
<#else> href="${servePath}/category/${article.category.categoryURI}">${article.category.categoryTitle}</a>
<a rel="tag" class="item__tag" href="${servePath}/tags/${articleTag?url('UTF-8')}"> <#else>
${articleTag} <a rel="tag" class="item__tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
</a> ${articleTag}
</a>
</#if>
</#if> </#if>
</#if> </#list>
</#list>
</div> </div>
</div> </div>
</article> </article>
@ -73,10 +74,10 @@
</#if> </#if>
<#list paginationPageNums as paginationPageNum> <#list paginationPageNums as paginationPageNum>
<#if paginationPageNum == paginationCurrentPageNum> <#if paginationPageNum == paginationCurrentPageNum>
<span class="pagination__item pagination__item--current">${paginationPageNum}</span> <span class="pagination__item pagination__item--current">${paginationPageNum}</span>
<#else> <#else>
<a class="pagination__item" <a class="pagination__item"
href="${servePath}${path}?p=${paginationPageNum}">${paginationPageNum}</a> href="${servePath}${path}?p=${paginationPageNum}">${paginationPageNum}</a>
</#if> </#if>
</#list> </#list>
<#if paginationPageNums?last != paginationPageCount> <#if paginationPageNums?last != paginationPageCount>
@ -86,4 +87,4 @@
<a href="${servePath}${path}?p=${paginationNextPageNum}" class="pagination__item">→</a> <a href="${servePath}${path}?p=${paginationNextPageNum}" class="pagination__item">→</a>
</#if> </#if>
</nav> </nav>
</#if> </#if>

60
Pinghsu/article.ftl
View File

@ -41,16 +41,20 @@
<div class="post wrapper wrapper--miner"> <div class="post wrapper wrapper--miner">
<h2 class="item__title"> <h2 class="item__title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
<#if article.articlePutTop> <#if article.articlePutTop>
<sup> <sup>
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h2> </h2>
<div class="ft__fade item__meta"> <div class="ft__fade item__meta">
Published on <#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
Updated on
<#else>
Published on
</#if>
<time> <time>
<#setting locale="en_US"> <#setting locale="en_US">
${article.articleUpdateDate?string["MMM d, yyyy"]} ${article.articleUpdateDate?string["MMM d, yyyy"]}
@ -64,25 +68,25 @@
</#if> </#if>
</div> </div>
<div class="item__tags"> <div class="item__tags">
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<a rel="tag" class="tag tag--${articleTag_index}" href="${servePath}/tags/${articleTag?url('UTF-8')}"> <a rel="tag" class="tag tag--${articleTag_index}" href="${servePath}/tags/${articleTag?url('UTF-8')}">
<b># ${articleTag}</b> <b># ${articleTag}</b>
</a> </a>
</#list> </#list>
</div> </div>
<div class="vditor-reset"> <div class="vditor-reset">
${article.articleContent} ${article.articleContent}
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<div> <div>
${article.articleSign.signHTML} ${article.articleSign.signHTML}
</div> </div>
</#if> </#if>
</div> </div>
</div> </div>
<div class="post__toc"> <div class="post__toc">
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0> <#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<#include "../../common-template/toc.ftl"/> <#include "../../common-template/toc.ftl"/>
</#if> </#if>
</div> </div>
<div class="body--gray post__gray"> <div class="body--gray post__gray">
<div class="wrapper comment"> <div class="wrapper comment">
@ -118,17 +122,17 @@
</span> </span>
<span class="post__arrow"> <span class="post__arrow">
<#if previousArticlePermalink??> <#if previousArticlePermalink??>
<a href="${servePath}${previousArticlePermalink}" rel="prev" <a href="${servePath}${previousArticlePermalink}" rel="prev"
class="vditor-tooltipped__n vditor-tooltipped" class="vditor-tooltipped__n vditor-tooltipped"
pjax-title="${previousArticleTitle}" pjax-title="${previousArticleTitle}"
aria-label="${previousArticleLabel}: ${previousArticleTitle}">←</a> aria-label="${previousArticleLabel}: ${previousArticleTitle}">←</a>
</#if> </#if>
<#if nextArticlePermalink??> <#if nextArticlePermalink??>
<a href="${servePath}${nextArticlePermalink}" rel="next" <a href="${servePath}${nextArticlePermalink}" rel="next"
class="vditor-tooltipped__n vditor-tooltipped" class="vditor-tooltipped__n vditor-tooltipped"
pjax-title="${nextArticleTitle}" pjax-title="${nextArticleTitle}"
aria-label="${nextArticleLabel}: ${nextArticleTitle}">→</a> aria-label="${nextArticleLabel}: ${nextArticleTitle}">→</a>
</#if> </#if>
<a href="javascript:Util.goTop()" class="vditor-tooltipped__n vditor-tooltipped" <a href="javascript:Util.goTop()" class="vditor-tooltipped__n vditor-tooltipped"
aria-label="${goTopLabel}">↑</a> aria-label="${goTopLabel}">↑</a>
@ -137,7 +141,7 @@
</span> </span>
</div> </div>
</div> </div>
<#if pjax><!---- pjax {#pjax} end ----></#if> <#if pjax><!---- pjax {#pjax} end ----></#if>
</main> </main>
<#include "footer.ftl"> <#include "footer.ftl">

2
Pinghsu/css/base.css
View File

File diff suppressed because one or more lines are too long

7
Pinghsu/css/base.scss
View File

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

10
favourite/article-list.ftl
View File

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

6
i-nove/article-list.ftl
View File

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

4
metro-hot/article-list.ftl
View File

@ -24,11 +24,7 @@
<div class="article-abstract article-image"> <div class="article-abstract article-image">
<div class="fn-clear"> <div class="fn-clear">
<div class="article-date" data-ico="&#xe200;"> <div class="article-date" data-ico="&#xe200;">
<#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")}
</#if>
</div> </div>
<div class="fn-right"> <div class="fn-right">
<a rel="nofollow" data-ico="&#xe14e;" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" data-ico="&#xe14e;" href="${servePath}${article.articlePermalink}#comments">

105
next/article-list.ftl
View File

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

143
next/article.ftl
View File

@ -22,110 +22,115 @@
<#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}"/>
<#if previousArticlePermalink??> <#if previousArticlePermalink??>
<link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}"> <link rel="prev" title="${previousArticleTitle}" href="${servePath}${previousArticlePermalink}">
</#if> </#if>
<#if nextArticlePermalink??> <#if nextArticlePermalink??>
<link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}"> <link rel="next" title="${nextArticleTitle}" href="${servePath}${nextArticlePermalink}">
</#if> </#if>
</@head> </@head>
</head> </head>
<body> <body>
<#include "header.ftl"> <#include "header.ftl">
<main class="main"> <main class="main">
<div class="wrapper"> <div class="wrapper">
<div class="content"> <div class="content">
<article class="posts-expand"> <article class="posts-expand">
<header class="post-header"> <header class="post-header">
<h2 class="post-title"> <h2 class="post-title">
${article.articleTitle} ${article.articleTitle}
<#if article.articlePutTop> <#if article.articlePutTop>
<sup> <sup>
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h2> </h2>
<div class="post-meta"> <div class="post-meta">
<span class="post-time"> <span class="post-time">
${postTimeLabel} <#if article.articleCreateDate?datetime != article.articleUpdateDate?datetime>
${updateTimeLabel}
<#else>
${postTimeLabel}
</#if>
<time> <time>
${article.articleUpdateDate?string("yyyy-MM-dd")} ${article.articleUpdateDate?string("yyyy-MM-dd")}
</time> </time>
</span> </span>
<span class="post-comments-count"> <span class="post-comments-count">
&nbsp; | &nbsp; &nbsp; | &nbsp;
<a href="${servePath}${article.articlePermalink}#comments"> <a href="${servePath}${article.articlePermalink}#comments">
${article.articleCommentCount} ${cmtLabel}</a> ${article.articleCommentCount} ${cmtLabel}</a>
</span> </span>
&nbsp; | &nbsp; ${viewsLabel} &nbsp; | &nbsp; ${viewsLabel}
${article.articleViewCount}°C ${article.articleViewCount}°C
</div> </div>
</header> </header>
<div class="post-body post-body--article vditor-reset"> <div class="post-body post-body--article vditor-reset">
${article.articleContent} ${article.articleContent}
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<div> <div>
${article.articleSign.signHTML} ${article.articleSign.signHTML}
</div> </div>
</#if> </#if>
</div> </div>
<footer> <footer>
<div class="post-tags"> <div class="post-tags">
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}"> <a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">
${articleTag}</a> ${articleTag}</a>
</#list> </#list>
</div> </div>
<div class="post-nav fn-clear"> <div class="post-nav fn-clear">
<#if previousArticlePermalink??> <#if previousArticlePermalink??>
<div class="post-nav-prev post-nav-item fn-right"> <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} > ${previousArticleTitle} >
</a> </a>
</div> </div>
</#if> </#if>
<#if nextArticlePermalink??> <#if nextArticlePermalink??>
<div class="post-nav-next post-nav-item fn-left"> <div class="post-nav-next post-nav-item fn-left">
<a href="${servePath}${nextArticlePermalink}" rel="next" title="${nextArticleTitle}"> <a href="${servePath}${nextArticlePermalink}" rel="next" title="${nextArticleTitle}">
< ${nextArticleTitle} < ${nextArticleTitle}
</a> </a>
</div> </div>
</#if> </#if>
</div> </div>
</footer> </footer>
</article> </article>
</div> </div>
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
<#if 0 != relevantArticlesDisplayCount> <#if 0 != relevantArticlesDisplayCount>
<div id="relevantArticles"></div> <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>
<#if 0 != randomArticlesDisplayCount> <#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(); 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>
NexT.initArticle() NexT.initArticle()
</@comment_script> </@comment_script>
</body> </body>
</html> </html>

3
next/lang/lang_en_US.properties
View File

@ -18,10 +18,11 @@
# #
# Description: Solo language configurations(en_US). # 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 # Author: Liyuan Li
# #
updateTimeLabel=Update At
tocLabel=Article ToC tocLabel=Article ToC
siteViewLabel=Site siteViewLabel=Site
viewsLabel=Heat viewsLabel=Heat

3
next/lang/lang_zh_CN.properties
View File

@ -18,10 +18,11 @@
# #
# Description: Solo default language configurations(zh_CN). # 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 # Author: Liyuan Li
# #
updateTimeLabel=\u66F4\u65B0\u4E8E
tocLabel=\u6587\u7AE0\u76EE\u5F55 tocLabel=\u6587\u7AE0\u76EE\u5F55
siteViewLabel=\u7AD9\u70B9\u6982\u89C8 siteViewLabel=\u7AD9\u70B9\u6982\u89C8
viewsLabel=\u70ED\u5EA6 viewsLabel=\u70ED\u5EA6

6
owmx-3.0/article-list.ftl
View File

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

6
owmx-3.0/article.ftl
View File

@ -51,7 +51,11 @@
<section class="meta"> <section class="meta">
<p> <p>
${author1Label}<a rel="nofollow" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> | ${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}"> ${viewCount1Label}<a rel="nofollow" href="${servePath}${article.articlePermalink}">
<span class="left article-browserIcon" title="${viewLabel}"></span> <span class="left article-browserIcon" title="${viewLabel}"></span>
${article.articleViewCount} ${article.articleViewCount}

8
timeline/index.ftl
View File

@ -49,7 +49,7 @@
<span class="article-archive"> <span class="article-archive">
<#if "en" == localeString?substring(0, 2)> <#if "en" == localeString?substring(0, 2)>
${archiveDate.monthName} ${archiveDate.archiveDateYear} ${archiveDate.monthName} ${archiveDate.archiveDateYear}
<#else> <#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
</#if> </#if>
</span> </span>
@ -62,7 +62,7 @@
<div class="arrow"></div> <div class="arrow"></div>
<time class="article-time"> <time class="article-time">
<span> <span>
${article.articleCreateDate?string("yy-MM-dd HH:mm")} ${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
</span> </span>
</time> </time>
<h3 class="article-title"> <h3 class="article-title">
@ -108,10 +108,10 @@
</div> </div>
</article> </article>
<#if paginationCurrentPageNum != paginationPageCount && 0 != paginationPageCount && !article_has_next> <#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>
</#if> </#if>
</#list> </#list>
</div> </div>
</#list> </#list>
</div> </div>

6
tree-house/article-list.ftl
View File

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