This commit is contained in:
Van 2019-07-10 22:14:18 +08:00
parent efcc10cdeb
commit 8e3cd405ff
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
11 changed files with 155 additions and 137 deletions

View File

@ -21,30 +21,30 @@
<!DOCTYPE html>
<html>
<head>
<@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${blogTitle}">
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
</@head>
<@head title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} ${archiveLabel} - ${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='other'></@header>
<div class="wrapper other">
<@header type='index'></@header>
<div class="wrapper">
<h2 class="other__title">
<a href="${servePath}/archives.html" class="ft__a">${archiveLabel}</a> -
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear}
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
</#if>
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear}
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
</#if>
</h2>
<div class="other__meta other__meta--list">
<div class="ft__center">
${archiveDate.archiveDatePublishedArticleCount} ${cntArticleLabel}
</div>
<#include "article-list.ftl">
</div>
<#if pjax><!---- pjax {#pjax} end ----></#if>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div>
<#include "footer.ftl">
</body>

View File

@ -29,15 +29,14 @@
<div id="pjax" class="fn__flex-1">
<#if pjax><!---- pjax {#pjax} start ----></#if>
<#include "macro-header.ftl">
<@header type='other'></@header>
<div class="wrapper other">
<@header type='index'></@header>
<div class="wrapper">
<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}
${statistic.statisticPublishedBlogArticleCount} ${cntArticleLabel}
</div>
<div class="other__content">
<#if 0 != archiveDates?size>
<div class="articles">
<#list archiveDates as archiveDate>
<div class="other__item other__item--archive">
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
@ -53,7 +52,7 @@
</span>
</div>
</#list>
</#if>
<br><br><br>
</div>
</div>
<#if pjax><!---- pjax {#pjax} end ----></#if>

View File

@ -30,12 +30,11 @@
<div id="pjax" class="fn__flex-1">
<#if pjax><!---- pjax {#pjax} start ----></#if>
<#include "macro-header.ftl">
<@header type='other'></@header>
<div class="wrapper other">
<@header type='index'></@header>
<div class="wrapper">
<h2 class="other__title">
<a href="${servePath}" class="ft__a">${blogTitle}</a> - ${authorName}
</h2>
<div class="other__meta other__meta--list">&nbsp;</div>
<#include "article-list.ftl">
</div>
<#if pjax><!---- pjax {#pjax} end ----></#if>

View File

@ -29,11 +29,11 @@
<div id="pjax" class="fn__flex-1">
<#if pjax><!---- pjax {#pjax} start ----></#if>
<#include "macro-header.ftl">
<@header type='other'></@header>
<div class="wrapper other">
<@header type='index'></@header>
<div class="wrapper">
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${category.categoryTitle}</h2>
<div class="other__meta other__meta--list">
${category.categoryDescription} &nbsp;
<div class="ft__center">
${category.categoryDescription}
</div>
<#include "article-list.ftl">
</div>

56
Bubble/category.ftl Normal file
View File

@ -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

View File

@ -352,7 +352,7 @@ a {
box-shadow: inset 1px 1px 4px rgba(0, 0, 0, .3), 0 2px 3px rgba(0, 0, 0, .4);
margin: 0 auto 20px;
display: block;
transition: transform .3s ease;
transition: all .3s ease;
&:hover {
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 {
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) {
.header {
padding: 10px 0;

View File

@ -21,34 +21,36 @@
<!DOCTYPE html>
<html>
<head>
<@head title="${linkLabel} - ${blogTitle}">
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
</@head>
<@head title="${linkLabel} - ${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='other'></@header>
<div class="wrapper other">
<#include "macro-header.ftl">
<@header type='index'></@header>
<div class="wrapper">
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${linkLabel}</h2>
<div class="other__meta">
${links?size} ${linkLabel}
<div class="ft__center">
${links?size} ${linkLabel}
</div>
<div class="other__content">
<#if 0 != links?size>
<#list links as link>
<div class="other__item">
<a rel="friend" href="${link.linkAddress}" target="_blank">
${link.linkTitle}
</a>
<div>${link.linkDescription}</div>
</div>
</#list>
</#if>
<div class="articles">
<br>
<#if 0 != links?size>
<#list links as link>
<div class="other__item">
<a rel="friend" href="${link.linkAddress}" target="_blank">
${link.linkTitle}
</a>
<div>${link.linkDescription}</div>
</div>
</#list>
</#if>
<br><br>
</div>
</div>
<#if pjax><!---- pjax {#pjax} end ----></#if>
<#include "footer.ftl">
<#include "footer.ftl">
</body>
</html>

View File

@ -79,9 +79,6 @@
class="page-icon" src="${page.pageIcon}"></#if>${page.pageTitle}</a>
</li>
</#list>
<li>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a>
</li>
<li>
<a href="${servePath}/category.html">${categoryLabel}</a>
</li>

View File

@ -21,23 +21,24 @@
<!DOCTYPE html>
<html>
<head>
<@head title="${tag.tagTitle} ${tagLabel} - ${blogTitle}">
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
</@head>
<@head title="${tag.tagTitle} ${tagLabel} - ${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='other'></@header>
<div class="wrapper other">
<h2 class="other__title"><a href="${servePath}/tags.html" class="ft__a">${allTagsLabel}</a> - ${tag.tagTitle}</h2>
<div class="other__meta--list other__meta">
${tag.tagPublishedRefCount} ${cntArticleLabel}
<#include "macro-header.ftl">
<@header type='index'></@header>
<div class="wrapper">
<h2 class="other__title"><a href="${servePath}/tags.html" class="ft__a">${allTagsLabel}</a> - ${tag.tagTitle}
</h2>
<div class="ft__center">
${tag.tagPublishedRefCount} ${cntArticleLabel}
</div>
<#include "article-list.ftl">
</div>
<#if pjax><!---- pjax {#pjax} end ----></#if>
<#if pjax><!---- pjax {#pjax} end ----></#if>
</div>
<#include "footer.ftl">
</body>

View File

@ -21,40 +21,30 @@
<!DOCTYPE html>
<html>
<head>
<@head title="${allTagsLabel} - ${blogTitle}">
<link rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}"/>
</@head>
<@head title="${allTagsLabel} - ${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='other'></@header>
<div class="wrapper other">
<#include "macro-header.ftl">
<@header type='index'></@header>
<div class="wrapper">
<h2 class="other__title"><a href="${servePath}" class="ft__a">${blogTitle}</a> - ${allTagsLabel}</h2>
<div class="other__meta">
${tags?size} ${tagLabel}
<div class="ft__center">
${tags?size} ${tagLabel}
</div>
<div class="other__content">
<#list mostUsedCategories as category>
<span class="other__item--archive other__item">
<a href="${servePath}/category/${category.categoryURI}">
${category.categoryTitle}
</a>
<span>${category.categoryTagCnt} ${tagLabel}</span>
</span>
</#list>
</div>
<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 class="articles">
<div class="fn__clear">
<#list tags as tag>
<a rel="tag" data-count="${tag.tagPublishedRefCount}" class="other__item fn__left"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle} - <b>${tag.tagPublishedRefCount}</b> ${countLabel}
</a>
</#list>
</div>
<br><br>
</div>
</div>
<#if pjax><!---- pjax {#pjax} end ----></#if>