diff --git a/README.md b/README.md index f4958a397..e072a638a 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ > Halo may be the best Java blog system. | Halo可能是最好的Java博客系统。 [![JDK](https://img.shields.io/badge/JDK-1.8-yellow.svg)](#) -[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.0.1-green.svg)](https://github.com/spring-projects/spring-boot) [![GitHub release](https://img.shields.io/github/release/ruibaby/halo.svg)](https://github.com/ruibaby/halo/releases) [![Travis CI](https://img.shields.io/travis/ruibaby/halo.svg)](https://travis-ci.org/ruibaby/halo) diff --git a/pom.xml b/pom.xml index 537f22a24..ebe1d1217 100755 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ - RYAN0UP + ruibaby Ryan Wang i@ryanc.cc https://ryanc.cc @@ -94,12 +94,12 @@ - - org.projectlombok - lombok - ${lombok.version} - provided - + + org.projectlombok + lombok + ${lombok.version} + provided + diff --git a/src/main/java/cc/ryanc/halo/web/controller/IndexController.java b/src/main/java/cc/ryanc/halo/web/controller/IndexController.java index bb11e4e0c..941fa3100 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/IndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/IndexController.java @@ -249,6 +249,8 @@ public class IndexController extends BaseController{ User user = userService.findUser(); model.addAttribute("user",user); + model.addAttribute("is_gallery",true); + //设置选项 model.addAttribute("options",HaloConst.OPTIONS); return this.render("gallery"); diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl index 847d50d01..54c6af036 100755 --- a/src/main/resources/templates/admin/admin_index.ftl +++ b/src/main/resources/templates/admin/admin_index.ftl @@ -126,39 +126,33 @@ <#if options.widget_postcount?default("true")=="true">
-

${postCount?default(0)}

文章

- 查看所有 + 查看所有
<#if options.widget_commentcount?default("true")=="true">
-

${commentCount?default(0)}

评论

- 查看所有 + 查看所有
- <#if options.widget_attachmentcount?default("true")=="true">
-

${mediaCount?default(0)}

媒体库

- 上传图片 + 上传图片
- <#if options.widget_daycount?default("true")=="true">
-

1

成立天数

@@ -166,7 +160,6 @@
-
@@ -192,27 +185,25 @@ <#if postTopFive??> - - <#list postTopFive as post> - - <#if post.postStatus == 0> - ${post.postTitle} - <#else > - ${post.postTitle} + <#list postTopFive as post> + + <#if post.postStatus == 0> + ${post.postTitle} + <#else > + ${post.postTitle} + + + <#if post.postStatus==0> + 已发布 + <#elseif post.postStatus==1> + 草 稿 + <#else> + 回收站 - - <#if post.postStatus==0> - 已发布 - <#elseif post.postStatus==1> - 草 稿 - <#else> - 回收站 - - - ${post.postDate?if_exists?string("yyyy-MM-dd HH:mm")} - - - + + ${post.postDate?if_exists?string("yyyy-MM-dd HH:mm")} + + <#else> 暂无数据 @@ -236,51 +227,51 @@
- - - - - + + + + + + + <#if comments??> - - <#list comments as comment> - - - - - + + + - - - - + ${comment.commentContent} + <#break> + + + + + + <#else> @@ -312,23 +303,23 @@
评论者评论页面内容状态时间
评论者评论页面内容状态时间
${comment.commentAuthor} - ${comment.post.postTitle} - - <#switch comment.commentStatus> - <#case 0> - ${comment.commentContent} - <#break> - <#case 1> - ${comment.commentContent} - <#break> - <#case 2> - ${comment.commentContent} - <#break> - - - <#switch comment.commentStatus> + <#list comments as comment> +
${comment.commentAuthor} + ${comment.post.postTitle} + + <#switch comment.commentStatus> <#case 0> - 已发布 - <#break > + ${comment.commentContent} + <#break> <#case 1> - 待审核 - <#break > + ${comment.commentContent} + <#break> <#case 2> - 回收站 - <#break > - - ${comment.commentDate?string("yyyy-MM-dd HH:mm")}
+ <#switch comment.commentStatus> + <#case 0> + 已发布 + <#break > + <#case 1> + 待审核 + <#break > + <#case 2> + 回收站 + <#break > + + ${comment.commentDate?string("yyyy-MM-dd HH:mm")}
暂无数据
- - - - + + + + + + <#if logs??> - - <#list logs as log> - - - - - - - - + <#list logs as log> + + + + + + + <#else> diff --git a/src/main/resources/templates/themes/anatole/module/macro.ftl b/src/main/resources/templates/themes/anatole/module/macro.ftl index 2eccce2af..9f3f82df5 100644 --- a/src/main/resources/templates/themes/anatole/module/macro.ftl +++ b/src/main/resources/templates/themes/anatole/module/macro.ftl @@ -9,8 +9,8 @@ - - + + @@ -24,6 +24,21 @@ + \ No newline at end of file
事件结果IP时间
事件结果IP时间
${log.logTitle}${log.logContent}${log.logIp}${log.logCreated?string("yyyy-MM-dd HH:mm")}
${log.logTitle}${log.logContent}${log.logIp}${log.logCreated?string("yyyy-MM-dd HH:mm")}
暂无数据