Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
IEQEFCR
halo
提交
a09aede2
H
halo
项目概览
IEQEFCR
/
halo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
H
halo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a09aede2
编写于
7月 13, 2018
作者:
RYAN0UP
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
0.0.6
上级
005a7e4f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
21 deletion
+23
-21
src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
...anc/halo/web/controller/front/FrontArchiveController.java
+7
-6
src/main/resources/static/css/style.css
src/main/resources/static/css/style.css
+5
-5
src/main/resources/templates/admin/module/_footer.ftl
src/main/resources/templates/admin/module/_footer.ftl
+1
-1
src/main/resources/templates/admin/module/_header.ftl
src/main/resources/templates/admin/module/_header.ftl
+4
-3
src/main/resources/templates/common/comment/_native_comment.ftl
...in/resources/templates/common/comment/_native_comment.ftl
+6
-6
未找到文件。
src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java
浏览文件 @
a09aede2
...
@@ -63,7 +63,7 @@ public class FrontArchiveController extends BaseController {
...
@@ -63,7 +63,7 @@ public class FrontArchiveController extends BaseController {
Sort
sort
=
new
Sort
(
Sort
.
Direction
.
DESC
,
"postDate"
);
Sort
sort
=
new
Sort
(
Sort
.
Direction
.
DESC
,
"postDate"
);
Pageable
pageable
=
PageRequest
.
of
(
page
-
1
,
5
,
sort
);
Pageable
pageable
=
PageRequest
.
of
(
page
-
1
,
5
,
sort
);
Page
<
Post
>
posts
=
postService
.
findPostByStatus
(
0
,
PostType
.
POST_TYPE_POST
.
getDesc
(),
pageable
);
Page
<
Post
>
posts
=
postService
.
findPostByStatus
(
0
,
PostType
.
POST_TYPE_POST
.
getDesc
(),
pageable
);
if
(
null
==
posts
)
{
if
(
null
==
posts
)
{
return
this
.
renderNotFound
();
return
this
.
renderNotFound
();
}
}
model
.
addAttribute
(
"posts"
,
posts
);
model
.
addAttribute
(
"posts"
,
posts
);
...
@@ -83,7 +83,7 @@ public class FrontArchiveController extends BaseController {
...
@@ -83,7 +83,7 @@ public class FrontArchiveController extends BaseController {
@PathVariable
(
value
=
"year"
)
String
year
,
@PathVariable
(
value
=
"year"
)
String
year
,
@PathVariable
(
value
=
"month"
)
String
month
)
{
@PathVariable
(
value
=
"month"
)
String
month
)
{
Page
<
Post
>
posts
=
postService
.
findPostByYearAndMonth
(
year
,
month
,
null
);
Page
<
Post
>
posts
=
postService
.
findPostByYearAndMonth
(
year
,
month
,
null
);
if
(
null
==
posts
)
{
if
(
null
==
posts
)
{
return
this
.
renderNotFound
();
return
this
.
renderNotFound
();
}
}
model
.
addAttribute
(
"posts"
,
posts
);
model
.
addAttribute
(
"posts"
,
posts
);
...
@@ -100,7 +100,7 @@ public class FrontArchiveController extends BaseController {
...
@@ -100,7 +100,7 @@ public class FrontArchiveController extends BaseController {
@GetMapping
(
value
=
"{postUrl}"
)
@GetMapping
(
value
=
"{postUrl}"
)
public
String
getPost
(
@PathVariable
String
postUrl
,
Model
model
)
{
public
String
getPost
(
@PathVariable
String
postUrl
,
Model
model
)
{
Post
post
=
postService
.
findByPostUrl
(
postUrl
,
PostType
.
POST_TYPE_POST
.
getDesc
());
Post
post
=
postService
.
findByPostUrl
(
postUrl
,
PostType
.
POST_TYPE_POST
.
getDesc
());
if
(
null
==
post
||
post
.
getPostStatus
()!=
0
)
{
if
(
null
==
post
||
post
.
getPostStatus
()
!=
0
)
{
return
this
.
renderNotFound
();
return
this
.
renderNotFound
();
}
}
//获得当前文章的发布日期
//获得当前文章的发布日期
...
@@ -116,11 +116,12 @@ public class FrontArchiveController extends BaseController {
...
@@ -116,11 +116,12 @@ public class FrontArchiveController extends BaseController {
if
(
null
!=
afterPosts
&&
afterPosts
.
size
()
>
0
)
{
if
(
null
!=
afterPosts
&&
afterPosts
.
size
()
>
0
)
{
model
.
addAttribute
(
"afterPost"
,
afterPosts
.
get
(
afterPosts
.
size
()
-
1
));
model
.
addAttribute
(
"afterPost"
,
afterPosts
.
get
(
afterPosts
.
size
()
-
1
));
}
}
Sort
sort
=
new
Sort
(
Sort
.
Direction
.
DESC
,
"commentDate"
);
Sort
sort
=
new
Sort
(
Sort
.
Direction
.
DESC
,
"commentDate"
);
Pageable
pageable
=
PageRequest
.
of
(
0
,
999
,
sort
);
Pageable
pageable
=
PageRequest
.
of
(
0
,
999
,
sort
);
Page
<
Comment
>
comments
=
commentService
.
findCommentsByPostAndCommentStatus
(
post
,
pageable
,
0
);
Page
<
Comment
>
comments
=
commentService
.
findCommentsByPostAndCommentStatus
(
post
,
pageable
,
0
);
model
.
addAttribute
(
"post"
,
post
);
model
.
addAttribute
(
"post"
,
post
);
model
.
addAttribute
(
"comments"
,
CommentUtil
.
getComments
(
comments
.
getContent
()));
model
.
addAttribute
(
"comments"
,
CommentUtil
.
getComments
(
comments
.
getContent
()));
model
.
addAttribute
(
"commentsCount"
,
comments
.
getTotalElements
());
postService
.
updatePostView
(
post
);
postService
.
updatePostView
(
post
);
return
this
.
render
(
"post"
);
return
this
.
render
(
"post"
);
}
}
...
...
src/main/resources/static/css/style.css
浏览文件 @
a09aede2
...
@@ -101,13 +101,13 @@
...
@@ -101,13 +101,13 @@
}
}
::-webkit-scrollbar
{
::-webkit-scrollbar
{
width
:
0
;
width
:
2px
;
height
:
0
;
height
:
2px
;
background-color
:
transparent
;
background-color
:
#eee
;
}
}
::-webkit-scrollbar-thumb
{
::-webkit-scrollbar-thumb
{
background-color
:
transparent
;
background-color
:
#d0afaf
;
}
}
::-webkit-scrollbar-track
{
::-webkit-scrollbar-track
{
background-color
:
transparent
;
background-color
:
#eee
;
}
}
\ No newline at end of file
src/main/resources/templates/admin/module/_footer.ftl
浏览文件 @
a09aede2
<footer class="main-footer">
<footer class="main-footer">
<div class="pull-right hidden-xs"><a target="_blank" href="https://github.com/ruibaby/halo/releases/tag/v0.0.
5">0.0.5
</a></div>
<div class="pull-right hidden-xs"><a target="_blank" href="https://github.com/ruibaby/halo/releases/tag/v0.0.
6">0.0.6
</a></div>
Thanks for using <strong><a data-pjax="true" href="/admin/halo">Halo</a>.</strong>
Thanks for using <strong><a data-pjax="true" href="/admin/halo">Halo</a>.</strong>
</footer>
</footer>
src/main/resources/templates/admin/module/_header.ftl
浏览文件 @
a09aede2
...
@@ -29,12 +29,13 @@
...
@@ -29,12 +29,13 @@
<li>
<li>
<a href="/admin/comments?status=1">
<a href="/admin/comments?status=1">
<div class="pull-left">
<div class="pull-left">
<img src="//
www.gravatar.com
/avatar/${comment.commentAuthorAvatarMd5?default("hash")}?s=256&d=${options.native_comment_avatar?default("mm")}" class="img-circle" alt="User Image">
<img src="//
gravatar.loli.net
/avatar/${comment.commentAuthorAvatarMd5?default("hash")}?s=256&d=${options.native_comment_avatar?default("mm")}" class="img-circle" alt="User Image">
</div>
</div>
<h4>${comment.commentAuthor}
<h4>
${comment.commentAuthor}
<small> ${comment.commentDate?string("yyyy/MM/dd HH:mm")}</small>
<small> ${comment.commentDate?string("yyyy/MM/dd HH:mm")}</small>
</h4>
</h4>
<
p>${comment.commentContent}</p
>
<
object>${comment.commentContent}</object
>
</a>
</a>
</li>
</li>
<#if x==10>
<#if x==10>
...
...
src/main/resources/templates/common/comment/_native_comment.ftl
浏览文件 @
a09aede2
...
@@ -233,7 +233,7 @@
...
@@ -233,7 +233,7 @@
</style>
</style>
<div class="native-comment">
<div class="native-comment">
<div class="comment-avatar">
<div class="comment-avatar">
<img src="//
www.gravatar.com
/avatar/none?s=256&d=${options.native_comment_avatar?default('mm')}" height="48" width="48" class="comment-author-avatar">
<img src="//
gravatar.loli.net
/avatar/none?s=256&d=${options.native_comment_avatar?default('mm')}" height="48" width="48" class="comment-author-avatar">
</div>
</div>
<div class="native-wrap">
<div class="native-wrap">
<div class="comment-header">
<div class="comment-header">
...
@@ -254,14 +254,14 @@
...
@@ -254,14 +254,14 @@
</div>
</div>
<div class="native-message" style="text-align: center;padding: 20px;display: none"></div>
<div class="native-message" style="text-align: center;padding: 20px;display: none"></div>
<div class="native-info">
<div class="native-info">
<
#--<span id="native-info-total" style="font-weight: 600">${comments.getTotalElements()}</span>评论-->
<
span id="native-info-total" style="font-weight: 600">${commentsCount?default(0)}</span>评论
</div>
</div>
<#macro childComments comments>
<#macro childComments comments>
<ul class="native-list" style="margin-left: 20px; border-left: 1px solid #f1f1f1">
<ul class="native-list" style="margin-left: 20px; border-left: 1px solid #f1f1f1">
<#if comments?? && comments?size gt 0>
<#if comments?? && comments?size gt 0>
<#list comments as comment>
<#list comments as comment>
<li class="native-list-one" id="comment-id-${comment.commentId?c}">
<li class="native-list-one" id="comment-id-${comment.commentId?c}">
<img class="native-list-one-img" src="//
www.gravatar.com
/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
<img class="native-list-one-img" src="//
gravatar.loli.net
/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
<section>
<section>
<div class="native-list-one-head">
<div class="native-list-one-head">
<a class="native-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl?if_exists}">${comment.commentAuthor?if_exists}</a>
<a class="native-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl?if_exists}">${comment.commentAuthor?if_exists}</a>
...
@@ -290,7 +290,7 @@
...
@@ -290,7 +290,7 @@
<#if comments?? && comments?size gt 0>
<#if comments?? && comments?size gt 0>
<#list comments as comment>
<#list comments as comment>
<li class="native-list-one" id="comment-id-${comment.commentId?c}">
<li class="native-list-one" id="comment-id-${comment.commentId?c}">
<img class="native-list-one-img" src="//
www.gravatar.com
/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
<img class="native-list-one-img" src="//
gravatar.loli.net
/avatar/${comment.commentAuthorAvatarMd5?if_exists}?s=256&d=${options.native_comment_avatar?default('mm')}">
<section>
<section>
<div class="native-list-one-head">
<div class="native-list-one-head">
<a class="native-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl?if_exists}">${comment.commentAuthor?if_exists}</a>
<a class="native-list-one-head-name" rel="nofollow" href="${comment.commentAuthorUrl?if_exists}">${comment.commentAuthor?if_exists}</a>
...
@@ -398,9 +398,9 @@
...
@@ -398,9 +398,9 @@
$('#commentContent').focus();
$('#commentContent').focus();
});
});
function loadAvatar() {
function loadAvatar() {
$(".comment-author-avatar").attr("src","//
www.gravatar.com
/avatar/"+md5(localStorage.getItem("email"))+"?s=256&d=${options.native_comment_avatar?default('mm')}");
$(".comment-author-avatar").attr("src","//
gravatar.loli.net
/avatar/"+md5(localStorage.getItem("email"))+"?s=256&d=${options.native_comment_avatar?default('mm')}");
if($('input[name=commentAuthorEmail]').val()!='' && $('input[name=commentAuthorEmail]').val()!=null){
if($('input[name=commentAuthorEmail]').val()!='' && $('input[name=commentAuthorEmail]').val()!=null){
$(".comment-author-avatar").attr("src","//
www.gravatar.com
/avatar/"+md5($('input[name=commentAuthorEmail]').val())+"?s=256&d=${options.native_comment_avatar?default('mm')}");
$(".comment-author-avatar").attr("src","//
gravatar.loli.net
/avatar/"+md5($('input[name=commentAuthorEmail]').val())+"?s=256&d=${options.native_comment_avatar?default('mm')}");
}
}
}
}
var parser = new UAParser();
var parser = new UAParser();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录