This commit is contained in:
Van 2019-03-22 11:37:24 +08:00
parent faa1169ee8
commit 50417e9a54
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
5 changed files with 222 additions and 126 deletions

70
i-nove/archives.ftl Normal file
View File

@ -0,0 +1,70 @@
<#--
Solo - A small and beautiful blogging system written in Java.
Copyright (c) 2010-2019, b3log.org & hacpai.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<#include "../../common-template/macro-common_head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${archiveLabel} - ${blogTitle}">
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
</@head>
</head>
<body>
${topBarReplacement}
<div class="bg">
<div class="wrapper">
<div class="content">
<#include "header.ftl">
<div class="body">
<div class="left main">
<div class="kind-title">${archiveLabel}</div>
<#if 0 != archiveDates?size>
<ul class="fn-clear fn-wrap" id='tags'>
<#list archiveDates as archiveDate>
<li class="kind-panel">
<#if "en" == localeString?substring(0, 2)>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})</a>
<#else>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
</#if>
</li>
</#list>
</ul>
</#if>
</div>
<div class="right">
<#include "side.ftl">
</div>
<div class="clear"></div>
</div>
<div class="footer">
<#include "footer.ftl">
</div>
</div>
</div>
<script type="text/javascript">
Util.buildTags();
</script>
</div>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@ -20,11 +20,22 @@
* skin i-nove style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 2.0.0.2, Mar 16, 2019
* @version 2.1.0.0, Mar 22, 2019
*/
@import "../../../scss/toc";
@import "../../../scss/reset";
@import "../../../scss/usite";
@import "vditor/src/assets/scss/classic";
#tags li {
list-style: none;
line-height: 20px;
}
.user__site {
margin-right: 10px ;
}
.left {
float: left;
}
@ -55,6 +66,10 @@
margin-top: 12px;
}
.marginRight12 {
margin-right: 12px;
}
.margin5 {
margin: 5px;
}

View File

@ -18,144 +18,155 @@
-->
<div id="sideNavi" class="side-navi">
<#if "" != noticeBoard>
<div class="item">
<#if "" != noticeBoard>
<h4>${noticeBoardLabel}</h4>
<div class="marginLeft12 marginTop12">
${noticeBoard}
</div>
</#if>
<#include "../../common-template/macro-user_site.ftl"/>
<div class="marginTop12 marginLeft12">
<@userSite dir="nw"/>
</div>
</div>
<div class="line"></div>
</#if>
<#if 0 != recentComments?size>
<div class="item navi-comments">
<h4>${recentCommentsLabel}</h4>
<ul>
<#list recentComments as comment>
<li>
<img class='left' title='${comment.commentName}'
alt='${comment.commentName}'
src='${comment.commentThumbnailURL}'/>
<div class='left'>
<div>
<a target="_blank" href="${comment.commentURL}">
${comment.commentName}
</a>
</div>
<div>
<a rel="nofollow" class='side-comment' href="${servePath}${comment.commentSharpURL}">
${comment.commentContent}
</a>
</div>
</div>
<div class='clear'></div>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostCommentArticles?size>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<div class="item">
<h4>${mostCommentArticlesLabel}</h4>
<ul id="mostCommentArticles">
<#list mostCommentArticles as article>
<li>
<a rel="nofollow" title="${article.articleTitle}"
href="${servePath}${article.articlePermalink}">
<sup>[${article.articleCommentCount}]</sup>
${article.articleTitle}
</a>
</li>
</#list>
</ul>
<h4>${tocLabel}</h4>
<#include "../../common-template/toc.ftl"/>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostViewCountArticles?size>
<div class="item"><h4>${mostViewCountArticlesLabel}</h4>
<ul id="mostViewCountArticles">
<#list mostViewCountArticles as article>
<li>
<a rel="nofollow" title="${article.articleTitle}"
href="${servePath}${article.articlePermalink}">
<sup>[${article.articleViewCount}]</sup>
${article.articleTitle}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostUsedCategories?size>
<div class="item">
<h4>${categoryLabel}</h4>
<ul class="navi-tags">
<#list mostUsedCategories as category>
<li>
<a href="${servePath}/category/${category.categoryURI}">
${category.categoryTitle}</a> (${category.categoryTagCnt})
</li>
<#else>
<#if 0 != recentComments?size>
<div class="item navi-comments">
<h4>${recentCommentsLabel}</h4>
<ul>
<#list recentComments as comment>
<li>
<img class='left' title='${comment.commentName}'
alt='${comment.commentName}'
src='${comment.commentThumbnailURL}'/>
<div class='left'>
<div>
<a target="_blank" href="${comment.commentURL}">
${comment.commentName}
</a>
</div>
<div>
<a rel="nofollow" class='side-comment' href="${servePath}${comment.commentSharpURL}">
${comment.commentContent}
</a>
</div>
</div>
<div class='clear'></div>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
</#if>
<#if 0 != mostCommentArticles?size>
<div class="item">
<h4>${mostCommentArticlesLabel}</h4>
<ul id="mostCommentArticles">
<#list mostCommentArticles as article>
<li>
<a rel="nofollow" title="${article.articleTitle}"
href="${servePath}${article.articlePermalink}">
<sup>[${article.articleCommentCount}]</sup>
${article.articleTitle}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostViewCountArticles?size>
<div class="item"><h4>${mostViewCountArticlesLabel}</h4>
<ul id="mostViewCountArticles">
<#list mostViewCountArticles as article>
<li>
<a rel="nofollow" title="${article.articleTitle}"
href="${servePath}${article.articlePermalink}">
<sup>[${article.articleViewCount}]</sup>
${article.articleTitle}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostUsedCategories?size>
<div class="item">
<h4>${categoryLabel}</h4>
<ul class="navi-tags">
<#list mostUsedCategories as category>
<li>
<a href="${servePath}/category/${category.categoryURI}">
${category.categoryTitle}</a> (${category.categoryTagCnt})
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostUsedTags?size>
<div class="item">
<h4>${tagsLabel}</h4>
<ul class="navi-tags">
<#list mostUsedTags as tag>
<li>
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}</a> (${tag.tagPublishedRefCount})
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != links?size>
<div class="item">
<h4>${linkLabel}</h4>
<ul id="sideLink" class="navi-tags">
<#list links as link>
<li>
<a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
<img alt="${link.linkTitle}"
src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>" width="16" height="16" />
${link.linkTitle}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != archiveDates?size>
<div class="item">
<h4>${archiveLabel}</h4>
<ul>
<#list archiveDates as archiveDate>
<#if archiveDate_index < 10>
<li>
<#if "en" == localeString?substring(0, 2)>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.monthName} ${archiveDate.archiveDateYear}</a>(${archiveDate.archiveDatePublishedArticleCount})
<#else>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}</a>(${archiveDate.archiveDatePublishedArticleCount})
<#if 0 != mostUsedTags?size>
<div class="item">
<h4>${tagsLabel}</h4>
<ul class="navi-tags">
<#list mostUsedTags as tag>
<li>
<a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}</a> (${tag.tagPublishedRefCount})
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != links?size>
<div class="item">
<h4>${linkLabel}</h4>
<ul id="sideLink" class="navi-tags">
<#list links as link>
<li>
<a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
<img alt="${link.linkTitle}"
src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>" width="16" height="16" />
${link.linkTitle}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != archiveDates?size>
<div class="item">
<h4><a href="${servePath}/archives.html">${archiveLabel}</a></h4>
<ul>
<#list archiveDates as archiveDate>
<#if archiveDate_index < 10>
<li>
<#if "en" == localeString?substring(0, 2)>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.monthName} ${archiveDate.archiveDateYear}</a>(${archiveDate.archiveDatePublishedArticleCount})
<#else>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}</a>(${archiveDate.archiveDatePublishedArticleCount})
</#if>
</li>
</#if>
</li>
</#if>
</#list>
</ul>
</div>
</#list>
</ul>
</div>
</#if>
</#if>
</div>

View File

@ -35,7 +35,7 @@
<div class="left main">
<ul id="tags">
<#list tags as tag>
<li>
<li class="kind-panel left marginRight12">
<a rel="tag" data-count="${tag.tagPublishedRefCount}"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" title="${tag.tagTitle}">
<span>${tag.tagTitle}</span>