This commit is contained in:
parent
efcc10cdeb
commit
8e3cd405ff
|
@ -21,30 +21,30 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
|
<@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
|
||||||
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
||||||
</@head>
|
</@head>
|
||||||
</head>
|
</head>
|
||||||
<body class="fn__flex-column">
|
<body class="fn__flex-column">
|
||||||
<div id="pjax" class="fn__flex-1">
|
<div id="pjax" class="fn__flex-1">
|
||||||
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
<#include "macro-header.ftl">
|
<#include "macro-header.ftl">
|
||||||
<@header type='other'></@header>
|
<@header type='index'></@header>
|
||||||
<div class="wrapper other">
|
<div class="wrapper">
|
||||||
<h2 class="other__title">
|
<h2 class="other__title">
|
||||||
<a href="${servePath}/archives.html" class="ft__a">${archiveLabel}</a> -
|
<a href="${servePath}/archives.html" class="ft__a">${archiveLabel}</a> -
|
||||||
<#if "en" == localeString?substring(0, 2)>
|
<#if "en" == localeString?substring(0, 2)>
|
||||||
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear}
|
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear}
|
||||||
<#else>
|
<#else>
|
||||||
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
|
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
|
||||||
</#if>
|
</#if>
|
||||||
</h2>
|
</h2>
|
||||||
<div class="other__meta other__meta--list">
|
<div class="ft__center">
|
||||||
${archiveDate.archiveDatePublishedArticleCount} ${cntArticleLabel}
|
${archiveDate.archiveDatePublishedArticleCount} ${cntArticleLabel}
|
||||||
</div>
|
</div>
|
||||||
<#include "article-list.ftl">
|
<#include "article-list.ftl">
|
||||||
</div>
|
</div>
|
||||||
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
||||||
</div>
|
</div>
|
||||||
<#include "footer.ftl">
|
<#include "footer.ftl">
|
||||||
</body>
|
</body>
|
||||||
|
|
|
@ -29,15 +29,14 @@
|
||||||
<div id="pjax" class="fn__flex-1">
|
<div id="pjax" class="fn__flex-1">
|
||||||
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
<#include "macro-header.ftl">
|
<#include "macro-header.ftl">
|
||||||
<@header type='other'></@header>
|
<@header type='index'></@header>
|
||||||
<div class="wrapper other">
|
<div class="wrapper">
|
||||||
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${archiveLabel}</h2>
|
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${archiveLabel}</h2>
|
||||||
<div class="other__meta">
|
<div class="ft__center">
|
||||||
${archiveDates?size} ${cntMonthLabel}
|
${archiveDates?size} ${cntMonthLabel}
|
||||||
${statistic.statisticPublishedBlogArticleCount} ${cntArticleLabel}
|
${statistic.statisticPublishedBlogArticleCount} ${cntArticleLabel}
|
||||||
</div>
|
</div>
|
||||||
<div class="other__content">
|
<div class="articles">
|
||||||
<#if 0 != archiveDates?size>
|
|
||||||
<#list archiveDates as archiveDate>
|
<#list archiveDates as archiveDate>
|
||||||
<div class="other__item other__item--archive">
|
<div class="other__item other__item--archive">
|
||||||
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
|
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
|
||||||
|
@ -53,7 +52,7 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</#list>
|
</#list>
|
||||||
</#if>
|
<br><br><br>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
||||||
|
|
|
@ -30,12 +30,11 @@
|
||||||
<div id="pjax" class="fn__flex-1">
|
<div id="pjax" class="fn__flex-1">
|
||||||
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
<#include "macro-header.ftl">
|
<#include "macro-header.ftl">
|
||||||
<@header type='other'></@header>
|
<@header type='index'></@header>
|
||||||
<div class="wrapper other">
|
<div class="wrapper">
|
||||||
<h2 class="other__title">
|
<h2 class="other__title">
|
||||||
<a href="${servePath}" class="ft__a">${blogTitle}</a> - ${authorName}
|
<a href="${servePath}" class="ft__a">${blogTitle}</a> - ${authorName}
|
||||||
</h2>
|
</h2>
|
||||||
<div class="other__meta other__meta--list"> </div>
|
|
||||||
<#include "article-list.ftl">
|
<#include "article-list.ftl">
|
||||||
</div>
|
</div>
|
||||||
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
||||||
|
|
|
@ -29,11 +29,11 @@
|
||||||
<div id="pjax" class="fn__flex-1">
|
<div id="pjax" class="fn__flex-1">
|
||||||
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
<#include "macro-header.ftl">
|
<#include "macro-header.ftl">
|
||||||
<@header type='other'></@header>
|
<@header type='index'></@header>
|
||||||
<div class="wrapper other">
|
<div class="wrapper">
|
||||||
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${category.categoryTitle}</h2>
|
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${category.categoryTitle}</h2>
|
||||||
<div class="other__meta other__meta--list">
|
<div class="ft__center">
|
||||||
${category.categoryDescription}
|
${category.categoryDescription}
|
||||||
</div>
|
</div>
|
||||||
<#include "article-list.ftl">
|
<#include "article-list.ftl">
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
<#--
|
||||||
|
|
||||||
|
Solo - A small and beautiful blogging system written in Java.
|
||||||
|
Copyright (c) 2010-present, b3log.org
|
||||||
|
|
||||||
|
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="${categoryLabel} - ${blogTitle}">
|
||||||
|
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
||||||
|
</@head>
|
||||||
|
</head>
|
||||||
|
<body class="fn__flex-column">
|
||||||
|
<div id="pjax" class="fn__flex-1">
|
||||||
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
|
<#include "macro-header.ftl">
|
||||||
|
<@header type='index'></@header>
|
||||||
|
<div class="wrapper">
|
||||||
|
<h2 class="other__title">
|
||||||
|
<a href="${servePath}" class="ft__a">${blogTitle}</a> - ${categoryLabel}
|
||||||
|
</h2>
|
||||||
|
<div class="ft__center">
|
||||||
|
${categories?size} ${cntLabel}${categoryLabel}
|
||||||
|
</div>
|
||||||
|
<div class="articles">
|
||||||
|
<br>
|
||||||
|
<#list categories as category>
|
||||||
|
<a href="${servePath}/category/${category.categoryURI}"
|
||||||
|
class="other__item">
|
||||||
|
${category.categoryTitle} -
|
||||||
|
<b>${category.categoryTagCnt}</b> ${tagsLabel}
|
||||||
|
</a>
|
||||||
|
</#list>
|
||||||
|
<br><br>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
||||||
|
</div>
|
||||||
|
<#include "footer.ftl">
|
||||||
|
</body>
|
||||||
|
</html>
|
File diff suppressed because one or more lines are too long
|
@ -352,7 +352,7 @@ a {
|
||||||
box-shadow: inset 1px 1px 4px rgba(0, 0, 0, .3), 0 2px 3px rgba(0, 0, 0, .4);
|
box-shadow: inset 1px 1px 4px rgba(0, 0, 0, .3), 0 2px 3px rgba(0, 0, 0, .4);
|
||||||
margin: 0 auto 20px;
|
margin: 0 auto 20px;
|
||||||
display: block;
|
display: block;
|
||||||
transition: transform .3s ease;
|
transition: all .3s ease;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
transform: rotate3d(0, 0, 1, -45deg);
|
transform: rotate3d(0, 0, 1, -45deg);
|
||||||
|
@ -584,6 +584,29 @@ a {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.other {
|
||||||
|
&__title {
|
||||||
|
margin: 40px 0 10px;
|
||||||
|
font-size: 28px;
|
||||||
|
text-align: center;
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__item {
|
||||||
|
line-height: 20px;
|
||||||
|
margin: 20px 35px 0 35px;
|
||||||
|
white-space: nowrap;
|
||||||
|
display: block;
|
||||||
|
color: $gray;
|
||||||
|
word-break: break-all;
|
||||||
|
|
||||||
|
&--archive {
|
||||||
|
width: 150px;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.article {
|
.article {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
|
||||||
|
@ -915,55 +938,6 @@ a {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.other {
|
|
||||||
position: relative;
|
|
||||||
|
|
||||||
&__title {
|
|
||||||
margin: -220px 0 5px;
|
|
||||||
color: #fff;
|
|
||||||
font-size: 28px;
|
|
||||||
text-align: center;
|
|
||||||
font-weight: 400;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__meta {
|
|
||||||
color: #fff;
|
|
||||||
font-size: 14px;
|
|
||||||
text-align: center;
|
|
||||||
|
|
||||||
&--list {
|
|
||||||
margin-bottom: 154px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&__content {
|
|
||||||
background-color: #fff;
|
|
||||||
padding: 70px 100px;
|
|
||||||
margin: 77px auto 40px;
|
|
||||||
box-shadow: 8px 14px 38px rgba(39, 44, 49, 0.06), 1px 3px 8px rgba(39, 44, 49, 0.03);
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__item {
|
|
||||||
line-height: 20px;
|
|
||||||
margin: 10px;
|
|
||||||
white-space: nowrap;
|
|
||||||
display: block;
|
|
||||||
|
|
||||||
&--archive {
|
|
||||||
width: 187px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
span, div {
|
|
||||||
color: $gray;
|
|
||||||
font-size: 12px;
|
|
||||||
word-break: break-all;
|
|
||||||
white-space: normal;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.header {
|
.header {
|
||||||
padding: 10px 0;
|
padding: 10px 0;
|
||||||
|
|
|
@ -21,34 +21,36 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<@head title="${linkLabel} - ${blogTitle}">
|
<@head title="${linkLabel} - ${blogTitle}">
|
||||||
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
||||||
</@head>
|
</@head>
|
||||||
</head>
|
</head>
|
||||||
<body class="fn__flex-column">
|
<body class="fn__flex-column">
|
||||||
<div id="pjax" class="fn__flex-1">
|
<div id="pjax" class="fn__flex-1">
|
||||||
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
<#include "macro-header.ftl">
|
<#include "macro-header.ftl">
|
||||||
<@header type='other'></@header>
|
<@header type='index'></@header>
|
||||||
<div class="wrapper other">
|
<div class="wrapper">
|
||||||
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${linkLabel}</h2>
|
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${linkLabel}</h2>
|
||||||
<div class="other__meta">
|
<div class="ft__center">
|
||||||
${links?size} ${linkLabel}
|
${links?size} ${linkLabel}
|
||||||
</div>
|
</div>
|
||||||
<div class="other__content">
|
<div class="articles">
|
||||||
<#if 0 != links?size>
|
<br>
|
||||||
<#list links as link>
|
<#if 0 != links?size>
|
||||||
<div class="other__item">
|
<#list links as link>
|
||||||
<a rel="friend" href="${link.linkAddress}" target="_blank">
|
<div class="other__item">
|
||||||
${link.linkTitle}
|
<a rel="friend" href="${link.linkAddress}" target="_blank">
|
||||||
</a>
|
${link.linkTitle}
|
||||||
<div>${link.linkDescription}</div>
|
</a>
|
||||||
</div>
|
<div>${link.linkDescription}</div>
|
||||||
</#list>
|
</div>
|
||||||
</#if>
|
</#list>
|
||||||
|
</#if>
|
||||||
|
<br><br>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
||||||
<#include "footer.ftl">
|
<#include "footer.ftl">
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -79,9 +79,6 @@
|
||||||
class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
|
class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
|
||||||
</li>
|
</li>
|
||||||
</#list>
|
</#list>
|
||||||
<li>
|
|
||||||
<a href="${servePath}/dynamic.html">${dynamicLabel}</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<a href="${servePath}/category.html">${categoryLabel}</a>
|
<a href="${servePath}/category.html">${categoryLabel}</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -21,23 +21,24 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
|
<@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
|
||||||
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
||||||
</@head>
|
</@head>
|
||||||
</head>
|
</head>
|
||||||
<body class="fn__flex-column">
|
<body class="fn__flex-column">
|
||||||
<div id="pjax" class="fn__flex-1">
|
<div id="pjax" class="fn__flex-1">
|
||||||
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
<#include "macro-header.ftl">
|
<#include "macro-header.ftl">
|
||||||
<@header type='other'></@header>
|
<@header type='index'></@header>
|
||||||
<div class="wrapper other">
|
<div class="wrapper">
|
||||||
<h2 class="other__title"><a href="${servePath}/tags.html" class="ft__a">${allTagsLabel}</a> - ${tag.tagTitle}</h2>
|
<h2 class="other__title"><a href="${servePath}/tags.html" class="ft__a">${allTagsLabel}</a> - ${tag.tagTitle}
|
||||||
<div class="other__meta--list other__meta">
|
</h2>
|
||||||
${tag.tagPublishedRefCount} ${cntArticleLabel}
|
<div class="ft__center">
|
||||||
|
${tag.tagPublishedRefCount} ${cntArticleLabel}
|
||||||
</div>
|
</div>
|
||||||
<#include "article-list.ftl">
|
<#include "article-list.ftl">
|
||||||
</div>
|
</div>
|
||||||
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
||||||
</div>
|
</div>
|
||||||
<#include "footer.ftl">
|
<#include "footer.ftl">
|
||||||
</body>
|
</body>
|
||||||
|
|
|
@ -21,40 +21,30 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<@head title="${allTagsLabel} - ${blogTitle}">
|
<@head title="${allTagsLabel} - ${blogTitle}">
|
||||||
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
|
||||||
</@head>
|
</@head>
|
||||||
</head>
|
</head>
|
||||||
<body class="fn__flex-column">
|
<body class="fn__flex-column">
|
||||||
<div id="pjax" class="fn__flex-1">
|
<div id="pjax" class="fn__flex-1">
|
||||||
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
<#if pjax><!---- pjax {#pjax} start ----></#if>
|
||||||
<#include "macro-header.ftl">
|
<#include "macro-header.ftl">
|
||||||
<@header type='other'></@header>
|
<@header type='index'></@header>
|
||||||
<div class="wrapper other">
|
<div class="wrapper">
|
||||||
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${allTagsLabel}</h2>
|
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${allTagsLabel}</h2>
|
||||||
<div class="other__meta">
|
<div class="ft__center">
|
||||||
${tags?size} ${tagLabel}
|
${tags?size} ${tagLabel}
|
||||||
</div>
|
</div>
|
||||||
<div class="other__content">
|
<div class="articles">
|
||||||
<#list mostUsedCategories as category>
|
<div class="fn__clear">
|
||||||
<span class="other__item--archive other__item">
|
<#list tags as tag>
|
||||||
<a href="${servePath}/category/${category.categoryURI}">
|
<a rel="tag" data-count="${tag.tagPublishedRefCount}" class="other__item fn__left"
|
||||||
${category.categoryTitle}
|
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
|
||||||
</a>
|
${tag.tagTitle} - <b>${tag.tagPublishedRefCount}</b> ${countLabel}
|
||||||
<span>${category.categoryTagCnt} ${tagLabel}</span>
|
</a>
|
||||||
</span>
|
</#list>
|
||||||
</#list>
|
</div>
|
||||||
</div>
|
<br><br>
|
||||||
<div class="other__content">
|
|
||||||
<#list tags as tag>
|
|
||||||
<span class="other__item other__item--archive">
|
|
||||||
<a rel="tag" data-count="${tag.tagPublishedRefCount}" class="tag"
|
|
||||||
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
|
|
||||||
${tag.tagTitle}
|
|
||||||
</a>
|
|
||||||
<span>${tag.tagPublishedRefCount} ${countLabel}</span>
|
|
||||||
</span>
|
|
||||||
</#list>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
<#if pjax><!---- pjax {#pjax} end ----></#if>
|
||||||
|
|
Loading…
Reference in New Issue