Skip to content

S
solo
Commit 37bee37f authored by Van's avatar Van
Browse files
Options

写完了 😄 买个👓买了一天，还以为要弄到很晚，啦啦啦啦啦啦啦

parent b19538d6
Show whitespace changes
Inline Side-by-side
Showing with 267 additions and 188 deletions
src/main/webapp/skins/yilia/archive-articles.ftl
View file @ 37bee37f
......@@ -7,14 +7,10 @@
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main id="content">
<h2 class="fn-wrap">
<main>
<h2 class="classify-name">
${archive1Label}
<#if "en" == localeString?substring(0, 2)>
${archiveDate.archiveDateMonth} ${archiveDate.archiveDateYear} (${archiveDate.archiveDatePublishedArticleCount})
......@@ -23,8 +19,8 @@
</#if>
</h2>
<#include "article-list.ftl">
</main>
<#include "footer.ftl">
</div>
</main>
</body>
</html>
src/main/webapp/skins/yilia/archives.ftl
View file @ 37bee37f
......@@ -7,23 +7,27 @@
<meta name="description" content="${metaDescription},${archiveLabel}"/>
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main id="content">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/archives.html">
${archiveLabel}
</a>
</h2>
</header>
<#if 0 != archiveDates?size>
<ul class="fn-clear fn-wrap" id='tags'>
<ul class="tags fn-clear">
<#list archiveDates as archiveDate>
<li>
<#if "en" == localeString?substring(0, 2)>
<a href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
<a class="tag" href="${servePath}/archives/${archiveDate.archiveDateYear}/${archiveDate.archiveDateMonth}"
title="${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})">
${archiveDate.monthName} ${archiveDate.archiveDateYear}(${archiveDate.archiveDatePublishedArticleCount})</a>
<#else>
<a 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})">
${archiveDate.archiveDateYear} ${yearLabel} ${archiveDate.archiveDateMonth} ${monthLabel}(${archiveDate.archiveDatePublishedArticleCount})</a>
</#if>
......@@ -31,8 +35,9 @@
</#list>
</ul>
</#if>
</main>
</article>
<#include "footer.ftl">
</div>
</main>
</body>
</html>
src/main/webapp/skins/yilia/author-articles.ftl
View file @ 37bee37f
......@@ -7,19 +7,14 @@
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main id="content">
<h2 class="fn-wrap">
<main>
<h2 class="classify-name">
${author1Label}${authorName}
</h2>
<#include "article-list.ftl">
</main>
<#include "footer.ftl">
</div>
</main>
</body>
</html>
src/main/webapp/skins/yilia/css/yilia.css
View file @ 37bee37f
......@@ -593,6 +593,8 @@ article .abstract {
line-height: 1.8em;
padding-right: 30px;
padding-left: 30px;
overflow: hidden;
word-wrap: break-word
}
article footer {
......@@ -789,6 +791,12 @@ article.post {
border-bottom: 1px solid #ddd;
}
.comments li time {
border-left: 1px solid #d5dbde;
padding-left: 10px;
margin-left: 10px;
}
.comments .avatar {
position: absolute;
height: 60px;
......@@ -878,14 +886,95 @@ footer.footer .icon-goup:hover {
}
/* end footer */
/* start responsive */
@media only screen and (max-width: 900px) {
/* start classify*/
.classify li {
list-style: none;
font-size: 20px;
float: left;
margin: 0 30px 20px 0;
}
.classify .tags .tag {
font-size: 20px;
padding: 10px;
}
.classify .tags .tag:before {
left: -38px;
border-width: 19px;
}
.classify .tags .tag:after {
top: 15px;
left: -6px;
width: 8px;
height: 8px;
}
.classify-name {
font-size: 18px;
margin: 30px;
}
.dynamic li {
list-style: none;
}
.dynamic .comments li:last-child {
border-bottom-width: 0;
}
/* end classify*/
/* start responsive */
@media only screen and (max-width: 500px) {
.side {
position: relative;
height: auto;
width: 100%;
}
.side .avatar {
position: relative;
}
.side .content {
margin-top: 0;
padding-top: 20px;
}
.side .overlay {
height: 100px;
z-index: 0;
}
.side nav {
display: none;
}
.side footer {
position: initial;
margin: 10px auto;
padding-bottom: 16px;
}
main {
position: initial;
}
article {
margin: 10px;
}
.comments {
margin: 20px 20px 0 20px;
}
footer.footer {
text-align: center;
}
footer.footer .fn-right {
float: none;
display: block;
}
}
/* end responsive */
\ No newline at end of file
src/main/webapp/skins/yilia/dynamic.ftl
View file @ 37bee37f
......@@ -7,23 +7,17 @@
<meta name="description" content="${metaDescription},${dynamicLabel}"/>
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main id="content">
<main class="dynamic">
<#if 0 != recentComments?size>
<ul class="comments fn-wrap">
<ul class="comments">
<#list recentComments as comment>
<#if comment_index < 6>
<li id="${comment.oId}" class="fn-clear">
<div class="fn-left avatar-warp">
<img class="avatar-48" title="${comment.commentName}"
<li>
<img class="avatar" title="${comment.commentName}"
alt="${comment.commentName}" src="${comment.commentThumbnailURL}">
</div>
<div class="fn-left" style="width: 90%">
<div class="content">
<div class="fn-clear post-meta">
<span class="fn-left">
<#if "http://" == comment.commentURL>
......@@ -44,14 +38,17 @@
</#list>
</ul>
</#if>
</main>
<#if 0 != mostCommentArticles?size || 0 != mostViewCountArticles?size>
<aside class="read-next dynamic">
<#if 0 != mostCommentArticles?size>
<div class="read-next-story" style="background-image: url('${staticServePath}/skins/${skinDirName}/images/next.jpg')">
<div>
<article>
<header>
<h2>
${mostCommentArticlesLabel}
</h2>
</header>
<ul>
<#list mostCommentArticles as article>
<li>
......@@ -64,13 +61,15 @@
</li>
</#list>
</ul>
</div>
</div>
</article>
</#if>
<#if 0 != mostViewCountArticles?size>
<section class="read-next-story prev" style="background-image: url('${staticServePath}/skins/${skinDirName}/images/preview.jpg')">
<div>
<article>
<header>
<h2>
${mostViewCountArticlesLabel}
</h2>
</header>
<ul>
<#list mostViewCountArticles as article>
<li>
......@@ -83,13 +82,13 @@
</li>
</#list>
</ul>
</div>
</section>
</article>
</#if>
</aside>
</#if>
<#include "footer.ftl">
</div>
</main>
<script>
var $commentContents = $(".comments .comment-content");
for (var i = 0; i < $commentContents.length; i++) {
......
src/main/webapp/skins/yilia/links.ftl
View file @ 37bee37f
......@@ -7,18 +7,23 @@
<meta name="description" content="${metaDescription},${linkLabel}"/>
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main id="content">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/links.html">
${linkLabel}
</a>
</h2>
</header>
<#if 0 != links?size>
<ul class="fn-clear fn-wrap" id="tags">
<ul class="tags fn-clear">
<#list links as link>
<li>
<a rel="friend" href="${link.linkAddress}" title="${link.linkDescription}" target="_blank">
<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>
......@@ -26,8 +31,8 @@
</#list>
</ul>
</#if>
</main>
</article>
<#include "footer.ftl">
</div>
</main>
</body>
</html>
src/main/webapp/skins/yilia/macro-comments.ftl
View file @ 37bee37f
......@@ -7,7 +7,7 @@
<div class="fn-clear post-meta">
<span class="fn-left">
<#if "http://" == comment.commentURL>
<a>${comment.commentName}</a>
<span>${comment.commentName}</span>
<#else>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
</#if>
......@@ -18,7 +18,7 @@
onmouseout="page.hideComment('${comment.commentOriginalCommentId}')"
>${comment.commentOriginalCommentName}</a>
</#if>
<time>${comment.commentDate?string("yyyy-MM-dd HH:mm")}</time>
<time>${comment.commentDate?string("yyyy-MM-dd")}</time>
</span>
<#if article.commentable>
<a class="fn-right" href="javascript:replyTo('${comment.oId}')">${replyLabel}</a>
......@@ -125,7 +125,7 @@
+ 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
}
commentHTML += '<time>' + result.commentDate
commentHTML += ' <time>' + result.commentDate
+ '</time></span>';
if (commentable) {
commentHTML += '<a class="fn-right" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>';
......
src/main/webapp/skins/yilia/page.ftl
View file @ 37bee37f
......@@ -8,32 +8,27 @@
<meta name="description" content="${metaDescription}" />
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main>
<article class="post">
<section class="post-content article-body">
<article class="post article-body">
<section class="abstract">
${page.pageContent}
</section>
<footer>
<div class="share fn-right">
<span class="icon icon-tencent" data-type="tencent"></span>
<footer class="fn-clear share">
<div class="fn-right">
<span class="icon icon-t-weibo" data-type="tencent"></span>
<span class="icon icon-weibo" data-type="weibo"></span>
<span class="icon icon-twitter" data-type="twitter"></span>
<span class="icon icon-google" data-type="google"></span>
<span class="icon icon-gplus" data-type="google"></span>
</div>
</footer>
</article>
<@comments commentList=pageComments article=page></@comments>
</main>
<#include "footer.ftl">
<@comment_script oId=page.oId></@comment_script>
</div>
</main>
</body>
</html>
src/main/webapp/skins/yilia/tag-articles.ftl
View file @ 37bee37f
......@@ -7,14 +7,10 @@
<meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main id="content">
<h2 class="fn-wrap">
<main>
<h2 class="classify-name">
${tag1Label}
<a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}">
${tag.tagTitle}
......@@ -22,8 +18,7 @@
</a>
</h2>
<#include "article-list.ftl">
</main>
<#include "footer.ftl">
</div>
</main>
</body>
</html>
src/main/webapp/skins/yilia/tags.ftl
View file @ 37bee37f
......@@ -7,17 +7,21 @@
<meta name="description" content="<#list tags as tag>${tag.tagTitle}<#if tag_has_next>,</#if></#list>"/>
</@head>
</head>
<body class="nav-closed">
<div class="nav">
<body>
<#include "side.ftl">
</div>
<div class="site-wrapper">
<#include "header.ftl">
<main id="content">
<ul id="tags" class="fn-clear fn-wrap">
<main class="classify">
<article>
<header>
<h2>
<a rel="archive" href="${servePath}/tags.html">
${tagLabel}
</a>
</h2>
</header>
<ul class="tags fn-clear">
<#list tags as tag>
<li>
<a rel="tag" data-count="${tag.tagPublishedRefCount}"
<a rel="tag" class="tag" data-count="${tag.tagPublishedRefCount}"
href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" title="${tag.tagTitle}">
<span>${tag.tagTitle}</span>
(<b>${tag.tagPublishedRefCount}</b>)
......@@ -25,12 +29,8 @@
</li>
</#list>
</ul>
</main>
</article>
<#include "footer.ftl">
</div>
<script type="text/javascript">
Util.buildTags();
</script>
</main>
</body>
</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