From 45e603059460dcc8764841292e4bfb8f7df9d950 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sun, 21 Apr 2019 14:51:27 +0800 Subject: [PATCH] Update common_macro.ftl. --- .../content/ContentPageController.java | 6 +- .../templates/common/macro/common_macro.ftl | 10 +-- .../common/macro/theme_option_marco.ftl | 83 ------------------- 3 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 src/main/resources/templates/common/macro/theme_option_marco.ftl diff --git a/src/main/java/run/halo/app/web/controller/content/ContentPageController.java b/src/main/java/run/halo/app/web/controller/content/ContentPageController.java index 3794755fe..021b76be0 100644 --- a/src/main/java/run/halo/app/web/controller/content/ContentPageController.java +++ b/src/main/java/run/halo/app/web/controller/content/ContentPageController.java @@ -10,7 +10,6 @@ import run.halo.app.model.entity.Comment; import run.halo.app.model.entity.Post; import run.halo.app.model.enums.PostStatus; import run.halo.app.service.CommentService; -import run.halo.app.service.GalleryService; import run.halo.app.service.PostService; import run.halo.app.service.ThemeService; @@ -23,7 +22,6 @@ import java.util.List; @Controller public class ContentPageController { - private final GalleryService galleryService; private final PostService postService; @@ -31,11 +29,9 @@ public class ContentPageController { private final ThemeService themeService; - public ContentPageController(GalleryService galleryService, - PostService postService, + public ContentPageController(PostService postService, CommentService commentService, ThemeService themeService) { - this.galleryService = galleryService; this.postService = postService; this.commentService = commentService; this.themeService = themeService; diff --git a/src/main/resources/templates/common/macro/common_macro.ftl b/src/main/resources/templates/common/macro/common_macro.ftl index ceb4b6b7a..6ae6575d8 100644 --- a/src/main/resources/templates/common/macro/common_macro.ftl +++ b/src/main/resources/templates/common/macro/common_macro.ftl @@ -2,7 +2,7 @@ <#-- 统计代码 --> <#macro statistics> - ${options.statistics_code!} + ${options.blog_statistics_code!} <#-- 页脚信息 --> @@ -20,16 +20,16 @@ <#-- 站点验证代码 --> <#macro verification> <#if options.blog_verification_google??> - + <#if options.blog_verification_bing??> - + <#if options.blog_verification_baidu??> - + <#if options.blog_verification_qihu??> - + diff --git a/src/main/resources/templates/common/macro/theme_option_marco.ftl b/src/main/resources/templates/common/macro/theme_option_marco.ftl deleted file mode 100644 index 99cc0eb45..000000000 --- a/src/main/resources/templates/common/macro/theme_option_marco.ftl +++ /dev/null @@ -1,83 +0,0 @@ -<#macro head> - - - - - - - - - - - - - - -<#macro import_js> - - - - - - -<#nested /> - - -