Skip to content

S
solo-1
Commit 59293df7 authored by Vanessa's avatar Vanessa
Browse files
Options

💄 #12389 pages

parent 25395007
Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 290 deletions
src/main/webapp/skins/Medium/archive-articles.ftl
View file @ 59293df7
<#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 "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main>
<div class="title">
<h2 class="tip">
<i class="icon-inbox"></i>
&nbsp;
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear}
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
</#if>
- ${archiveDate.archiveDatePublishedArticleCount} ${articleLabel}
</h2>
</div>
<#include "article-list.ftl">
</main>
<#include "side.ftl">
</div>
<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 "header.ftl">
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
<div class="board">
${noticeBoard}
</div>
</#if>
<div class="wrapper content">
<div class="module__title">
<span>
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear}
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
</#if>
<span class="ft-green">
${archiveDate.archiveDatePublishedArticleCount}
<span class="ft-12">${cntArticleLabel}</span>
</span>
</span>
</div>
<#include "footer.ftl">
</body>
<#include "article-list.ftl">
</div>
<#include "bottom2.ftl">
</div>
<#include "footer.ftl">
</body>
</html>
src/main/webapp/skins/Medium/archives.ftl
View file @ 59293df7
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
<meta name="description" content="${metaDescription},${archiveLabel}"/>
</@head>
</head>
<body>
<#include "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main class="other">
<span class="title">
<h2><i class="icon-inbox"></i>
&nbsp;${statistic.statisticPublishedBlogArticleCount} ${articleLabel}</h2>
</span>
<#if 0 != archiveDates?size>
<ul class="list">
<#list archiveDates as archiveDate>
<li>
<#if "en" == localeString?substring(0, 2)>
<a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})
</a>
<#else>
<a class="post-title" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})
</a>
</#if>
</li>
</#list>
</ul>
</#if>
</main>
<#include "side.ftl">
</div>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
<meta name="description" content="${metaDescription},${archiveLabel}"/>
</@head>
</head>
<body>
<#include "header.ftl">
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
<div class="board">
${noticeBoard}
</div>
</#if>
<div class="wrapper content">
<div class="module__title">
<span>
${archiveDates?size}
<span class="ft-green ft-12">${cntMonthLabel}</span>
${statistic.statisticPublishedBlogArticleCount}
<span class="ft-green ft-12">${cntArticleLabel}</span>
</span>
</div>
<#include "footer.ftl">
</body>
<#if 0 != archiveDates?size>
<#list archiveDates as archiveDate>
<div class="page__item">
<h3>
<a class="ft-gray"
href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}">
<#if "en" == localeString?substring(0, 2)>
${archiveDate.monthName} ${archiveDate.archiveDateYear}
<#else>
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}
</#if>
<span class="ft-green">
${archiveDate.archiveDatePublishedArticleCount}
<span class="ft-12">${cntArticleLabel}</span>
</span>
</a>
</h3>
</div>
</#list>
</#if>
</div>
<#include "bottom.ftl">
</div>
<#include "footer.ftl">
</body>
</html>
src/main/webapp/skins/Medium/article.ftl
View file @ 59293df7
......@@ -121,13 +121,47 @@
</div>
<div class="article__toolbar">
<#if nextArticlePermalink??>
<a href="${servePath}${nextArticlePermalink}" rel="next"
class="fn-right tooltipped tooltipped-n"
aria-label="${nextArticleTitle}">
nextArticleLabel
</a>
</#if>
<div class="wrapper">
<a class="post__view" href="${servePath}${article.articlePermalink}">
${article.articleViewCount} ${viewLabel}
</a>
<div class="fn-right">
<span class="pipe-tooltipped pipe-tooltipped--n post__share-icon ft-green"
onclick="$('#comment').focus()"
aria-label="${commentLabel}">
<svg>
<use xlink:href="#icon-comment"></use>
</svg>
${article.articleCommentCount} &nbsp; &nbsp;
</span>
<span id="articleBottomShare">
<span class="post__share-icon" data-type="wechat">
<svg><use xlink:href="#icon-wechat"></use></svg>
</span> &nbsp; &nbsp;
<span class="post__share-icon" data-type="weibo">
<svg><use xlink:href="#icon-weibo"></use></svg>
</span> &nbsp; &nbsp;
<span class="post__share-icon" data-type="twitter">
<svg><use xlink:href="#icon-twitter"></use></svg>
</span> &nbsp; &nbsp;
<span class="post__share-icon" data-type="google">
<svg><use xlink:href="#icon-google"></use></svg>
</span>
<span class="article__code"
data-title="${article.articleTitle}"
data-blogtitle="${blogTitle}"
data-url="${servePath}${article.articlePermalink}"
data-avatar="${article.authorThumbnailURL}"></span>
</span>
<#if nextArticlePermalink??>
<a href="${servePath}${nextArticlePermalink}" rel="next" class="article__next">
<span class="ft-12 ft-gray">${nextArticleLabel}</span> <br>
${nextArticleTitle}
</a>
</#if>
</div>
</div>
</div>
<div class="post__side">
......
src/main/webapp/skins/Medium/bottom.ftl
View file @ 59293df7
......@@ -8,7 +8,7 @@
<#list mostUsedCategories as category>
<a class="tag pipe-tooltipped pipe-tooltipped--n"
aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}"
href="${servePath}/tags/${category.categoryURI}">${category.categoryTitle}</a>
href="${servePath}/category/${category.categoryURI}">${category.categoryTitle}</a>
</#list>
</div>
</div>
......
src/main/webapp/skins/Medium/bottom2.ftl
View file @ 59293df7
......@@ -3,7 +3,7 @@
<#list mostUsedCategories as category>
<a class="tag pipe-tooltipped pipe-tooltipped--n"
aria-label="${category.categoryTagCnt} ${cntLabel}${tagsLabel}"
href="${servePath}/tags/${category.categoryURI}">${category.categoryTitle}</a>
href="${servePath}/category/${category.categoryURI}">${category.categoryTitle}</a>
</#list>
</#if>
<#if 0 != mostUsedTags?size>
......
src/main/webapp/skins/Medium/category-articles.ftl
View file @ 59293df7
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${category.categoryTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main>
<div class="title">
<h2 class="tip"><i class="icon-category"></i>
&nbsp;${category.categoryTitle}
<small>${category.categoryDescription}</small>
</h2>
</div>
<#include "article-list.ftl">
</main>
<#include "side.ftl">
</div>
<head>
<@head title="${category.categoryTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${category.categoryTitle}"/>
<meta name="description"
content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "header.ftl">
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
<div class="board">
${noticeBoard}
</div>
</#if>
<div class="wrapper content">
<div class="module__title">
<span>
${category.categoryTitle}
<span class="ft-green ft-12">
${category.categoryDescription}
</span>
</span>
</div>
<#include "footer.ftl">
</body>
<#include "article-list.ftl">
</div>
<#include "bottom2.ftl">
</div>
<#include "footer.ftl">
</body>
</html>
src/main/webapp/skins/Medium/css/base.css
View file @ 59293df7
......@@ -187,10 +187,6 @@ blockquote {
word-break: break-all
}
.content-reset a {
color: #ff4d3a;
}
.content-reset ul,
.content-reset ol {
padding-left: 2em;
......@@ -365,6 +361,7 @@ blockquote {
.ft-12 {
font-size: 12px;
font-weight: normal;
}
.ft-gray {
......@@ -723,7 +720,7 @@ blockquote {
}
.header__nav--fixed {
z-index: 10;
z-index: 11;
position: fixed;
width: 100%;
top: 0;
......@@ -1066,6 +1063,7 @@ blockquote {
float: left;
height: 24px;
margin-right: 10px;
margin-bottom: 5px;
width: 24px;
transition: all .2s ease-out;
-webkit-transition: all .2s ease-out;
......@@ -1139,6 +1137,10 @@ blockquote {
width: 100%;
}
#replyForm {
margin-top: 20px;
}
.comment__textarea {
background-color: rgb(255, 255, 255);
box-shadow: rgba(0, 0, 0, 0.04) 0px 1px 4px;
......@@ -1167,27 +1169,6 @@ blockquote {
color: #018f69;
}
.article__next {
border-left: 1px solid rgba(0, 0, 0, 0.38);
line-height: 14px;
margin-top: 7px;
color: rgba(0, 0, 0, 0.84);
font-size: 18px;
display: inline-block;
padding-left: 20px;
margin-left: 20px;
float: right
}
.article__next:hover {
text-decoration: none
}
.article__toolbar {
box-shadow: 0 0 1px rgba(0, 0, 0, 0.54);
position: fixed;
......@@ -1225,6 +1206,24 @@ blockquote {
bottom: 30px
}
.article__next {
border-left: 1px solid rgba(0, 0, 0, 0.38);
line-height: 14px;
margin-top: 7px;
color: rgba(0, 0, 0, 0.84);
font-size: 18px;
display: inline-block;
padding-left: 20px;
margin-left: 20px;
transition: all .2s;
float: right;
}
.article__next:hover {
text-decoration: none;
color: rgba(0, 0, 0, 0.54);
}
.pagination {
margin-top: 30px;
font-size: 16px;
......@@ -1274,4 +1273,10 @@ blockquote {
border: 0;
padding: 0;
color: #ccc
}
\ No newline at end of file
}
.page__item {
display: block;
border-bottom: 1px solid rgba(0,0,0,0.05);
padding: 40px 0 35px
}
src/main/webapp/skins/Medium/lang/lang_en_US.properties
View file @ 59293df7
......@@ -21,4 +21,8 @@
#
reply1Label=Reply
cntLabel=
\ No newline at end of file
cntLabel=
nextArticleLabel=Next Article
onlineVisitorLabel=Online
cntMonthLabel=Month
cntArticleLabel=Article
\ No newline at end of file
src/main/webapp/skins/Medium/lang/lang_zh_CN.properties
View file @ 59293df7
......@@ -21,4 +21,8 @@
#
cntLabel=\u4E2A
reply1Label=\u56DE\u590D
\ No newline at end of file
reply1Label=\u56DE\u590D
nextArticleLabel=\u4E0B\u4E00\u7BC7
onlineVisitorLabel=\u5F53\u524D\u8BBF\u5BA2
cntMonthLabel=\u4E2A\u6708
cntArticleLabel=\u7BC7\u6587\u7AE0
\ No newline at end of file
src/main/webapp/skins/Medium/links.ftl
View file @ 59293df7
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
<meta name="description" content="${metaDescription},${archiveLabel}"/>
</@head>
</head>
<body>
<#include "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main class="other">
<div class="title">
<h2><i class="icon-link"></i>
&nbsp;${linkLabel}</h2>
</div>
<#if 0 != links?size>
<ul class="list">
<#list links as link>
<li>
<a rel="friend" href="${link.linkAddress}" title="${link.linkDescription}" target="_blank">
${link.linkTitle}
</a>
</li>
</#list>
</ul>
</#if>
</main>
<#include "side.ftl">
</div>
<head>
<@head title="${blogTitle}">
<meta name="keywords" content="${metaKeywords},${archiveLabel}"/>
<meta name="description" content="${metaDescription},${archiveLabel}"/>
</@head>
</head>
<body>
<#include "header.ftl">
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
<div class="board">
${noticeBoard}
</div>
</#if>
<div class="wrapper content">
<div class="module__title">
<span>
${links?size}
<span class="ft-green ft-12">${linkLabel}</span>
</span>
</div>
<#include "footer.ftl">
</body>
<#if 0 != links?size>
<#list links as link>
<div class="page__item">
<h3>
<a rel="friend" class="ft-gray" href="${link.linkAddress}" target="_blank">
${link.linkTitle}
<span class="ft-12 ft-green">${link.linkDescription}</span>
</a>
</h3>
</div>
</#list>
</#if>
</div>
<#include "bottom.ftl">
</div>
<#include "footer.ftl">
</body>
</html>
src/main/webapp/skins/Medium/nav.ftl
View file @ 59293df7
......@@ -6,12 +6,6 @@
</svg>
${indexLabel}
</a>
<a href="http://localhost:5897/blogs/Vanessa/categories">
<svg>
<use xlink:href="#icon-folders"></use>
</svg>
${categoryLabel}
</a>
<a href="${servePath}/tags.html" rel="section">
<svg>
<use xlink:href="#icon-tag"></use>
......
src/main/webapp/skins/Medium/page.ftl
View file @ 59293df7
......@@ -2,28 +2,32 @@
<#include "macro-comments.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${page.pageTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${page.pageTitle}" />
<meta name="description" content="${metaDescription}" />
</@head>
</head>
<body>
<#include "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main>
<article class="post">
<div class="content-reset">
${page.pageContent}
</div>
<@comments commentList=pageComments article=page></@comments>
</article>
</main>
<#include "side.ftl">
<head>
<@head title="${page.pageTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${page.pageTitle}"/>
<meta name="description" content="${metaDescription}"/>
</@head>
</head>
<body>
<#include "header.ftl">
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
<div class="board">
${noticeBoard}
</div>
</#if>
<div class="wrapper content">
<article class="post">
<div class="content-reset">
${page.pageContent}
</div>
</div>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script>
</body>
<@comments commentList=pageComments article=page></@comments>
</article>
</div>
<#include "bottom.ftl">
</div>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script>
</body>
</html>
src/main/webapp/skins/Medium/side.ftl deleted 100644 → 0
View file @ 25395007
<#if 0 != mostCommentArticles?size>
<div class="module">
<header><h2>${mostCommentArticlesLabel}</h2></header>
<main class="list">
<ul>
<#list mostCommentArticles as article>
<li>
<a rel="nofollow" aria-label="${article.articleCommentCount} ${commentLabel}"
class="tooltipped tooltipped-e"
href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
</li>
</#list>
</ul>
</main>
</div>
</#if>
<#if 0 != mostViewCountArticles?size>
<div class="module">
<header><h2>${mostViewCountArticlesLabel}</h2></header>
<main class="list">
<ul>
<#list mostViewCountArticles as article>
<li>
<a rel="nofollow" aria-label="${article.articleCommentCount} ${commentLabel}"
class="tooltipped tooltipped-e"
href="${servePath}${article.articlePermalink}">
${article.articleTitle}
</a>
</li>
</#list>
</ul>
</main>
</div>
</#if>
\ No newline at end of file
src/main/webapp/skins/Medium/tag-articles.ftl
View file @ 59293df7
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${tag.tagTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main>
<div class="title">
<h2 class="tip"><i class="icon-tags"></i>
&nbsp;${tag.tagTitle}
<small>${tagLabel}</small>
</div>
<#include "article-list.ftl">
</main>
<#include "side.ftl">
</div>
<head>
<@head title="${tag.tagTitle} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${tag.tagTitle}"/>
<meta name="description"
content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "header.ftl">
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
<div class="board">
${noticeBoard}
</div>
</#if>
<div class="wrapper content">
<div class="module__title">
<span>
${tag.tagTitle}
<span class="ft-green">
${tag.tagPublishedRefCount}
<span class="ft-12">${tagLabel}</span>
</span>
</span>
</div>
<#include "footer.ftl">
</body>
<#include "article-list.ftl">
</div>
<#include "bottom2.ftl">
</div>
<#include "footer.ftl">
</body>
</html>
src/main/webapp/skins/Medium/tags.ftl
View file @ 59293df7
<#include "macro-head.ftl">
<!DOCTYPE html>
<html>
<head>
<@head title="${allTagsLabel} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
<meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "header.ftl">
<div class="wrapper">
<div class="main-wrap">
<main class="other">
<div class="title">
<h2><i class="icon-tags"></i>
&nbsp; ${sumLabel} ${tags?size} ${tagLabel}
</div>
<div class="tags">
<#list tags as tag>
<a rel="tag" data-count="${tag.tagPublishedRefCount}" class="tag"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
<span>${tag.tagTitle}</span>
(<b>${tag.tagPublishedRefCount}</b>)
</a>
</#list>
</div>
</main>
<#include "side.ftl">
</div>
<head>
<@head title="${allTagsLabel} - ${blogTitle}">
<meta name="keywords" content="${metaKeywords},${allTagsLabel}"/>
<meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
</@head>
</head>
<body>
<#include "header.ftl">
<#include "nav.ftl">
<div class="main">
<#if noticeBoard??>
<div class="board">
${noticeBoard}
</div>
</#if>
<div class="wrapper content">
<div class="module__title">
<span>
${tags?size}
<span class="ft-green ft-12">${tagLabel}</span>
</span>
</div>
<#include "footer.ftl">
<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/isotope.pkgd.min.js" charset="utf-8"></script>
<script>
$('.tags').isotope({
transitionDuration: '1.5s',
filter: 'a',
layoutMode: 'fitRows'
});
$('.tags').isotope({
sortBy: 'random'
});
</script>
</body>
<div id="tags">
<#list tags as tag>
<a rel="tag" data-count="${tag.tagPublishedRefCount}" class="tag"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
${tag.tagTitle}
<span class="ft-green ft-12">${tag.tagPublishedRefCount} ${countLabel}</span>
</a>
</#list>
</div>
</div>
<#include "bottom.ftl">
</div>
<#include "footer.ftl">
<script>
(function () {
var $tags = $('#tags');
var tagsArray = $tags.find('.tag')
// 根据引用次数添加样式，产生云效果
var max = parseInt(tagsArray.first().data('count'));
var distance = Math.ceil(max / 5);
for (var i = 0; i < tagsArray.length; i++) {
var count = parseInt($(tagsArray[i]).data('count'));
// 算出当前 tag 数目所在的区间，加上 class
for (var j = 0; j < 5; j++) {
if (count > j * distance && count <= (j + 1) * distance) {
tagsArray[i].className = 'tag tag__level' + j;
break;
}
}
}
// 按字母或者中文拼音进行排序
$tags.html(tagsArray.get().sort(function (a, b) {
var valA = $(a).text().toLowerCase();
var valB = $(b).text().toLowerCase();
// 对中英文排序的处理
return valA.localeCompare(valB);
}));
})();
</script>
</body>
</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