From a09aede2d45212ede51d468fe4650849d992c42e Mon Sep 17 00:00:00 2001 From: ruibaby Date: Fri, 13 Jul 2018 10:57:56 +0800 Subject: [PATCH] 0.0.6 --- .../controller/front/FrontArchiveController.java | 13 +++++++------ src/main/resources/static/css/style.css | 10 +++++----- .../resources/templates/admin/module/_footer.ftl | 2 +- .../resources/templates/admin/module/_header.ftl | 7 ++++--- .../templates/common/comment/_native_comment.ftl | 12 ++++++------ 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java index 0db94a8c..5cf21357 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java @@ -63,7 +63,7 @@ public class FrontArchiveController extends BaseController { Sort sort = new Sort(Sort.Direction.DESC, "postDate"); Pageable pageable = PageRequest.of(page - 1, 5, sort); Page posts = postService.findPostByStatus(0, PostType.POST_TYPE_POST.getDesc(), pageable); - if(null==posts){ + if (null == posts) { return this.renderNotFound(); } model.addAttribute("posts", posts); @@ -83,7 +83,7 @@ public class FrontArchiveController extends BaseController { @PathVariable(value = "year") String year, @PathVariable(value = "month") String month) { Page posts = postService.findPostByYearAndMonth(year, month, null); - if(null==posts){ + if (null == posts) { return this.renderNotFound(); } model.addAttribute("posts", posts); @@ -100,7 +100,7 @@ public class FrontArchiveController extends BaseController { @GetMapping(value = "{postUrl}") public String getPost(@PathVariable String postUrl, Model model) { 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(); } //获得当前文章的发布日期 @@ -116,11 +116,12 @@ public class FrontArchiveController extends BaseController { if (null != afterPosts && afterPosts.size() > 0) { model.addAttribute("afterPost", afterPosts.get(afterPosts.size() - 1)); } - Sort sort = new Sort(Sort.Direction.DESC,"commentDate"); - Pageable pageable = PageRequest.of(0,999,sort); - Page comments = commentService.findCommentsByPostAndCommentStatus(post,pageable,0); + Sort sort = new Sort(Sort.Direction.DESC, "commentDate"); + Pageable pageable = PageRequest.of(0, 999, sort); + Page comments = commentService.findCommentsByPostAndCommentStatus(post, pageable, 0); model.addAttribute("post", post); model.addAttribute("comments", CommentUtil.getComments(comments.getContent())); + model.addAttribute("commentsCount", comments.getTotalElements()); postService.updatePostView(post); return this.render("post"); } diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index cb681b7c..e7e1d7f8 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -101,13 +101,13 @@ } ::-webkit-scrollbar { - width: 0; - height: 0; - background-color: transparent; + width: 2px; + height: 2px; + background-color: #eee; } ::-webkit-scrollbar-thumb { - background-color: transparent; + background-color: #d0afaf; } ::-webkit-scrollbar-track { - background-color: transparent; + background-color: #eee; } \ No newline at end of file diff --git a/src/main/resources/templates/admin/module/_footer.ftl b/src/main/resources/templates/admin/module/_footer.ftl index 539a1db1..bc650a17 100755 --- a/src/main/resources/templates/admin/module/_footer.ftl +++ b/src/main/resources/templates/admin/module/_footer.ftl @@ -1,4 +1,4 @@ diff --git a/src/main/resources/templates/admin/module/_header.ftl b/src/main/resources/templates/admin/module/_header.ftl index 32f3bfdb..a5453337 100755 --- a/src/main/resources/templates/admin/module/_header.ftl +++ b/src/main/resources/templates/admin/module/_header.ftl @@ -29,12 +29,13 @@
  • - User Image + User Image
    -

    ${comment.commentAuthor} +

    + ${comment.commentAuthor} ${comment.commentDate?string("yyyy/MM/dd HH:mm")}

    -

    ${comment.commentContent}

    + ${comment.commentContent}
    • <#if x==10> diff --git a/src/main/resources/templates/common/comment/_native_comment.ftl b/src/main/resources/templates/common/comment/_native_comment.ftl index 49a91384..d0f1bf05 100644 --- a/src/main/resources/templates/common/comment/_native_comment.ftl +++ b/src/main/resources/templates/common/comment/_native_comment.ftl @@ -233,7 +233,7 @@
    - +
    @@ -254,14 +254,14 @@
    - <#--${comments.getTotalElements()}评论--> + ${commentsCount?default(0)}评论
    <#macro childComments comments>
      <#if comments?? && comments?size gt 0> <#list comments as comment>
    • - +
      ${comment.commentAuthor?if_exists} @@ -290,7 +290,7 @@ <#if comments?? && comments?size gt 0> <#list comments as comment>
    • - +
      ${comment.commentAuthor?if_exists} @@ -398,9 +398,9 @@ $('#commentContent').focus(); }); 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){ - $(".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(); -- GitLab