Skip to content

S
solo
Commit 508eb8d2 authored by Vanessa's avatar Vanessa
Browse files
Options

timeline 自测

parent f2e1822a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 286 additions and 32 deletions
war/src/main/webapp/skins/timeline/article-list.ftl
View file @ 508eb8d2
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
${article.articleCreateDate?string("yy-MM-dd HH:mm")} ${article.articleCreateDate?string("yy-MM-dd HH:mm")}
</span> </span>
</time> </time>
<h2 class="article-title"> <h3 class="article-title">
<a rel="bookmark" href="${servePath}${article.articlePermalink}"> <a rel="bookmark" href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h2> </h3>
<p> <p>
${article.articleAbstract} ${article.articleAbstract}
</p> </p>
......
war/src/main/webapp/skins/timeline/author-articles.ftl
View file @ 508eb8d2
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<body> <body>
${topBarReplacement} ${topBarReplacement}
<#include "header.ftl"> <#include "header.ftl">
<h2 class="nav-abs"> <h3 class="nav-abs">
<img style="border-radius: 45px;" width="90" title="${authorName}" src="${authorThumbnailURL}"/> <img style="border-radius: 45px;" width="90" title="${authorName}" src="${authorThumbnailURL}"/>
<br/> <br/>
${authorName} ${authorName}
</h2> </h3>
<#include "article-list.ftl"> <#include "article-list.ftl">
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>
......
war/src/main/webapp/skins/timeline/js/timeline.js
View file @ 508eb8d2
...@@ -184,7 +184,7 @@ var timeline = { ...@@ -184,7 +184,7 @@ var timeline = {
articlesHTML += '<article><div class="module"><div class="dot"></div>' articlesHTML += '<article><div class="module"><div class="dot"></div>'
+ '<div class="arrow"></div><time class="article-time"><span>' + '<div class="arrow"></div><time class="article-time"><span>'
+ Util.toDate(article.articleCreateTime, 'yy-MM-dd HH:mm') + Util.toDate(article.articleCreateTime, 'yy-MM-dd HH:mm')
+ '</span></time><h2 class="article-title"><a rel="bookmark" href="' + '</span></time><h3 class="article-title"><a rel="bookmark" href="'
+ latkeConfig.servePath + article.articlePermalink + '">' + latkeConfig.servePath + article.articlePermalink + '">'
+article.articleTitle + '</a>'; +article.articleTitle + '</a>';
...@@ -196,7 +196,7 @@ var timeline = { ...@@ -196,7 +196,7 @@ var timeline = {
articlesHTML += '<sup>' + Label.topArticleLabel + '</sup>'; articlesHTML += '<sup>' + Label.topArticleLabel + '</sup>';
} }
articlesHTML += '</h2><p>' + article.articleAbstract + '</p>' articlesHTML += '</h3><p>' + article.articleAbstract + '</p>'
+ '<span class="ico-tags ico" title="' + Label.tagLabel + '">'; + '<span class="ico-tags ico" title="' + Label.tagLabel + '">';
var articleTags = article.articleTags.split(","); var articleTags = article.articleTags.split(",");
...@@ -219,8 +219,8 @@ var timeline = { ...@@ -219,8 +219,8 @@ var timeline = {
+ '</a></span></div></article>'; + '</a></span></div></article>';
} }
var colH = [parseInt($(".article-more").prev().css("top")) + $(".article-more").prev().css("top").outerHeight(true), var colH = [parseInt($(".article-more").prev().prev().css("top")) + $(".article-more").prev().prev().outerHeight(true),
parseInt($(".article-more").prev().prev().css("top")) + $(".article-more").prev().prev().css("top").outerHeight(true)]; parseInt($(".article-more").prev().css("top")) + $(".article-more").prev().outerHeight(true)];
$more.before(articlesHTML).data("page", currentPage); $more.before(articlesHTML).data("page", currentPage);
...@@ -231,7 +231,7 @@ var timeline = { ...@@ -231,7 +231,7 @@ var timeline = {
$more.css("background", "none #60829F").text(Label.moreLabel); $more.css("background", "none #60829F").text(Label.moreLabel);
} }
$("#" + archive.replace("/", "") + " article").each(function () { $((archive ? "#" + archive.replace("/", "") : ".articles") + " article").each(function () {
if (this.className !== "r" && this.className !== "l") { if (this.className !== "r" && this.className !== "l") {
var $it = $(this), var $it = $(this),
isLeft = colH[1] > colH[0], isLeft = colH[1] > colH[0],
...@@ -250,7 +250,7 @@ var timeline = { ...@@ -250,7 +250,7 @@ var timeline = {
colH[( isLeft ? '0' : '1' )] += parseInt($it.outerHeight(true)); colH[( isLeft ? '0' : '1' )] += parseInt($it.outerHeight(true));
} }
}); });
$("#" + archive.replace("/", "")).height(colH[0] > colH[1] ? colH[0] : colH[1]); $(archive ? "#" + archive.replace("/", "") : ".articles").height(colH[0] > colH[1] ? colH[0] : colH[1]);
} }
}); });
}, },
......
war/src/main/webapp/skins/timeline/tag-articles.ftl
View file @ 508eb8d2
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<body> <body>
${topBarReplacement} ${topBarReplacement}
<#include "header.ftl"> <#include "header.ftl">
<h2 style="cursor: pointer" class="nav-abs" onclick="window.location.href='${servePath}/tag-articles-feed.do?oId=${tag.oId}'"> <h3 style="cursor: pointer" class="nav-abs" onclick="window.location.href='${servePath}/tag-articles-feed.do?oId=${tag.oId}'">
${tag.tagTitle} ${tag.tagTitle}
(${tag.tagPublishedRefCount}) (${tag.tagPublishedRefCount})
<img src="${staticServePath}/images/feed.png" alt="Atom"/> <img src="${staticServePath}/images/feed.png" alt="Atom"/>
</h2> </h3>
<#include "article-list.ftl"> <#include "article-list.ftl">
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>
......
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