diff --git a/README.md b/README.md index 4d173d059..014c72ae3 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -

Halo

+

Halo

-> Halo 可能是最好的 Java 博客系统。(请注意,老版本已不提供维护,当前分支为新版本,正在内测中,将于近期发布版本) +> Halo 可能是最好的 Java 博客系统。

Author @@ -12,6 +12,10 @@ ------------------------------ +## 新版本说明 + +**老版本已不提供维护,请不要再使用老版本进行部署了,当前分支为新版本,正在内测中,将于近期发布版本** + ## 简介 **Halo** [ˈheɪloʊ],意为光环。当然,你也可以当成拼音读(哈喽)。 @@ -63,4 +67,36 @@ | 支付宝/微信/QQ | | :------------: | -| | \ No newline at end of file +| | + +## 预览图 + +![anatole.png](https://i.loli.net/2019/05/08/5cd2fc3e478dc.png) + +![casper.png](https://i.loli.net/2019/05/08/5cd2fc3e4e587.png) + +![material.png](https://i.loli.net/2019/05/08/5cd2fc3e78012.png) + +![admin-install.png](https://i.loli.net/2019/05/08/5cd2fcae89cae.png) + +![admin-login.png](https://i.loli.net/2019/05/08/5cd2fcae6a3fa.png) + +![admin-dashboard.png](https://i.loli.net/2019/05/08/5cd2fcaf1b2d2.png) + +![admin-posts.png](https://i.loli.net/2019/05/08/5cd2fcaf18c37.png) + +![admin-write.png](https://i.loli.net/2019/05/08/5cd2fcae9bea2.png) + +![admin-write1.png](https://i.loli.net/2019/05/08/5cd2fcaf6a1ac.png) + +![admin-write2.png](https://i.loli.net/2019/05/08/5cd2fcb08ea2d.png) + +![admin-attachment.png](https://i.loli.net/2019/05/08/5cd2fcb1c752e.png) + +![admin-themes.png](https://i.loli.net/2019/05/08/5cd2fcb21fc76.png) + +![admin-theme-settings.png](https://i.loli.net/2019/05/08/5cd2fcb04f9c3.png) + +![admin-profile.png](https://i.loli.net/2019/05/08/5cd2fccee89f5.png) + +![admin-options.png](https://i.loli.net/2019/05/08/5cd2fccedc309.png) \ No newline at end of file diff --git a/src/main/java/run/halo/app/controller/content/ContentSheetController.java b/src/main/java/run/halo/app/controller/content/ContentSheetController.java index 1b6e84a4d..38c7fb358 100644 --- a/src/main/java/run/halo/app/controller/content/ContentSheetController.java +++ b/src/main/java/run/halo/app/controller/content/ContentSheetController.java @@ -36,9 +36,9 @@ public class ContentSheetController { * * @return template path: themes/{theme}/gallery.ftl */ - @GetMapping(value = "/gallery") - public String gallery() { - return themeService.render("gallery"); + @GetMapping(value = "/photos") + public String photos() { + return themeService.render("photos"); } /** diff --git a/src/main/resources/templates/themes/anatole/gallery.ftl b/src/main/resources/templates/themes/anatole/photos.ftl similarity index 80% rename from src/main/resources/templates/themes/anatole/gallery.ftl rename to src/main/resources/templates/themes/anatole/photos.ftl index 8506c2a1b..e77a78ffb 100644 --- a/src/main/resources/templates/themes/anatole/gallery.ftl +++ b/src/main/resources/templates/themes/anatole/photos.ftl @@ -23,17 +23,17 @@

- <@galleryTag method="list"> - <#if galleries?size gt 0> - <#list galleries as gallery> + <@photoTag method="list"> + <#if photos?size gt 0> + <#list photos as photo>
- ${gallery.description} -

${gallery.name}

-

${gallery.takeTime!}

+ ${photo.description} +

${photo.name}

+

${photo.takeTime!}

- +