github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Update common_macro.ftl.

pull/146/head
ruibaby 2019-04-21 14:51:27 +08:00
parent 7983ba8fb1
commit 45e6030594
3 changed files with 6 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/run/halo/app/web/controller/content/ContentPageController.java
View File

@ -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;

10
src/main/resources/templates/common/macro/common_macro.ftl
View File

@ -2,7 +2,7 @@
<#-- 统计代码 -->
<#macro statistics>
${options.statistics_code!}
${options.blog_statistics_code!}
</#macro>
<#-- 页脚信息 -->
@ -20,16 +20,16 @@
<#-- 站点验证代码 -->
<#macro verification>
<#if options.blog_verification_google??>
<meta name="google-site-verification" content="${options.blog_verification_google}" />
<meta name="google-site-verification" content="${options.seo_verification_google}" />
</#if>
<#if options.blog_verification_bing??>
<meta name="msvalidate.01" content="${options.blog_verification_bing}" />
<meta name="msvalidate.01" content="${options.seo_verification_bing}" />
</#if>
<#if options.blog_verification_baidu??>
<meta name="baidu-site-verification" content="${options.blog_verification_baidu}" />
<meta name="baidu-site-verification" content="${options.seo_verification_baidu}" />
</#if>
<#if options.blog_verification_qihu??>
<meta name="360-site-verification" content="${options.blog_verification_qihu}" />
<meta name="360-site-verification" content="${options.seo_verification_qihu}" />
</#if>
</#macro>

83
src/main/resources/templates/common/macro/theme_option_marco.ftl
View File

@ -1,83 +0,0 @@
<#macro head>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<link rel="stylesheet" href="/static/halo-admin/plugins/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="/static/halo-admin/plugins/toast/css/jquery.toast.min.css">
<link rel="stylesheet" href="/static/halo-admin/css/AdminLTE.min.css">
<style>
.themeSetting, .themeImg {
padding-top: 15px;
padding-bottom: 15px;
}
.form-horizontal .control-label {
text-align: left;
}
</style>
</head>
<body>
</#macro>
<#macro import_js>
</body>
<script src="/static/halo-common/jquery/jquery.min.js"></script>
<script src="/static/halo-admin/plugins/bootstrap/js/bootstrap.min.js"></script>
<script src="/static/halo-admin/plugins/toast/js/jquery.toast.min.js"></script>
<script src="/static/halo-admin/plugins/layer/layer.js"></script>
<script src="/static/halo-admin/js/halo.min.js"></script>
<#nested />
<script>
var halo = new $.halo();
var heading = "<@spring.message code='common.text.tips' />";
/**
* 保存设置选项
* @param option option
*/
function saveThemeOptions(option) {
var param = $('#'+option).serialize();
$.post('/admin/option/save',param,function (data) {
if(data.code === 1){
halo.showMsg(data.msg, "success", 1000);
}else{
halo.showMsg(data.msg, "error", 1000);
}
},'JSON');
}
/**
* 所有附件
* @param id id
*/
function openAttach(id) {
layer.open({
type: 2,
title: '<@spring.message code="common.js.all-attachment" />',
shadeClose: true,
shade: 0.5,
area: ['90%', '90%'],
content: '/admin/attachments/select?id='+id,
scrollbar: false
});
}
/**
* 更新主题
*/
function updateTheme(theme, e) {
$(e).button('loading');
$.get('/admin/themes/pull',{'themeId': theme},function (data) {
if (data.code === 1) {
halo.showMsgAndParentRedirect(data.msg, 'success', 1000, '/admin/themes');
} else {
halo.showMsg(data.msg, 'error', 2000);
$(e).button('reset');
}
},'JSON');
}
</script>
</html>
</#macro>