Skip to content

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

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

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