Skip to content

S
solo-1
Commit bd65e364 authored by Van's avatar Van
Browse files
Options

tags

parent 907c9a70
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 118 deletions
src/main/webapp/js/common.js
View file @ bd65e364
...@@ -203,7 +203,7 @@ var Util = { ...@@ -203,7 +203,7 @@ var Util = {
} }
} }
// 按字母或者中文拼音进行排序 // 按字母或者中文拼音进行排序
$("#" + id).html($("#" + id + " li").get().sort(function(a, b) { $("#" + id).html($("#" + id + " li").get().sort(function(a, b) {
var valA = $(a).find("span").text().toLowerCase(); var valA = $(a).find("span").text().toLowerCase();
var valB = $(b).find("span").text().toLowerCase(); var valB = $(b).find("span").text().toLowerCase();
......
src/main/webapp/skins/next/archive-articles.ftl deleted 100644 → 0
View file @ 907c9a70
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount}) - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveDate.archiveDateYear}${archiveDate.archiveDateMonth}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main>
<h2 class="classify-name">
${archive1Label}
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount})
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel} (${archiveDate.archiveDatePublishedArticleCount})
</#if>
</h2>
<#include "article-list.ftl">
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/next/archives.ftl
View file @ bd65e364
...@@ -8,36 +8,48 @@ ...@@ -8,36 +8,48 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <div class="container one-column page-home">
<main class="classify"> <div class="headband"></div>
<article> <#include "header.ftl">
<header> <main id="main" class="main">
<h2> <div class="main-inner">
<a rel="archive" href="${servePath}/archives.html"> <div id="content" class="content">
${archiveLabel} <article>
</a> <header>
</h2> <h2>
</header> <a rel="archive" href="${servePath}/archives.html">
<#if 0 != archiveDates?size> ${archiveLabel}
<ul class="tags fn-clear"> </a>
<#list archiveDates as archiveDate> </h2>
<li> </header>
<#if "en" == localeString?substring(0, 2)> <#if 0 != archiveDates?size>
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}" <ul class="tags fn-clear">
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})"> <#list archiveDates as archiveDate>
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})</a> <li>
<#else> <#if "en" == localeString?substring(0, 2)>
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}" <a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})"> title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a> ${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})</a>
</#if> <#else>
</li> <a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
</#list> title="${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})">
</ul> ${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
</#if> </#if>
</article> </li>
<li>
<#list articles as article>
${article.articleTitle}
</#list>
</li>
</#list>
</ul>
</#if>
</article>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl"> <#include "footer.ftl">
</main> </div>
</body> </body>
</html> </html>
src/main/webapp/skins/next/css/next.css
View file @ bd65e364
...@@ -271,4 +271,30 @@ ul.comments { ...@@ -271,4 +271,30 @@ ul.comments {
.cmtFromSym { .cmtFromSym {
font-size: 1rem; font-size: 1rem;
color: #9EABB3; color: #9EABB3;
}
#tags li {
list-style: none;
display: inline-block;
}
#tags .tags1 {
font-size: 12px;
color: #CCC;
}
#tags .tags2 {
font-size: 16px;
color: #999;
}
#tags .tags3 {
font-size: 21px;
color: #6f6f6f;
}
#tags .tags4 {
font-size: 24px;
color: #333;
}
#tags .tags5 {
font-size: 30px;
color: #111;
} }
\ No newline at end of file
src/main/webapp/skins/next/links.ftl deleted 100644 → 0
View file @ 907c9a70
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${linkLabel}"/>
<meta name="description" content="${metaDescription},${linkLabel}"/>
</@head>
</head>
<body>
<#include "side.ftl">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/links.html">
${linkLabel}
</a>
</h2>
</header>
<#if 0 != links?size>
<ul class="tags fn-clear">
<#list links as link>
<li>
<a rel="friend" href="${link.linkAddress}" class="tag"
title="${link.linkDescription}" target="_blank">
<img 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>
</#if>
</article>
<#include "footer.ftl">
</main>
</body>
</html>
src/main/webapp/skins/next/tags.ftl
View file @ bd65e364
...@@ -8,29 +8,40 @@ ...@@ -8,29 +8,40 @@
</@head> </@head>
</head> </head>
<body> <body>
<#include "side.ftl"> <div class="container one-column">
<main class="classify"> <div class="headband"></div>
<article> <#include "header.ftl">
<header> <main id="main" class="main">
<h2> <div class="main-inner">
<a rel="archive" href="${servePath}/tags.html"> <div id="content" class="content">
${tagLabel} <div id="posts" class="posts-expand">
</a>
</h2>
</header> <div class="tag-cloud">
<ul class="tags fn-clear"> <div class="tag-cloud-title">
<#list tags as tag> 目前共计 ${tags?size} 个标签
<li> </div>
<a rel="tag" class="tag" data-count="${tag.tagPublishedRefCount}" <ul class="tag-cloud-tags fn-clear" id="tags">
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" title="${tag.tagTitle}"> <#list tags as tag>
<span>${tag.tagTitle}</span> <li>
(<b>${tag.tagPublishedRefCount}</b>) <a rel="tag" data-count="${tag.tagPublishedRefCount}"
</a> href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
</li> <span>${tag.tagTitle}</span>
</#list> (<b>${tag.tagPublishedRefCount}</b>)
</ul> </a>
</article> </li>
</#list>
</ul>
</div>
</div>
</div>
</div>
<#include "side.ftl">
</main>
<#include "footer.ftl"> <#include "footer.ftl">
</main> <script>
Util.buildTags();
</script>
</div>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment