This commit is contained in:
Van 2019-03-22 10:02:00 +08:00
parent fbba7cde5c
commit 4996aa298b
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
6 changed files with 255 additions and 159 deletions

66
favourite/archives.ftl Normal file
View File

@ -0,0 +1,66 @@
<#--
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}
<#include "nav.ftl">
<div class="wrapper">
<div class="content">
<#include "header.ftl">
<div class="roundtop"></div>
<div class="body">
<div class="left main">
<#if 0 != archiveDates?size>
<#assign curYear = year?number>
<div class="kind-title">${year} ${yearLabel}</div>
<#list archiveDates as archiveDate>
<#if curYear != archiveDate.archiveDateYear?number>
<div class="kind-title">${archiveDate.archiveDateYear} ${yearLabel}</div>
</#if>
<div class="kind-panel">
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.archiveDateMonth} ${monthLabel}
- ${archiveDate.archiveDatePublishedArticleCount} ${countLabel}</a>
</div>
<#assign curYear = archiveDate.archiveDateYear?number>
</#list>
</#if>
</div>
<div class="right">
<#include "side.ftl">
</div>
<div class="clear"></div>
</div>
<div class="roundbottom"></div>
</div>
</div>
<div class="footer">
<div class="footer-icon"><#include "statistic.ftl"></div>
<#include "footer.ftl">
</div>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@ -20,10 +20,12 @@
* skin favoutite style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 2.1.0.2, Mar 16, 2019
* @version 2.2.0.0, Mar 22, 2019
*/
@import "../../../scss/reset";
@import "../../../scss/toc";
@import "../../../scss/usite";
@import "vditor/src/assets/scss/classic";
.left {
@ -47,6 +49,19 @@
.none {
display: none;
}
.marginTop12 {
margin-top: 12px;
}
.marginLeft12 {
margin-left: 12px;
}
#tags li {
list-style: none;
}
body {
background: url("../images/bg.jpg") repeat scroll left top transparent;
}

View File

@ -22,7 +22,7 @@
<a rel="nofollow" href="${servePath}" class="home">${homeLabel}</a>
<a href="${servePath}/tags.html" class="about">${allTagsLabel}</a>
<#list pageNavigations as page>
<a href="${page.pagePermalink}" <#if page.pageIcon != ''>style="background-image: url(${page.pageIcon})"</#if> target="${page.pageOpenTarget}" class="${page.pageTitle}">${page.pageTitle}</a>
<a href="${page.pagePermalink}" class="Guestbook" target="${page.pageOpenTarget}" class="${page.pageTitle}">${page.pageTitle}</a>
</#list>
<a rel="alternate" href="${servePath}/rss.xml" class="classifiche">RSS</a>
<a href="${servePath}/search?keyword=">Search</a>

View File

@ -27,174 +27,188 @@
</div>
<div class="marginLeft12 marginTop12">
${noticeBoard}
<#include "../../common-template/macro-user_site.ftl"/>
<div class="marginTop12">
<@userSite dir="nw"></@userSite>
</div>
</div>
</div>
<div class="line"></div>
</#if>
<#if 0 != recentComments?size>
<div class="item navi-comments">
<div class="ads">
<h4 id="recentComments">${recentCommentsLabel}</h4>
</div>
<ul>
<#list recentComments as comment>
<li>
<img class='left' title='${comment.commentName}'
alt='${comment.commentName}'
src='${comment.commentThumbnailURL}'/>
<div class='left'>
<div>
<a href="${comment.commentURL}">
${comment.commentName}
</a>
</div>
<div class="comm">
<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>
<div class="item">
<div class="esclamativo">
<h4>${mostCommentArticlesLabel}</h4>
</div>
<ul id="mostCommentArticles">
<#list mostCommentArticles as article>
<li>
<a rel="nofollow" title="${article.articleTitle}" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>(${article.articleCommentCount})
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostViewCountArticles?size>
<div class="item">
<div class="cuore">
<h4>${mostViewCountArticlesLabel}</h4>
</div>
<ul id="mostViewCountArticles">
<#list mostViewCountArticles as article>
<li>
<a rel="nofollow" title="${article.articleTitle}" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>(${article.articleViewCount})
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostUsedCategories?size>
<div class="item">
<div class="categorie">
<h4>${categoryLabel}</h4>
<#if article?? && article.articleToC?? && article.articleToC?size &gt; 0>
<div class="item navi-comments">
<div class="ads">
<h4>${tocLabel}</h4>
</div>
<ul id="mostViewCountArticles">
<#list mostUsedCategories as category>
<li>
<a href="${servePath}/category/${category.categoryURI}"
title="${category.categoryTitle} (${category.categoryTagCnt})">
${category.categoryTitle}</a>(${category.categoryTitle})
</li>
<#include "../../common-template/toc.ftl"/>
</div>
<#else>
<#if 0 != recentComments?size>
<div class="item navi-comments">
<div class="ads">
<h4 id="recentComments">${recentCommentsLabel}</h4>
</div>
<ul>
<#list recentComments as comment>
<li>
<img class='left' title='${comment.commentName}'
alt='${comment.commentName}'
src='${comment.commentThumbnailURL}'/>
<div class='left'>
<div>
<a href="${comment.commentURL}">
${comment.commentName}
</a>
</div>
<div class="comm">
<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 != mostUsedTags?size>
<div class="item">
<div class="tags">
<h4>${tagsLabel}</h4>
</div>
<ul class="mostViewCountArticles">
<#list mostUsedTags as tag>
<li>
<a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" class="no-underline">
</a>
<a rel="tag" title="${tag.tagTitle}" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}(${tag.tagPublishedRefCount})
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != links?size>
<div class="item">
<div class="blog">
<h4>${linkLabel}</h4>
</div>
<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" /></a>
<a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
${link.linkTitle}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != archiveDates?size>
<div class="item">
<div class="archivio">
<h4>${archiveLabel}</h4>
</div>
<ul id="save">
<#list archiveDates as archiveDate>
<#if archiveDate_index < 10>
</#if>
<#if 0 != mostCommentArticles?size>
<div class="item">
<div class="esclamativo">
<h4>${mostCommentArticlesLabel}</h4>
</div>
<ul id="mostCommentArticles">
<#list mostCommentArticles as article>
<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>
<a rel="nofollow" title="${article.articleTitle}" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>(${article.articleCommentCount})
</li>
</#if>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 1 != users?size>
<div class="item">
<div class="side-author">
<h4>${authorLabel}</h4>
</#list>
</ul>
</div>
<ul id="sideAuthor">
<#list users as user>
<li>
<a href="${servePath}/authors/${user.oId}" title="${user.userName}">
${user.userName}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostViewCountArticles?size>
<div class="item">
<div class="cuore">
<h4>${mostViewCountArticlesLabel}</h4>
</div>
<ul id="mostViewCountArticles">
<#list mostViewCountArticles as article>
<li>
<a rel="nofollow" title="${article.articleTitle}" href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>(${article.articleViewCount})
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostUsedCategories?size>
<div class="item">
<div class="categorie">
<h4>${categoryLabel}</h4>
</div>
<ul id="mostViewCountArticles">
<#list mostUsedCategories as category>
<li>
<a href="${servePath}/category/${category.categoryURI}"
title="${category.categoryTitle} (${category.categoryTagCnt})">
${category.categoryTitle}</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != mostUsedTags?size>
<div class="item">
<div class="tags">
<h4>${tagsLabel}</h4>
</div>
<ul class="mostViewCountArticles">
<#list mostUsedTags as tag>
<li>
<a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" class="no-underline">
</a>
<a rel="tag" title="${tag.tagTitle}" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}(${tag.tagPublishedRefCount})
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != links?size>
<div class="item">
<div class="blog">
<h4>${linkLabel}</h4>
</div>
<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" /></a>
<a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
${link.linkTitle}
</a>
</li>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 0 != archiveDates?size>
<div class="item">
<div class="archivio">
<h4><a href="${servePath}/archives.html">${archiveLabel}</a></h4>
</div>
<ul id="save">
<#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>
</#list>
</ul>
</div>
<div class="line"></div>
</#if>
<#if 1 != users?size>
<div class="item">
<div class="side-author">
<h4>${authorLabel}</h4>
</div>
<ul id="sideAuthor">
<#list users as user>
<li>
<a href="${servePath}/authors/${user.oId}" title="${user.userName}">
${user.userName}
</a>
</li>
</#list>
</ul>
</div>
</#if>
</#if>
<div class="rings" style="bottom: 0px;"></div>
</div>

View File

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