Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo
Commits
7640df1b
Commit
7640df1b
authored
Jul 01, 2016
by
Van
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
article page
parent
e9262b51
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
152 additions
and
232 deletions
+152
-232
src/main/webapp/skins/next/article-list.ftl
src/main/webapp/skins/next/article-list.ftl
+1
-1
src/main/webapp/skins/next/article.ftl
src/main/webapp/skins/next/article.ftl
+79
-67
src/main/webapp/skins/next/footer.ftl
src/main/webapp/skins/next/footer.ftl
+4
-13
src/main/webapp/skins/next/header.ftl
src/main/webapp/skins/next/header.ftl
+6
-0
src/main/webapp/skins/next/js/next.js
src/main/webapp/skins/next/js/next.js
+19
-48
src/main/webapp/skins/next/macro-comments.ftl
src/main/webapp/skins/next/macro-comments.ftl
+0
-1
src/main/webapp/skins/next/side.ftl
src/main/webapp/skins/next/side.ftl
+43
-102
No files found.
src/main/webapp/skins/next/article-list.ftl
View file @
7640df1b
...
...
@@ -27,7 +27,7 @@
</span>
<span class="post-comments-count">
|
<a href="${servePath}${article.articlePermalink}
/
#comments">
<a href="${servePath}${article.articlePermalink}#comments">
${article.articleCommentCount}条评论</a>
</span>
| 热度 ${article.articleViewCount}°C
...
...
src/main/webapp/skins/next/article.ftl
View file @
7640df1b
...
...
@@ -9,80 +9,92 @@
</
@
head>
</head>
<body>
<
#include
"
side
.
ftl
"
>
<main>
<article
class=
"post article-body"
>
<header>
<h2>
<a
rel=
"bookmark"
href=
"${servePath}${article.articlePermalink}"
>
${article.articleTitle}
</a>
<
#if
article
.
articlePutTop
>
<sup>
${topArticleLabel}
</sup>
</
#
if>
<
#if
article
.
hasUpdated
>
<sup>
${updatedLabel}
</sup>
</
#
if>
</h2>
<time><span
class=
"icon-date"
></span>
${article.articleCreateDate?string("yyyy-MM-dd")}
</time>
<div
class=
"container one-column page-post-detail"
>
<div
class=
"headband"
></div>
<
#include
"
header
.
ftl
"
>
<main
id=
"main"
class=
"main"
>
<div
class=
"main-inner"
>
<div
id=
"content"
class=
"content"
>
<div
id=
"posts"
class=
"posts-expand"
>
<article
class=
"post post-type-normal"
>
<header
class=
"post-header"
>
<h1
class=
"post-title"
>
${article.articleTitle}
<
#if
article
.
articlePutTop
>
<sup>
${topArticleLabel}
</sup>
</
#
if>
<
#if
article
.
hasUpdated
>
<sup>
${updatedLabel}
</sup>
</
#
if>
</h1>
<div
class=
"post-meta"
>
<span
class=
"post-time"
>
发表于
<time>
${article.articleCreateDate?string("yyyy-MM-dd")}
</time>
</span>
<span
class=
"post-comments-count"
>
|
<a
href=
"${servePath}${article.articlePermalink}#comments"
>
${article.articleCommentCount}条评论
</a>
</span>
|
热度
${article.articleViewCount}°C
</div>
</header>
<section
class=
"tags"
>
<span
class=
"icon-tag"
></span>
<
#list
article
.
articleTags
?
split
(",")
as
articleTag
>
<a
class=
"tag"
rel=
"tag"
href=
"${servePath}/tags/${articleTag?url('UTF-8')}"
>
${articleTag}
</a>
</
#
list>
<div
class=
"post-body"
>
${article.articleContent}
<
#if
""
!=
article
.
articleSign
.
signHTML
?
trim
>
<div>
${article.articleSign.signHTML}
</div>
</
#
if>
</div>
<footer
class=
"post-footer"
>
<div
class=
"post-tags"
>
<
#list
article
.
articleTags
?
split
(",")
as
articleTag
>
<a
rel=
"tag"
href=
"${servePath}/tags/${articleTag?url('UTF-8')}"
>
${articleTag}
</a>
</
#
list>
</div>
<div
class=
"post-nav"
>
<
#if
nextArticlePermalink
??
||
previousArticlePermalink
??
>
<
#if
previousArticlePermalink
??
>
<div
class=
"post-nav-next post-nav-item"
>
<a
href=
"${servePath}${previousArticlePermalink}"
rel=
"next"
title=
"${previousArticleTitle}"
>
<i
class=
"fa fa-chevron-left"
></i>
${previousArticleTitle}
</a>
</div>
</
#
if>
<
#if
nextArticlePermalink
??
>
<div
class=
"post-nav-prev post-nav-item"
>
<a
href=
"${servePath}${nextArticlePermalink}"
rel=
"prev"
title=
"${nextArticleTitle}"
>
${nextArticleTitle}
<i
class=
"fa fa-chevron-right"
></i>
</a>
</div>
</
#
if>
</
#
if>
</div>
</footer>
</article>
</div>
<a
rel=
"nofollow"
href=
"${servePath}/authors/${article.authorId}"
>
<img
class=
"avatar"
title=
"${article.authorName}"
alt=
"${article.authorName}"
src=
"${article.authorThumbnailURL}"
/>
</a>
</section>
</header>
<section
class=
"abstract"
>
${article.articleContent}
<
#if
""
!=
article
.
articleSign
.
signHTML
?
trim
>
<div>
${article.articleSign.signHTML}
</div>
</
#
if>
<
#if
nextArticlePermalink
??
||
previousArticlePermalink
??
>
<aside
class=
"fn-clear"
>
<
#if
previousArticlePermalink
??
>
<a
class=
"fn-left"
rel=
"prev"
href=
"${servePath}${previousArticlePermalink}"
>
<strong>
<
</strong>
${previousArticleTitle}
</a>
</
#
if>
<
#if
nextArticlePermalink
??
>
<a
class=
"fn-right"
rel=
"next"
href=
"${servePath}${nextArticlePermalink}"
>
${nextArticleTitle}
<strong>
>
</strong>
</a>
</
#
if>
</aside>
</
#
if>
</section>
<
@
comments
commentList=
articleComments
article=
article
></
@
comments>
<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-gplus"
data-type=
"google"
></span>
</div>
</footer>
</article>
<
@
comments
commentList=
articleComments
article=
article
></
@
comments>
</div>
<
#include
"
side
.
ftl
"
>
</main>
<
#include
"
footer
.
ftl
"
>
<
@
comment_script
oId=
article.oId
>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
</
@
comment
_script
>
</
main
>
</
div
>
</body>
</html>
src/main/webapp/skins/next/footer.ftl
View file @
7640df1b
<footer id="footer" class="footer">
<div class="footer-inner">
<div class="copyright">
${viewCount1Label}${statistic.statisticBlogViewCount}
${articleCount1Label}${statistic.statisticPublishedBlogArticleCount}
${commentCount1Label}${statistic.statisticPublishedBlogCommentCount}
<a href="${servePath}">${blogTitle}</a> •
${onlineVisitor1Label}${onlineVisitorCnt}
</div>
<a href="${servePath}">${blogTitle}</a>
© ${year}
${footerContent}
<span class="fn-right">
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> •
<a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}
</span>
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> •
<a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}
</div>
</footer>
<div class="back-to-top"></div>
<div class="back-to-top"
onclick="Util.goTop()"
></div>
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
...
...
src/main/webapp/skins/next/header.ftl
View file @
7640df1b
...
...
@@ -41,6 +41,12 @@
${allTagsLabel}
</a>
</li>
<li class="menu-item menu-item-archives">
<a href="${servePath}/archives.html">
<i class="menu-item-icon fa fa-archive fa-fw"></i> <br>
${archiveLabel}
</a>
</li>
<li class="menu-item menu-item-archives">
<a rel="alternate" href="${servePath}/blog-articles-rss.do" rel="section">
<i class="menu-item-icon fa fa-archive fa-fw"></i> <br>
...
...
src/main/webapp/skins/next/js/next.js
View file @
7640df1b
...
...
@@ -24,57 +24,28 @@
* @description next 皮肤脚本
* @static
*/
var
Yilia
=
{
/**
* @description 页面初始化
*/
init
:
function
()
{
Util
.
killIE
();
this
.
resetTags
();
$
(
'
.sidebar-toggle
'
).
click
(
function
()
{
var
$sidebar
=
$
(
'
#sidebar
'
);
if
(
$
(
this
).
hasClass
(
'
sidebar-active
'
))
{
$
(
this
).
removeClass
(
'
sidebar-active
'
);
$
(
window
).
scroll
(
function
()
{
if
(
$
(
"
article
"
).
length
>
0
&&
$
(
"
article.post
"
).
length
===
0
)
{
$
(
"
article:not(.show)
"
).
each
(
function
()
{
if
(
$
(
this
).
offset
().
top
<=
$
(
window
).
scrollTop
()
+
$
(
window
).
height
()
-
$
(
this
).
height
()
/
7
)
{
$
(
this
).
addClass
(
"
show
"
);
}
});
}
if
(
$
(
window
).
scrollTop
()
>
$
(
window
).
height
())
{
$
(
"
.icon-goup
"
).
show
();
}
else
{
$
(
"
.icon-goup
"
).
hide
();
}
if
(
$
(
"
article.post
"
).
length
===
1
)
{
$
(
"
article.post
"
).
addClass
(
'
show
'
);
}
$
(
'
body
'
).
animate
({
'
padding-right
'
:
0
});
$sidebar
.
animate
({
width
:
0
},
function
()
{
$sidebar
.
hide
();
});
$
(
window
).
scroll
();
},
resetTags
:
function
()
{
$
(
"
a.tag
"
).
each
(
function
(
i
)
{
$
(
this
).
addClass
(
"
color
"
+
Math
.
ceil
(
Math
.
random
()
*
4
));
}
else
{
$
(
this
).
addClass
(
'
sidebar-active
'
);
$sidebar
.
show
();
$
(
'
body
'
).
animate
(
{
'
padding-right
'
:
320
});
},
share
:
function
()
{
$
(
"
.share span
"
).
click
(
function
()
{
var
key
=
$
(
this
).
data
(
"
type
"
);
var
title
=
encodeURIComponent
(
$
(
"
title
"
).
text
()),
url
=
$
(
"
.post-title a
"
).
attr
(
'
href
'
)
?
$
(
"
.post-title a
"
).
attr
(
'
href
'
)
:
location
,
pic
=
$
(
"
.post-content img:eq(0)
"
).
attr
(
"
src
"
);
var
urls
=
{};
urls
.
tencent
=
"
http://share.v.t.qq.com/index.php?c=share&a=index&title=
"
+
title
+
"
&url=
"
+
url
+
"
&pic=
"
+
pic
;
urls
.
weibo
=
"
http://v.t.sina.com.cn/share/share.php?title=
"
+
title
+
"
&url=
"
+
url
+
"
&pic=
"
+
pic
;
urls
.
google
=
"
https://plus.google.com/share?url=
"
+
url
;
urls
.
twitter
=
"
https://twitter.com/intent/tweet?status=
"
+
title
+
"
"
+
url
;
window
.
open
(
urls
[
key
],
"
_blank
"
,
"
top=100,left=200,width=648,height=618
"
);
$sidebar
.
animate
({
width
:
320
});
}
};
Yilia
.
init
();
\ No newline at end of file
});
\ No newline at end of file
src/main/webapp/skins/next/macro-comments.ftl
View file @
7640df1b
...
...
@@ -140,7 +140,6 @@
page.addReplyForm(id, commentFormHTML);
};
(function () {
Yilia.share();
page.load();
// emotions
page.replaceCommentsEm(".comments .comment-content");
...
...
src/main/webapp/skins/next/side.ftl
View file @
7640df1b
...
...
@@ -8,149 +8,90 @@
<aside id="sidebar" class="sidebar">
<div class="sidebar-inner">
<section class="site-overview sidebar-panel sidebar-panel-active ">
<div class="site-author motion-element"
itemprop="author" itemscope="" itemtype="http://schema.org/Person"
>
<img class="site-author-image skip" src="
http://araome.yiluup.com/xiongmao.jpg" alt="ARao Lin" itemprop="image"
>
<p class="site-author-name"
itemprop="name">ARao Lin
</p>
<div class="site-author motion-element">
<img class="site-author-image skip" src="
${adminUser.userAvatar}" title="${userName}"/
>
<p class="site-author-name"
>${userName}
</p>
</div>
<p class="site-description motion-element" itemprop="description">我们的征途是星辰大海</p>
<#if "" != noticeBoard>
<p class="site-description motion-element">${blogSubtitle}</p>
</#if>
<nav class="site-state motion-element">
<div class="site-state-item site-state-posts">
<a href="/archives">
<span class="site-state-item-count">
8
</span>
<span class="site-state-item-count">
${statistic.statisticPublishedBlogArticleCount}
</span>
<span class="site-state-item-name">日志</span>
</a>
</div>
<div class="site-state-item site-state-categories">
<span class="site-state-item-count">0</span>
<span class="site-state-item-name">分类</span>
<span class="site-state-item-count">${statistic.statisticBlogViewCount}</span>
<span class="site-state-item-name">浏览</span>
</div>
<div class="site-state-item site-state-tags">
<a href="/tags">
<span class="site-state-item-count">
18
</span>
<span class="site-state-item-name">
标签
</span>
<span class="site-state-item-count">
${statistic.statisticPublishedBlogCommentCount}
</span>
<span class="site-state-item-name">
评论
</span>
</a>
</div>
</nav>
<div class="feed-link motion-element">
<a href="
/atom.xml
" rel="alternate">
<a href="
${servePath}/blog-articles-rss.do
" rel="alternate">
<i class="fa fa-rss"></i>
RSS
</a>
</div>
<div class="links-of-author motion-element">
<#if isLoggedIn>
<span class="links-of-author-item">
<a href="https://github.com/araolin" target="_blank" rel="external nofollow">
<i class="fa fa-github"></i> GitHub
<a href="${servePath}/admin-index.do#main" title="${adminLabel}">
<i class="fa fa-github"></i> ${adminLabel}
</a>
</span>
<span class="links-of-author-item">
<a href="http://weibo.com/208139345" target="_blank" rel="external nofollow">
<i class="fa fa-weibo"></i> Weibo
<a href="${logoutURL}">
<i class="fa fa-weibo"></i> ${logoutLabel}
</a>
</span>
<#else>
<span class="links-of-author-item">
<a href="${loginURL}">
<i class="fa fa-github"></i> ${loginLabel}
</a>
</span>
<span class="links-of-author-item">
<a href="${servePath}/register">
<i class="fa fa-weibo"></i> ${registerLabel}
</a>
</span>
</#if>
</div>
<div class="cc-license motion-element" itemprop="license">
<a href="http://creativecommons.org/licenses/by-nc-sa/4.0" class="cc-opacity" target="_blank" rel="external nofollow">
<img class="skip" src="/images/cc-by-nc-sa.svg" alt="Creative Commons">
</a>
<#if noticeBoard??>
<div class="links-of-author motion-element">
${noticeBoard}
</div>
</#if>
<#if 0 != links?size>
<div class="links-of-author motion-element">
<p class="site-author-name">Links</p>
<#list links as link>
<span class="links-of-author-item">
<a href="https://shop152714861.taobao.com" target="_blank">我的男装店</a>
<a rel="friend" href="${link.linkAddress}"
title="${link.linkDescription}" target="_blank">
${link.linkTitle}
</a>
</span>
</#list>
</div>
</#if>
</section>
</div>
</aside>
<div class="side">
<div class="overlay"></div>
<header class="content">
<a href="${servePath}">
<img class="avatar" src="${adminUser.userAvatar}" title="${userName}"/>
</a>
<hgroup>
<h1>
<a href="${servePath}">${blogTitle}</a>
</h1>
</hgroup>
<#if "" != noticeBoard>
<p class="subtitle">
${blogSubtitle}
</p>
</#if>
<nav>
<ul>
<#list pageNavigations as page>
<li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}">${page.pageTitle}</a>
</li>
</#list>
<li>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a>
</li>
<li>
<a href="${servePath}/tags.html">${allTagsLabel}</a>
</li>
<li>
<a href="${servePath}/archives.html">${archiveLabel}</a>
</li>
<li>
<a href="${servePath}/links.html">${linkLabel}</a>
</li>
</ul>
</nav>
<footer>
<#if noticeBoard??>
<div>${noticeBoard}</div>
</#if>
<#if isLoggedIn>
<a href="${servePath}/admin-index.do#main" title="${adminLabel}" class="icon-setting"></a>
<a title="${logoutLabel}" class="icon-logout" href="${logoutURL}"></a>
<#else>
<a title="${loginLabel}" href="${loginURL}" class="icon-login"></a>
<a href="${servePath}/register" title="${registerLabel}" class="icon-register"></a>
</#if>
<a rel="alternate" href="${servePath}/blog-articles-rss.do" title="${subscribeLabel}" class="icon-rss"></a>
</footer>
</header>
</div>
\ No newline at end of file
</aside>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment